nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-26 00:34:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #54233 - irinagpopa:llvm-3.9, r=tromey

Browse Source 
Remove LLVM 3.9 workaround.
This commit is contained in:
kennytm 2018-09-20 21:36:19 +08:00 committed by GitHub
commit 6f7602d49d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/librustc_codegen_llvm/debuginfo/metadata.rs
View File

@ -1803,13 +1803,7 @@ pub fn create_vtable_metadata(
llvm::LLVMRustDIBuilderCreateStaticVariable(DIB(cx), llvm::LLVMRustDIBuilderCreateStaticVariable(DIB(cx),
NO_SCOPE_METADATA, NO_SCOPE_METADATA,
name.as_ptr(), name.as_ptr(),
// LLVM 3.9 ptr::null(),
// doesn't accept
// null here, so
// pass the name
// as the linkage
// name.
name.as_ptr(),
unknown_file_metadata(cx), unknown_file_metadata(cx),
UNKNOWN_LINE_NUMBER, UNKNOWN_LINE_NUMBER,
vtable_type, vtable_type,

12
src/librustc_codegen_llvm/llvm/ffi.rs
View File

@ -8,16 +8,10 @@
// option. This file may not be copied, modified, or distributed // option. This file may not be copied, modified, or distributed
// except according to those terms. // 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::{ use super::debuginfo::{
DIBuilder, DIDescriptor, DIFile, DILexicalBlock, DISubprogram, DIType, DIBuilder, DIDescriptor, DIFile, DILexicalBlock, DISubprogram, DIType,
DIBasicType, DIDerivedType, DICompositeType, DIScope, DIVariable, DIBasicType, DIDerivedType, DICompositeType, DIScope, DIVariable,
DIGlobalVariable, DIArray, DISubrange, DITemplateTypeParameter, DIEnumerator, DIGlobalVariableExpression, DIArray, DISubrange, DITemplateTypeParameter, DIEnumerator,
DINameSpace, DIFlags, DINameSpace, DIFlags,
}; };
@ -447,7 +441,7 @@ pub mod debuginfo {
pub type DIDerivedType = DIType; pub type DIDerivedType = DIType;
pub type DICompositeType = DIDerivedType; pub type DICompositeType = DIDerivedType;
pub type DIVariable = DIDescriptor; pub type DIVariable = DIDescriptor;
pub type DIGlobalVariable = DIDescriptor; pub type DIGlobalVariableExpression = DIDescriptor;
pub type DIArray = DIDescriptor; pub type DIArray = DIDescriptor;
pub type DISubrange = DIDescriptor; pub type DISubrange = DIDescriptor;
pub type DIEnumerator = DIDescriptor; pub type DIEnumerator = DIDescriptor;
@ -1330,7 +1324,7 @@ extern "C" {
Val: &'a Value, Val: &'a Value,
Decl: Option<&'a DIDescriptor>, Decl: Option<&'a DIDescriptor>,
AlignInBits: u32) AlignInBits: u32)
-> &'a DIGlobalVariable; -> &'a DIGlobalVariableExpression;
pub fn LLVMRustDIBuilderCreateVariable(Builder: &DIBuilder<'a>, pub fn LLVMRustDIBuilderCreateVariable(Builder: &DIBuilder<'a>,
Tag: c_uint, Tag: c_uint,