---

alexcrichton · alexcrichton · commit c8c086067746 · 2015-05-19T10:53:07.000-07:00
yaml --- r: 214551 b: refs/heads/beta c: 847c852 h: refs/heads/master i: 214549: 0b587b6 214547: ac90a6f 214543: 0f589c2 v: v3
diff --git a/[refs] b/[refs]
@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
 refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
 refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
 refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
-refs/heads/beta: b538189ba0abb77658c7b082d2d541daaaa7f80a
+refs/heads/beta: 847c8520b14e3ae9aec26a33f70750a071d3f18d
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: 8c0aa6d64ebab528f7eb182812007155d6044972
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
diff --git a/branches/beta/src/librustc_llvm/lib.rs b/branches/beta/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/beta/src/librustc_trans/trans/debuginfo/mod.rs b/branches/beta/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/beta/src/rustllvm/RustWrapper.cpp b/branches/beta/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,`