bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #37857 - shepmaster:llvm-4.0-dinodes, r=michaelwoerister

Browse source 
[LLVM 4.0] Handle new DIFlags enum
This commit is contained in:
bors 2016-12-04 02:30:23 +00:00
commit 125474de07
8 changed files with 177 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/Cargo.lock generated
View file

@ -403,6 +403,7 @@ version = "0.0.0"
dependencies = [ dependencies = [
"build_helper 0.1.0", "build_helper 0.1.0",
"gcc 0.3.38 (registry+https://github.com/rust-lang/crates.io-index)", "gcc 0.3.38 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc_bitflags 0.0.0",
] ]
[[package]] [[package]]

22
src/librustc_llvm/Cargo.lock generated Normal file
View file

@ -0,0 +1,22 @@
[root]
name = "rustc_llvm"
version = "0.0.0"
dependencies = [
"build_helper 0.1.0",
"gcc 0.3.28 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc_bitflags 0.0.0",
]
[[package]]
name = "build_helper"
version = "0.1.0"
[[package]]
name = "gcc"
version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "rustc_bitflags"
version = "0.0.0"

3
src/librustc_llvm/Cargo.toml
View file

@ -12,6 +12,9 @@ crate-type = ["dylib"]
[features] [features]
static-libstdcpp = [] static-libstdcpp = []
[dependencies]
rustc_bitflags = { path = "../librustc_bitflags" }
[build-dependencies] [build-dependencies]
build_helper = { path = "../build_helper" } build_helper = { path = "../build_helper" }
gcc = "0.3.27" gcc = "0.3.27"

54
src/librustc_llvm/ffi.rs
View file

@ -11,7 +11,7 @@
use debuginfo::{DIBuilderRef, DIDescriptor, DIFile, DILexicalBlock, DISubprogram, DIType, use debuginfo::{DIBuilderRef, DIDescriptor, DIFile, DILexicalBlock, DISubprogram, DIType,
DIBasicType, DIDerivedType, DICompositeType, DIScope, DIVariable, DIBasicType, DIDerivedType, DICompositeType, DIScope, DIVariable,
DIGlobalVariable, DIArray, DISubrange, DITemplateTypeParameter, DIEnumerator, DIGlobalVariable, DIArray, DISubrange, DITemplateTypeParameter, DIEnumerator,
DINameSpace}; DINameSpace, DIFlags};
use libc::{c_uint, c_int, size_t, c_char}; use libc::{c_uint, c_int, size_t, c_char};
use libc::{c_longlong, c_ulonglong, c_void}; use libc::{c_longlong, c_ulonglong, c_void};
@ -408,7 +408,6 @@ pub enum Visibility {
} }
pub mod debuginfo { pub mod debuginfo {
pub use self::DIDescriptorFlags::*;
use super::MetadataRef; use super::MetadataRef;
#[allow(missing_copy_implementations)] #[allow(missing_copy_implementations)]
@ -433,24 +432,29 @@ pub mod debuginfo {
pub type DIEnumerator = DIDescriptor; pub type DIEnumerator = DIDescriptor;
pub type DITemplateTypeParameter = DIDescriptor; pub type DITemplateTypeParameter = DIDescriptor;
#[derive(Copy, Clone)] // These values **must** match with LLVMRustDIFlags!!
pub enum DIDescriptorFlags { bitflags! {
FlagPrivate = 1 << 0, #[repr(C)]
FlagProtected = 1 << 1, #[derive(Debug, Default)]
FlagFwdDecl = 1 << 2, flags DIFlags: ::libc::uint32_t {
FlagAppleBlock = 1 << 3, const FlagZero = 0,
FlagBlockByrefStruct = 1 << 4, const FlagPrivate = 1,
FlagVirtual = 1 << 5, const FlagProtected = 2,
FlagArtificial = 1 << 6, const FlagPublic = 3,
FlagExplicit = 1 << 7, const FlagFwdDecl = (1 << 2),
FlagPrototyped = 1 << 8, const FlagAppleBlock = (1 << 3),
FlagObjcClassComplete = 1 << 9, const FlagBlockByrefStruct = (1 << 4),
FlagObjectPointer = 1 << 10, const FlagVirtual = (1 << 5),
FlagVector = 1 << 11, const FlagArtificial = (1 << 6),
FlagStaticMember = 1 << 12, const FlagExplicit = (1 << 7),
FlagIndirectVariable = 1 << 13, const FlagPrototyped = (1 << 8),
FlagLValueReference = 1 << 14, const FlagObjcClassComplete = (1 << 9),
FlagRValueReference = 1 << 15, const FlagObjectPointer = (1 << 10),
const FlagVector = (1 << 11),
const FlagStaticMember = (1 << 12),
const FlagLValueReference = (1 << 13),
const FlagRValueReference = (1 << 14),
}
} }
} }
@ -1343,7 +1347,7 @@ extern "C" {
isLocalToUnit: bool, isLocalToUnit: bool,
isDefinition: bool, isDefinition: bool,
ScopeLine: c_uint, ScopeLine: c_uint,
Flags: c_uint, Flags: DIFlags,
isOptimized: bool, isOptimized: bool,
Fn: ValueRef, Fn: ValueRef,
TParam: DIArray, TParam: DIArray,
@ -1371,7 +1375,7 @@ extern "C" {
LineNumber: c_uint, LineNumber: c_uint,
SizeInBits: u64, SizeInBits: u64,
AlignInBits: u64, AlignInBits: u64,
Flags: c_uint, Flags: DIFlags,
DerivedFrom: DIType, DerivedFrom: DIType,
Elements: DIArray, Elements: DIArray,
RunTimeLang: c_uint, RunTimeLang: c_uint,
@ -1387,7 +1391,7 @@ extern "C" {
SizeInBits: u64, SizeInBits: u64,
AlignInBits: u64, AlignInBits: u64,
OffsetInBits: u64, OffsetInBits: u64,
Flags: c_uint, Flags: DIFlags,
Ty: DIType) Ty: DIType)
-> DIDerivedType; -> DIDerivedType;
@ -1423,7 +1427,7 @@ extern "C" {
LineNo: c_uint, LineNo: c_uint,
Ty: DIType, Ty: DIType,
AlwaysPreserve: bool, AlwaysPreserve: bool,
Flags: c_uint, Flags: DIFlags,
ArgNo: c_uint) ArgNo: c_uint)
-> DIVariable; -> DIVariable;
@ -1483,7 +1487,7 @@ extern "C" {
LineNumber: c_uint, LineNumber: c_uint,
SizeInBits: u64, SizeInBits: u64,
AlignInBits: u64, AlignInBits: u64,
Flags: c_uint, Flags: DIFlags,
Elements: DIArray, Elements: DIArray,
RunTimeLang: c_uint, RunTimeLang: c_uint,
UniqueId: *const c_char) UniqueId: *const c_char)

4
src/librustc_llvm/lib.rs
View file

@ -29,8 +29,12 @@
#![feature(link_args)] #![feature(link_args)]
#![feature(linked_from)] #![feature(linked_from)]
#![feature(staged_api)] #![feature(staged_api)]
#![cfg_attr(not(stage0), feature(rustc_private))]
extern crate libc; extern crate libc;
#[macro_use]
#[no_link]
extern crate rustc_bitflags;
pub use self::IntPredicate::*; pub use self::IntPredicate::*;
pub use self::RealPredicate::*; pub use self::RealPredicate::*;

35
src/librustc_trans/debuginfo/metadata.rs
View file

@ -22,7 +22,8 @@ use context::SharedCrateContext;
use session::Session; use session::Session;
use llvm::{self, ValueRef}; use llvm::{self, ValueRef};
use llvm::debuginfo::{DIType, DIFile, DIScope, DIDescriptor, DICompositeType, DILexicalBlock}; use llvm::debuginfo::{DIType, DIFile, DIScope, DIDescriptor,
DICompositeType, DILexicalBlock, DIFlags};
use rustc::hir::def::CtorKind; use rustc::hir::def::CtorKind;
use rustc::hir::def_id::DefId; use rustc::hir::def_id::DefId;
@ -69,8 +70,6 @@ pub const UNKNOWN_COLUMN_NUMBER: c_uint = 0;
// ptr::null() doesn't work :( // ptr::null() doesn't work :(
pub const NO_SCOPE_METADATA: DIScope = (0 as DIScope); pub const NO_SCOPE_METADATA: DIScope = (0 as DIScope);
const FLAGS_NONE: c_uint = 0;
#[derive(Copy, Debug, Hash, Eq, PartialEq, Clone)] #[derive(Copy, Debug, Hash, Eq, PartialEq, Clone)]
pub struct UniqueTypeId(ast::Name); pub struct UniqueTypeId(ast::Name);
@ -347,14 +346,14 @@ fn vec_slice_metadata<'a, 'tcx>(cx: &CrateContext<'a, 'tcx>,
llvm_type: member_llvm_types[0], llvm_type: member_llvm_types[0],
type_metadata: element_type_metadata, type_metadata: element_type_metadata,
offset: ComputedMemberOffset, offset: ComputedMemberOffset,
flags: FLAGS_NONE flags: DIFlags::FlagZero,
}, },
MemberDescription { MemberDescription {
name: "length".to_string(), name: "length".to_string(),
llvm_type: member_llvm_types[1], llvm_type: member_llvm_types[1],
type_metadata: type_metadata(cx, cx.tcx().types.usize, span), type_metadata: type_metadata(cx, cx.tcx().types.usize, span),
offset: ComputedMemberOffset, offset: ComputedMemberOffset,
flags: FLAGS_NONE flags: DIFlags::FlagZero,
}, },
]; ];
@ -838,7 +837,7 @@ struct MemberDescription {
llvm_type: Type, llvm_type: Type,
type_metadata: DIType, type_metadata: DIType,
offset: MemberOffset, offset: MemberOffset,
flags: c_uint flags: DIFlags,
} }
// A factory for MemberDescriptions. It produces a list of member descriptions // A factory for MemberDescriptions. It produces a list of member descriptions
@ -922,7 +921,7 @@ impl<'tcx> StructMemberDescriptionFactory<'tcx> {
llvm_type: type_of::type_of(cx, fty), llvm_type: type_of::type_of(cx, fty),
type_metadata: type_metadata(cx, fty, self.span), type_metadata: type_metadata(cx, fty, self.span),
offset: offset, offset: offset,
flags: FLAGS_NONE, flags: DIFlags::FlagZero,
} }
}).collect() }).collect()
} }
@ -987,7 +986,7 @@ impl<'tcx> TupleMemberDescriptionFactory<'tcx> {
llvm_type: type_of::type_of(cx, component_type), llvm_type: type_of::type_of(cx, component_type),
type_metadata: type_metadata(cx, component_type, self.span), type_metadata: type_metadata(cx, component_type, self.span),
offset: ComputedMemberOffset, offset: ComputedMemberOffset,
flags: FLAGS_NONE, flags: DIFlags::FlagZero,
} }
}).collect() }).collect()
} }
@ -1039,7 +1038,7 @@ impl<'tcx> UnionMemberDescriptionFactory<'tcx> {
llvm_type: type_of::type_of(cx, fty), llvm_type: type_of::type_of(cx, fty),
type_metadata: type_metadata(cx, fty, self.span), type_metadata: type_metadata(cx, fty, self.span),
offset: FixedMemberOffset { bytes: 0 }, offset: FixedMemberOffset { bytes: 0 },
flags: FLAGS_NONE, flags: DIFlags::FlagZero,
} }
}).collect() }).collect()
} }
@ -1137,7 +1136,7 @@ impl<'tcx> EnumMemberDescriptionFactory<'tcx> {
llvm_type: variant_llvm_type, llvm_type: variant_llvm_type,
type_metadata: variant_type_metadata, type_metadata: variant_type_metadata,
offset: FixedMemberOffset { bytes: 0 }, offset: FixedMemberOffset { bytes: 0 },
flags: FLAGS_NONE flags: DIFlags::FlagZero
} }
}).collect() }).collect()
}, },
@ -1171,7 +1170,7 @@ impl<'tcx> EnumMemberDescriptionFactory<'tcx> {
llvm_type: variant_llvm_type, llvm_type: variant_llvm_type,
type_metadata: variant_type_metadata, type_metadata: variant_type_metadata,
offset: FixedMemberOffset { bytes: 0 }, offset: FixedMemberOffset { bytes: 0 },
flags: FLAGS_NONE flags: DIFlags::FlagZero
} }
] ]
} }
@ -1208,7 +1207,7 @@ impl<'tcx> EnumMemberDescriptionFactory<'tcx> {
llvm_type: non_null_llvm_type, llvm_type: non_null_llvm_type,
type_metadata: non_null_type_metadata, type_metadata: non_null_type_metadata,
offset: FixedMemberOffset { bytes: 0 }, offset: FixedMemberOffset { bytes: 0 },
flags: FLAGS_NONE flags: DIFlags::FlagZero
}; };
let unique_type_id = debug_context(cx).type_map let unique_type_id = debug_context(cx).type_map
@ -1245,7 +1244,7 @@ impl<'tcx> EnumMemberDescriptionFactory<'tcx> {
llvm_type: artificial_struct_llvm_type, llvm_type: artificial_struct_llvm_type,
type_metadata: artificial_struct_metadata, type_metadata: artificial_struct_metadata,
offset: FixedMemberOffset { bytes: 0 }, offset: FixedMemberOffset { bytes: 0 },
flags: FLAGS_NONE flags: DIFlags::FlagZero
} }
] ]
}, },
@ -1289,7 +1288,7 @@ impl<'tcx> EnumMemberDescriptionFactory<'tcx> {
llvm_type: variant_llvm_type, llvm_type: variant_llvm_type,
type_metadata: variant_type_metadata, type_metadata: variant_type_metadata,
offset: FixedMemberOffset { bytes: 0 }, offset: FixedMemberOffset { bytes: 0 },
flags: FLAGS_NONE flags: DIFlags::FlagZero
} }
] ]
}, },
@ -1318,7 +1317,7 @@ impl<'tcx> VariantMemberDescriptionFactory<'tcx> {
_ => type_metadata(cx, ty, self.span) _ => type_metadata(cx, ty, self.span)
}, },
offset: ComputedMemberOffset, offset: ComputedMemberOffset,
flags: FLAGS_NONE flags: DIFlags::FlagZero
} }
}).collect() }).collect()
} }
@ -1535,7 +1534,7 @@ fn prepare_enum_metadata<'a, 'tcx>(cx: &CrateContext<'a, 'tcx>,
UNKNOWN_LINE_NUMBER, UNKNOWN_LINE_NUMBER,
bytes_to_bits(enum_type_size), bytes_to_bits(enum_type_size),
bytes_to_bits(enum_type_align), bytes_to_bits(enum_type_align),
0, // Flags DIFlags::FlagZero,
ptr::null_mut(), ptr::null_mut(),
0, // RuntimeLang 0, // RuntimeLang
unique_type_id_str.as_ptr()) unique_type_id_str.as_ptr())
@ -1680,7 +1679,7 @@ fn create_struct_stub(cx: &CrateContext,
UNKNOWN_LINE_NUMBER, UNKNOWN_LINE_NUMBER,
bytes_to_bits(struct_size), bytes_to_bits(struct_size),
bytes_to_bits(struct_align), bytes_to_bits(struct_align),
0, DIFlags::FlagZero,
ptr::null_mut(), ptr::null_mut(),
empty_array, empty_array,
0, 0,
@ -1717,7 +1716,7 @@ fn create_union_stub(cx: &CrateContext,
UNKNOWN_LINE_NUMBER, UNKNOWN_LINE_NUMBER,
bytes_to_bits(union_size), bytes_to_bits(union_size),
bytes_to_bits(union_align), bytes_to_bits(union_align),
0, // Flags DIFlags::FlagZero,
empty_array, empty_array,
0, // RuntimeLang 0, // RuntimeLang
unique_type_id.as_ptr()) unique_type_id.as_ptr())

7
src/librustc_trans/debuginfo/mod.rs
View file

@ -22,8 +22,7 @@ use self::source_loc::InternalDebugLocation::{self, UnknownLocation};
use llvm; use llvm;
use llvm::{ModuleRef, ContextRef, ValueRef}; use llvm::{ModuleRef, ContextRef, ValueRef};
use llvm::debuginfo::{DIFile, DIType, DIScope, DIBuilderRef, DISubprogram, DIArray, use llvm::debuginfo::{DIFile, DIType, DIScope, DIBuilderRef, DISubprogram, DIArray, DIFlags};
FlagPrototyped};
use rustc::hir::def_id::DefId; use rustc::hir::def_id::DefId;
use rustc::ty::subst::Substs; use rustc::ty::subst::Substs;
@ -286,7 +285,7 @@ pub fn create_function_debug_context<'a, 'tcx>(cx: &CrateContext<'a, 'tcx>,
is_local_to_unit, is_local_to_unit,
true, true,
scope_line as c_uint, scope_line as c_uint,
FlagPrototyped as c_uint, DIFlags::FlagPrototyped,
cx.sess().opts.optimize != config::OptLevel::No, cx.sess().opts.optimize != config::OptLevel::No,
llfn, llfn,
template_parameters, template_parameters,
@ -478,7 +477,7 @@ pub fn declare_local<'blk, 'tcx>(bcx: Block<'blk, 'tcx>,
loc.line as c_uint, loc.line as c_uint,
type_metadata, type_metadata,
cx.sess().opts.optimize != config::OptLevel::No, cx.sess().opts.optimize != config::OptLevel::No,
0, DIFlags::FlagZero,
argument_index) argument_index)
}; };
source_loc::set_debug_location(cx, None, source_loc::set_debug_location(cx, None,

111
src/rustllvm/RustWrapper.cpp
View file

@ -352,6 +352,91 @@ DIT* unwrapDIptr(LLVMRustMetadataRef ref) {
#define DIArray DINodeArray #define DIArray DINodeArray
#define unwrapDI unwrapDIptr #define unwrapDI unwrapDIptr
// These values **must** match debuginfo::DIFlags! They also *happen*
// to match LLVM, but that isn't required as we do giant sets of
// matching below. The value shouldn't be directly passed to LLVM.
enum class LLVMRustDIFlags : uint32_t {
FlagZero = 0,
FlagPrivate = 1,
FlagProtected = 2,
FlagPublic = 3,
FlagFwdDecl = (1 << 2),
FlagAppleBlock = (1 << 3),
FlagBlockByrefStruct = (1 << 4),
FlagVirtual = (1 << 5),
FlagArtificial = (1 << 6),
FlagExplicit = (1 << 7),
FlagPrototyped = (1 << 8),
FlagObjcClassComplete = (1 << 9),
FlagObjectPointer = (1 << 10),
FlagVector = (1 << 11),
FlagStaticMember = (1 << 12),
FlagLValueReference = (1 << 13),
FlagRValueReference = (1 << 14),
// Do not add values that are not supported by the minimum LLVM
// version we support!
};
inline LLVMRustDIFlags operator& (LLVMRustDIFlags a, LLVMRustDIFlags b) {
return static_cast<LLVMRustDIFlags>(static_cast<uint32_t>(a) & static_cast<uint32_t>(b));
}
inline LLVMRustDIFlags operator| (LLVMRustDIFlags a, LLVMRustDIFlags b) {
return static_cast<LLVMRustDIFlags>(static_cast<uint32_t>(a) | static_cast<uint32_t>(b));
}
inline LLVMRustDIFlags& operator|= (LLVMRustDIFlags& a, LLVMRustDIFlags b) {
return a = a | b;
}
inline bool is_set(LLVMRustDIFlags f) {
return f != LLVMRustDIFlags::FlagZero;
}
inline LLVMRustDIFlags visibility(LLVMRustDIFlags f) {
return static_cast<LLVMRustDIFlags>(static_cast<uint32_t>(f) & 0x3);
}
#if LLVM_VERSION_GE(4, 0)
static DINode::DIFlags from_rust(LLVMRustDIFlags flags) {
DINode::DIFlags result = DINode::DIFlags::FlagZero;
#else
static unsigned from_rust(LLVMRustDIFlags flags) {
unsigned result = 0;
#endif
switch (visibility(flags)) {
case LLVMRustDIFlags::FlagPrivate:
result |= DINode::DIFlags::FlagPrivate;
break;
case LLVMRustDIFlags::FlagProtected:
result |= DINode::DIFlags::FlagProtected;
break;
case LLVMRustDIFlags::FlagPublic:
result |= DINode::DIFlags::FlagPublic;
break;
default:
// The rest are handled below
break;
}
if (is_set(flags & LLVMRustDIFlags::FlagFwdDecl)) { result |= DINode::DIFlags::FlagFwdDecl; }
if (is_set(flags & LLVMRustDIFlags::FlagAppleBlock)) { result |= DINode::DIFlags::FlagAppleBlock; }
if (is_set(flags & LLVMRustDIFlags::FlagBlockByrefStruct)) { result |= DINode::DIFlags::FlagBlockByrefStruct; }
if (is_set(flags & LLVMRustDIFlags::FlagVirtual)) { result |= DINode::DIFlags::FlagVirtual; }
if (is_set(flags & LLVMRustDIFlags::FlagArtificial)) { result |= DINode::DIFlags::FlagArtificial; }
if (is_set(flags & LLVMRustDIFlags::FlagExplicit)) { result |= DINode::DIFlags::FlagExplicit; }
if (is_set(flags & LLVMRustDIFlags::FlagPrototyped)) { result |= DINode::DIFlags::FlagPrototyped; }
if (is_set(flags & LLVMRustDIFlags::FlagObjcClassComplete)) { result |= DINode::DIFlags::FlagObjcClassComplete; }
if (is_set(flags & LLVMRustDIFlags::FlagObjectPointer)) { result |= DINode::DIFlags::FlagObjectPointer; }
if (is_set(flags & LLVMRustDIFlags::FlagVector)) { result |= DINode::DIFlags::FlagVector; }
if (is_set(flags & LLVMRustDIFlags::FlagStaticMember)) { result |= DINode::DIFlags::FlagStaticMember; }
if (is_set(flags & LLVMRustDIFlags::FlagLValueReference)) { result |= DINode::DIFlags::FlagLValueReference; }
if (is_set(flags & LLVMRustDIFlags::FlagRValueReference)) { result |= DINode::DIFlags::FlagRValueReference; }
return result;
}
extern "C" uint32_t LLVMRustDebugMetadataVersion() { extern "C" uint32_t LLVMRustDebugMetadataVersion() {
return DEBUG_METADATA_VERSION; return DEBUG_METADATA_VERSION;
} }
@ -431,7 +516,7 @@ extern "C" LLVMRustMetadataRef LLVMRustDIBuilderCreateFunction(
bool isLocalToUnit, bool isLocalToUnit,
bool isDefinition, bool isDefinition,
unsigned ScopeLine, unsigned ScopeLine,
unsigned Flags, LLVMRustDIFlags Flags,
bool isOptimized, bool isOptimized,
LLVMValueRef Fn, LLVMValueRef Fn,
LLVMRustMetadataRef TParam, LLVMRustMetadataRef TParam,
@ -443,7 +528,7 @@ extern "C" LLVMRustMetadataRef LLVMRustDIBuilderCreateFunction(
unwrapDI<DIScope>(Scope), Name, LinkageName, unwrapDI<DIScope>(Scope), Name, LinkageName,
unwrapDI<DIFile>(File), LineNo, unwrapDI<DIFile>(File), LineNo,
unwrapDI<DISubroutineType>(Ty), isLocalToUnit, isDefinition, ScopeLine, unwrapDI<DISubroutineType>(Ty), isLocalToUnit, isDefinition, ScopeLine,
Flags, isOptimized, from_rust(Flags), isOptimized,
TParams, TParams,
unwrapDIptr<DISubprogram>(Decl)); unwrapDIptr<DISubprogram>(Decl));
unwrap<Function>(Fn)->setSubprogram(Sub); unwrap<Function>(Fn)->setSubprogram(Sub);
@ -453,7 +538,7 @@ extern "C" LLVMRustMetadataRef LLVMRustDIBuilderCreateFunction(
unwrapDI<DIScope>(Scope), Name, LinkageName, unwrapDI<DIScope>(Scope), Name, LinkageName,
unwrapDI<DIFile>(File), LineNo, unwrapDI<DIFile>(File), LineNo,
unwrapDI<DISubroutineType>(Ty), isLocalToUnit, isDefinition, ScopeLine, unwrapDI<DISubroutineType>(Ty), isLocalToUnit, isDefinition, ScopeLine,
Flags, isOptimized, from_rust(Flags), isOptimized,
unwrap<Function>(Fn), unwrap<Function>(Fn),
unwrapDIptr<MDNode>(TParam), unwrapDIptr<MDNode>(TParam),
unwrapDIptr<MDNode>(Decl))); unwrapDIptr<MDNode>(Decl)));
@ -489,7 +574,7 @@ extern "C" LLVMRustMetadataRef LLVMRustDIBuilderCreateStructType(
unsigned LineNumber, unsigned LineNumber,
uint64_t SizeInBits, uint64_t SizeInBits,
uint64_t AlignInBits, uint64_t AlignInBits,
unsigned Flags, LLVMRustDIFlags Flags,
LLVMRustMetadataRef DerivedFrom, LLVMRustMetadataRef DerivedFrom,
LLVMRustMetadataRef Elements, LLVMRustMetadataRef Elements,
unsigned RunTimeLang, unsigned RunTimeLang,
@ -502,7 +587,7 @@ extern "C" LLVMRustMetadataRef LLVMRustDIBuilderCreateStructType(
LineNumber, LineNumber,
SizeInBits, SizeInBits,
AlignInBits, AlignInBits,
Flags, from_rust(Flags),
unwrapDI<DIType>(DerivedFrom), unwrapDI<DIType>(DerivedFrom),
DINodeArray(unwrapDI<MDTuple>(Elements)), DINodeArray(unwrapDI<MDTuple>(Elements)),
RunTimeLang, RunTimeLang,
@ -520,12 +605,12 @@ extern "C" LLVMRustMetadataRef LLVMRustDIBuilderCreateMemberType(
uint64_t SizeInBits, uint64_t SizeInBits,
uint64_t AlignInBits, uint64_t AlignInBits,
uint64_t OffsetInBits, uint64_t OffsetInBits,
unsigned Flags, LLVMRustDIFlags Flags,
LLVMRustMetadataRef Ty) { LLVMRustMetadataRef Ty) {
return wrap(Builder->createMemberType( return wrap(Builder->createMemberType(
unwrapDI<DIDescriptor>(Scope), Name, unwrapDI<DIDescriptor>(Scope), Name,
unwrapDI<DIFile>(File), LineNo, unwrapDI<DIFile>(File), LineNo,
SizeInBits, AlignInBits, OffsetInBits, Flags, SizeInBits, AlignInBits, OffsetInBits, from_rust(Flags),
unwrapDI<DIType>(Ty))); unwrapDI<DIType>(Ty)));
} }
@ -581,7 +666,7 @@ extern "C" LLVMRustMetadataRef LLVMRustDIBuilderCreateVariable(
unsigned LineNo, unsigned LineNo,
LLVMRustMetadataRef Ty, LLVMRustMetadataRef Ty,
bool AlwaysPreserve, bool AlwaysPreserve,
unsigned Flags, LLVMRustDIFlags Flags,
unsigned ArgNo) { unsigned ArgNo) {
#if LLVM_VERSION_GE(3, 8) #if LLVM_VERSION_GE(3, 8)
if (Tag == 0x100) { // DW_TAG_auto_variable if (Tag == 0x100) { // DW_TAG_auto_variable
@ -589,20 +674,20 @@ extern "C" LLVMRustMetadataRef LLVMRustDIBuilderCreateVariable(
unwrapDI<DIDescriptor>(Scope), Name, unwrapDI<DIDescriptor>(Scope), Name,
unwrapDI<DIFile>(File), unwrapDI<DIFile>(File),
LineNo, LineNo,
unwrapDI<DIType>(Ty), AlwaysPreserve, Flags)); unwrapDI<DIType>(Ty), AlwaysPreserve, from_rust(Flags)));
} else { } else {
return wrap(Builder->createParameterVariable( return wrap(Builder->createParameterVariable(
unwrapDI<DIDescriptor>(Scope), Name, ArgNo, unwrapDI<DIDescriptor>(Scope), Name, ArgNo,
unwrapDI<DIFile>(File), unwrapDI<DIFile>(File),
LineNo, LineNo,
unwrapDI<DIType>(Ty), AlwaysPreserve, Flags)); unwrapDI<DIType>(Ty), AlwaysPreserve, from_rust(Flags)));
} }
#else #else
return wrap(Builder->createLocalVariable(Tag, return wrap(Builder->createLocalVariable(Tag,
unwrapDI<DIDescriptor>(Scope), Name, unwrapDI<DIDescriptor>(Scope), Name,
unwrapDI<DIFile>(File), unwrapDI<DIFile>(File),
LineNo, LineNo,
unwrapDI<DIType>(Ty), AlwaysPreserve, Flags, ArgNo)); unwrapDI<DIType>(Ty), AlwaysPreserve, from_rust(Flags), ArgNo));
#endif #endif
} }
@ -701,7 +786,7 @@ extern "C" LLVMRustMetadataRef LLVMRustDIBuilderCreateUnionType(
unsigned LineNumber, unsigned LineNumber,
uint64_t SizeInBits, uint64_t SizeInBits,
uint64_t AlignInBits, uint64_t AlignInBits,
unsigned Flags, LLVMRustDIFlags Flags,
LLVMRustMetadataRef Elements, LLVMRustMetadataRef Elements,
unsigned RunTimeLang, unsigned RunTimeLang,
const char* UniqueId) const char* UniqueId)
@ -713,7 +798,7 @@ extern "C" LLVMRustMetadataRef LLVMRustDIBuilderCreateUnionType(
LineNumber, LineNumber,
SizeInBits, SizeInBits,
AlignInBits, AlignInBits,
Flags, from_rust(Flags),
DINodeArray(unwrapDI<MDTuple>(Elements)), DINodeArray(unwrapDI<MDTuple>(Elements)),
RunTimeLang, RunTimeLang,
UniqueId UniqueId