---

yaml
---
r: 4955
b: refs/heads/master
c: d5173b1
h: refs/heads/master
i:
  4953: d3f0d44
  4951: 5e28247
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4e136d1fd9bd5536d441c062d41e7b71b375a942
+refs/heads/master: d5173b1f2cc174d53272be0d14a8290c05b8670a

trunk/src/comp/middle/trans.rs

@@ -6395,7 +6395,8 @@ fn trans_crate(sess: &session::session, crate: &@ast::crate, tcx: &ty::ctxt,
           task_type: task_type,
           builder: BuilderRef_res(llvm::LLVMCreateBuilder()),
           shape_cx: shape::mk_ctxt(llmod),
-          gc_cx: gc::mk_ctxt()};
+          gc_cx: gc::mk_ctxt(),
+          cstrcache: cstrcache::mk()};
     let cx = new_local_ctxt(ccx);
     collect_items(ccx, crate);
     collect_tag_ctors(ccx, crate);

trunk/src/comp/middle/trans_common.rs

@@ -154,7 +154,8 @@ type crate_ctxt =
      task_type: TypeRef,
      builder: BuilderRef_res,
      shape_cx: shape::ctxt,
-     gc_cx: gc::ctxt};
+     gc_cx: gc::ctxt,
+     cstrcache: cstrcache::t};
 
 type local_ctxt =
     {path: [str],
@@ -842,10 +843,11 @@ fn C_u8(i: uint) -> ValueRef { ret C_integral(T_i8(), i, False); }
 // This is a 'c-like' raw string, which differs from
 // our boxed-and-length-annotated strings.
 fn C_cstr(cx: &@crate_ctxt, s: &str) -> ValueRef {
-    let sc = llvm::LLVMConstString(str::buf(s), str::byte_len(s), False);
+    let sc = llvm::LLVMConstString(safe_sbuf(cx, s),
+                                   str::byte_len(s), False);
     let g =
         llvm::LLVMAddGlobal(cx.llmod, val_ty(sc),
-                            str::buf(cx.names.next("str")));
+                            safe_sbuf(cx, cx.names.next("str")));
     llvm::LLVMSetInitializer(g, sc);
     llvm::LLVMSetGlobalConstant(g, True);
     llvm::LLVMSetLinkage(g, lib::llvm::LLVMInternalLinkage as llvm::Linkage);
@@ -863,10 +865,10 @@ fn C_str(cx: &@crate_ctxt, s: &str) -> ValueRef {
     let box =
         C_struct([C_int(abi::const_refcount as int), C_int(len + 1u as int),
                   C_int(len + 1u as int), C_int(0),
-                  llvm::LLVMConstString(str::buf(s), len, False)]);
+                  llvm::LLVMConstString(safe_sbuf(cx, s), len, False)]);
     let g =
         llvm::LLVMAddGlobal(cx.llmod, val_ty(box),
-                            str::buf(cx.names.next("str")));
+                            safe_sbuf(cx, cx.names.next("str")));
     llvm::LLVMSetInitializer(g, box);
     llvm::LLVMSetGlobalConstant(g, True);
     llvm::LLVMSetLinkage(g, lib::llvm::LLVMInternalLinkage as llvm::Linkage);
@@ -909,14 +911,18 @@ fn C_shape(ccx: &@crate_ctxt, bytes: &[u8]) -> ValueRef {
     let llshape = C_bytes(bytes);
     let llglobal =
         llvm::LLVMAddGlobal(ccx.llmod, val_ty(llshape),
-                            str::buf(ccx.names.next("shape")));
+                            safe_sbuf(ccx, ccx.names.next("shape")));
     llvm::LLVMSetInitializer(llglobal, llshape);
     llvm::LLVMSetGlobalConstant(llglobal, True);
     llvm::LLVMSetLinkage(llglobal,
                          lib::llvm::LLVMInternalLinkage as llvm::Linkage);
     ret llvm::LLVMConstPointerCast(llglobal, T_ptr(T_i8()));
 }
 
+fn safe_sbuf(ccx: &@crate_ctxt, s: &str) -> str::rustrt::sbuf {
+    cstrcache::get_cstr(ccx.cstrcache, s)
+}
+
 //
 // Local Variables:
 // mode: rust