diff options
| author | kennytm <kennytm@gmail.com> | 2018-09-20 21:36:19 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-20 21:36:19 +0800 |
| commit | 6f7602d49d639a34a4065763a4ddf57bb450c219 (patch) | |
| tree | 00367672787668da41cd506fb00f4bc041e014c2 /src/librustc_codegen_llvm | |
| parent | c24d78fe719933848c5a511f735d1e1c49210dbd (diff) | |
| parent | 40e76675065925661f582cd920db1d050dc7e96f (diff) | |
| download | rust-6f7602d49d639a34a4065763a4ddf57bb450c219.tar.gz rust-6f7602d49d639a34a4065763a4ddf57bb450c219.zip | |
Rollup merge of #54233 - irinagpopa:llvm-3.9, r=tromey
Remove LLVM 3.9 workaround.
Diffstat (limited to 'src/librustc_codegen_llvm')
| -rw-r--r-- | src/librustc_codegen_llvm/debuginfo/metadata.rs | 8 | ||||
| -rw-r--r-- | src/librustc_codegen_llvm/llvm/ffi.rs | 12 |
2 files changed, 4 insertions, 16 deletions
diff --git a/src/librustc_codegen_llvm/debuginfo/metadata.rs b/src/librustc_codegen_llvm/debuginfo/metadata.rs index 0221cfd9b2c..706568b5446 100644 --- a/src/librustc_codegen_llvm/debuginfo/metadata.rs +++ b/src/librustc_codegen_llvm/debuginfo/metadata.rs @@ -1803,13 +1803,7 @@ pub fn create_vtable_metadata( llvm::LLVMRustDIBuilderCreateStaticVariable(DIB(cx), NO_SCOPE_METADATA, name.as_ptr(), - // LLVM 3.9 - // doesn't accept - // null here, so - // pass the name - // as the linkage - // name. - name.as_ptr(), + ptr::null(), unknown_file_metadata(cx), UNKNOWN_LINE_NUMBER, vtable_type, diff --git a/src/librustc_codegen_llvm/llvm/ffi.rs b/src/librustc_codegen_llvm/llvm/ffi.rs index 6c2601bf1ef..a5f4137c62b 100644 --- a/src/librustc_codegen_llvm/llvm/ffi.rs +++ b/src/librustc_codegen_llvm/llvm/ffi.rs @@ -8,16 +8,10 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// FIXME: Rename 'DIGlobalVariable' to 'DIGlobalVariableExpression' -// once support for LLVM 3.9 is dropped. -// -// This method was changed in this LLVM patch: -// https://reviews.llvm.org/D26769 - use super::debuginfo::{ DIBuilder, DIDescriptor, DIFile, DILexicalBlock, DISubprogram, DIType, DIBasicType, DIDerivedType, DICompositeType, DIScope, DIVariable, - DIGlobalVariable, DIArray, DISubrange, DITemplateTypeParameter, DIEnumerator, + DIGlobalVariableExpression, DIArray, DISubrange, DITemplateTypeParameter, DIEnumerator, DINameSpace, DIFlags, }; @@ -447,7 +441,7 @@ pub mod debuginfo { pub type DIDerivedType = DIType; pub type DICompositeType = DIDerivedType; pub type DIVariable = DIDescriptor; - pub type DIGlobalVariable = DIDescriptor; + pub type DIGlobalVariableExpression = DIDescriptor; pub type DIArray = DIDescriptor; pub type DISubrange = DIDescriptor; pub type DIEnumerator = DIDescriptor; @@ -1330,7 +1324,7 @@ extern "C" { Val: &'a Value, Decl: Option<&'a DIDescriptor>, AlignInBits: u32) - -> &'a DIGlobalVariable; + -> &'a DIGlobalVariableExpression; pub fn LLVMRustDIBuilderCreateVariable(Builder: &DIBuilder<'a>, Tag: c_uint, |