bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

rustc_codegen_llvm: use safe references for DIBuilder.

Browse source
This commit is contained in:
Irina Popa 2018-07-03 16:02:38 +03:00
parent 2dbde55395
commit 6d0d82ce10
3 changed files with 33 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/librustc_codegen_llvm/debuginfo/utils.rs
View file

@ -17,7 +17,7 @@ use rustc::hir::def_id::DefId;
use rustc::ty::DefIdTree;
use llvm;
use llvm::debuginfo::{DIScope, DIBuilderRef, DIDescriptor_opaque, DIArray};
use llvm::debuginfo::{DIScope, DIBuilder, DIDescriptor_opaque, DIArray};
use common::{CodegenCx};
use std::ptr::NonNull;
@ -37,7 +37,7 @@ pub fn is_node_local_to_unit(cx: &CodegenCx, def_id: DefId) -> bool
}
#[allow(non_snake_case)]
pub fn create_DIArray(builder: DIBuilderRef, arr: &[Option<NonNull<DIDescriptor_opaque>>]) -> DIArray {
pub fn create_DIArray(builder: &DIBuilder, arr: &[Option<NonNull<DIDescriptor_opaque>>]) -> DIArray {
return unsafe {
llvm::LLVMRustDIBuilderGetOrCreateArray(builder, arr.as_ptr(), arr.len() as u32)
};
@ -55,7 +55,7 @@ pub fn debug_context(cx: &'a CodegenCx<'ll, 'tcx>) -> &'a CrateDebugContext<'a,
#[inline]
#[allow(non_snake_case)]
pub fn DIB(cx: &CodegenCx) -> DIBuilderRef {
pub fn DIB(cx: &CodegenCx<'ll, '_>) -> &'ll DIBuilder {
cx.dbg_cx.as_ref().unwrap().builder
}