---

alexcrichton · alexcrichton · commit 8c5d90890aaa · 2015-05-19T10:53:07.000-07:00
yaml --- r: 225087 b: refs/heads/stable c: 847c852 h: refs/heads/master i: 225085: e90b153 225083: ba4678f 225079: 72d9dd2 225071: 341dac4 225055: 3ed1028 225023: 33d095d v: v3
diff --git a/[refs] b/[refs]
@@ -29,6 +29,6 @@ refs/heads/tmp: e5d90d98402475b6e154ce216f9efcb80da1a747
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: 1fe32ca12c51afcd761d9962f51a74ff0d07a591
 refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
-refs/heads/stable: b538189ba0abb77658c7b082d2d541daaaa7f80a
+refs/heads/stable: 847c8520b14e3ae9aec26a33f70750a071d3f18d
 refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
 refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b
diff --git a/branches/stable/src/librustc_llvm/lib.rs b/branches/stable/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/stable/src/librustc_trans/trans/debuginfo/mod.rs b/branches/stable/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/stable/src/rustllvm/RustWrapper.cpp b/branches/stable/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,`