---

yaml
---
r: 2283
b: refs/heads/master
c: 7b95b5c
h: refs/heads/master
i:
  2281: ccfe4d2
  2279: 9c2db4a
v: v3

Author: graydon

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c39a95da90a3d8247e011f6a42f0c53ced34de97
+refs/heads/master: 7b95b5c033435e0b8902c3f3afb14c80e04fee83

trunk/src/comp/middle/metadata.rs

@@ -235,9 +235,9 @@ mod Encode {
 }
 
 
-// Returns a Plain Old LLVM String, *without* the trailing zero byte.
+// Returns a Plain Old LLVM String.
 fn C_postr(str s) -> ValueRef {
-    ret llvm.LLVMConstString(_str.buf(s), _str.byte_len(s) - 1u, False);
+    ret llvm.LLVMConstString(_str.buf(s), _str.byte_len(s), False);
 }
 
 
@@ -674,8 +674,11 @@ fn encode_metadata(@trans.crate_ctxt cx, @ast.crate crate)
     ret C_postr(string_w.get_str());
 }
 
-fn write_metadata(@trans.crate_ctxt cx, @ast.crate crate) {
-    auto llmeta = encode_metadata(cx, crate);
+fn write_metadata(@trans.crate_ctxt cx, bool shared, @ast.crate crate) {
+    auto llmeta = C_postr("");
+    if (shared) {
+        llmeta = encode_metadata(cx, crate);
+    }
 
     auto llconst = trans.C_struct(vec(llmeta));
     auto llglobal = llvm.LLVMAddGlobal(cx.llmod, trans.val_ty(llconst),

trunk/src/comp/middle/trans.rs

@@ -7747,7 +7747,7 @@ fn trans_crate(session.session sess, @ast.crate crate, ty.ctxt tcx,
     }
 
     // Translate the metadata.
-    middle.metadata.write_metadata(cx.ccx, crate);
+    middle.metadata.write_metadata(cx.ccx, shared, crate);
 
     run_passes(llmod, optimize, verify, save_temps, output, ot);
 }