---

alexcrichton · alexcrichton · commit 4607eeadcc83 · 2015-05-19T10:53:07.000-07:00
yaml --- r: 211022 b: refs/heads/try c: 847c852 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -2,7 +2,7 @@
 refs/heads/master: 3e561f05c00cd180ec02db4ccab2840a4aba93d2
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: ba0e1cd8147d452c356aacb29fb87568ca26f111
-refs/heads/try: b538189ba0abb77658c7b082d2d541daaaa7f80a
+refs/heads/try: 847c8520b14e3ae9aec26a33f70750a071d3f18d
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
diff --git a/branches/try/src/librustc_llvm/lib.rs b/branches/try/src/librustc_llvm/lib.rs
@@ -1771,7 +1771,7 @@ extern {
                          Dialect: c_uint)
                          -> ValueRef;
 
-    pub static LLVMRustDebugMetadataVersion: u32;
+    pub fn LLVMRustDebugMetadataVersion() -> u32;
 
     pub fn LLVMRustAddModuleFlag(M: ModuleRef,
                                  name: *const c_char,
diff --git a/branches/try/src/librustc_trans/trans/debuginfo/mod.rs b/branches/try/src/librustc_trans/trans/debuginfo/mod.rs
@@ -193,7 +193,7 @@ pub fn finalize(cx: &CrateContext) {
         // Prevent bitcode readers from deleting the debug info.
         let ptr = "Debug Info Version\0".as_ptr();
         llvm::LLVMRustAddModuleFlag(cx.llmod(), ptr as *const _,
-                                    llvm::LLVMRustDebugMetadataVersion);
+                                    llvm::LLVMRustDebugMetadataVersion());
     };
 }
 
diff --git a/branches/try/src/rustllvm/RustWrapper.cpp b/branches/try/src/rustllvm/RustWrapper.cpp
@@ -233,7 +233,9 @@ DIT unwrapDI(LLVMMetadataRef ref) {
     return DIT(ref ? unwrap<MDNode>(ref) : NULL);
 }
 
-extern "C" const uint32_t LLVMRustDebugMetadataVersion = DEBUG_METADATA_VERSION;
+extern "C" const uint32_t LLVMRustDebugMetadataVersion() {
+    return DEBUG_METADATA_VERSION;
+}
 
 extern "C" void LLVMRustAddModuleFlag(LLVMModuleRef M,
                                       const char *name,

Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,7 @@ pub fn finalize(cx: &CrateContext) {`
`193`	`193`	`// Prevent bitcode readers from deleting the debug info.`
`194`	`194`	`let ptr = "Debug Info Version\0".as_ptr();`
`195`	`195`	`llvm::LLVMRustAddModuleFlag(cx.llmod(), ptr as *const _,`
`196`		`- llvm::LLVMRustDebugMetadataVersion);`
	`196`	`+ llvm::LLVMRustDebugMetadataVersion());`
`197`	`197`	`};`
`198`	`198`	`}`
`199`	`199`
Original file line number	Diff line number	Diff line change
`@@ -233,7 +233,9 @@ DIT unwrapDI(LLVMMetadataRef ref) {`
`233`	`233`	`return DIT(ref ? unwrap<MDNode>(ref) : NULL);`
`234`	`234`	`}`
`235`	`235`
`236`		`-extern "C" const uint32_t LLVMRustDebugMetadataVersion = DEBUG_METADATA_VERSION;`
	`236`	`+extern "C" const uint32_t LLVMRustDebugMetadataVersion() {`
	`237`	`+ return DEBUG_METADATA_VERSION;`
	`238`	`+}`
`237`	`239`
`238`	`240`	`extern "C" void LLVMRustAddModuleFlag(LLVMModuleRef M,`
`239`	`241`	`const char *name,`