bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Adapt code to latest rustc master changes

Browse source
This commit is contained in:
Denis Merigoux 2018-09-24 10:51:13 +02:00 • committed by Eduard-Mihai Burtescu
parent 441a7c1092
commit b14f3e5490
2 changed files with 3 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2013,13 +2013,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,

4
src/librustc_codegen_llvm/declare.rs
View file

@ -23,7 +23,7 @@
use llvm; use llvm;
use llvm::AttributePlace::Function; use llvm::AttributePlace::Function;
use rustc::ty::{self, PolyFnSig}; use rustc::ty::{self, PolyFnSig};
use rustc::ty::layout::{self, LayoutOf}; use rustc::ty::layout::LayoutOf;
use rustc::session::config::Sanitizer; use rustc::session::config::Sanitizer;
use rustc_data_structures::small_c_str::SmallCStr; use rustc_data_structures::small_c_str::SmallCStr;
use rustc_target::spec::PanicStrategy; use rustc_target::spec::PanicStrategy;
@ -144,7 +144,7 @@ impl DeclareMethods<'tcx> for CodegenCx<'ll, 'tcx> {
let fty = FnType::new(self, sig, &[]); let fty = FnType::new(self, sig, &[]);
let llfn = declare_raw_fn(self, name, fty.llvm_cconv(), fty.llvm_type(self)); let llfn = declare_raw_fn(self, name, fty.llvm_cconv(), fty.llvm_type(self));
if self.layout_of(sig.output()).abi == layout::Abi::Uninhabited { if self.layout_of(sig.output()).abi.is_uninhabited() {
llvm::Attribute::NoReturn.apply_llfn(Function, llfn); llvm::Attribute::NoReturn.apply_llfn(Function, llfn);
} }