---

alexcrichton · alexcrichton · commit 45293c82c1d3 · 2015-05-19T10:53:07.000-07:00
yaml --- r: 207385 b: refs/heads/auto c: 847c852 h: refs/heads/master i: 207383: 0756e86 v: v3
diff --git a/[refs] b/[refs]
@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: b538189ba0abb77658c7b082d2d541daaaa7f80a
+refs/heads/auto: 847c8520b14e3ae9aec26a33f70750a071d3f18d
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
diff --git a/branches/auto/src/librustc_llvm/lib.rs b/branches/auto/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/auto/src/librustc_trans/trans/debuginfo/mod.rs b/branches/auto/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/auto/src/rustllvm/RustWrapper.cpp b/branches/auto/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,`