user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rustc_codegen_llvm: move NoReturn attribute to apply_attrs_llfn.

Browse source
This commit is contained in:
Eduard-Mihai Burtescu 2019-10-29 19:46:18 +02:00
parent 95b944210f
commit 5b7d0f389f
2 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/librustc_codegen_llvm/abi.rs
View file

@ -388,6 +388,11 @@ impl<'tcx> FnAbiLlvmExt<'tcx> for FnAbi<'tcx, Ty<'tcx>> {
}
fn apply_attrs_llfn(&self, cx: &CodegenCx<'ll, 'tcx>, llfn: &'ll Value) {
// FIXME(eddyb) can this also be applied to callsites?
if self.ret.layout.abi.is_uninhabited() {
llvm::Attribute::NoReturn.apply_llfn(llvm::AttributePlace::Function, llfn);
}
let mut i = 0;
let mut apply = |attrs: &ArgAttributes, ty: Option<&Type>| {
attrs.apply_llfn(llvm::AttributePlace::Argument(i), llfn, ty);

7
src/librustc_codegen_llvm/declare.rs
View file

@ -98,14 +98,7 @@ impl DeclareMethods<'tcx> for CodegenCx<'ll, 'tcx> {
debug!("declare_rust_fn(name={:?}, fn_abi={:?})", name, fn_abi);
let llfn = declare_raw_fn(self, name, fn_abi.llvm_cconv(), fn_abi.llvm_type(self));
// FIXME(eddyb) move into `FnAbi::apply_attrs_llfn`.
if fn_abi.ret.layout.abi.is_uninhabited() {
llvm::Attribute::NoReturn.apply_llfn(Function, llfn);
}
fn_abi.apply_attrs_llfn(self, llfn);
llfn
}