Skip to content

Commit

Permalink
Use existing declaration of rust_eh_personality
Browse files Browse the repository at this point in the history
If crate declares `rust_eh_personality`, re-use existing declaration
as otherwise attempts to set function attributes that follow the
declaration will fail (unless it happens to have exactly the same
type signature as the one predefined in the compiler).
  • Loading branch information
tmiasko committed Jul 10, 2021
1 parent ae33a97 commit f612ba1
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 3 deletions.
11 changes: 8 additions & 3 deletions compiler/rustc_codegen_llvm/src/context.rs
Expand Up @@ -385,11 +385,16 @@ impl MiscMethods<'tcx> for CodegenCx<'ll, 'tcx> {
} else {
"rust_eh_personality"
};
let fty = self.type_variadic_func(&[], self.type_i32());
self.declare_cfn(name, llvm::UnnamedAddr::Global, fty)
if let Some(llfn) = self.get_declared_value(name) {
llfn
} else {
let fty = self.type_variadic_func(&[], self.type_i32());
let llfn = self.declare_cfn(name, llvm::UnnamedAddr::Global, fty);
attributes::apply_target_cpu_attr(self, llfn);
llfn
}
}
};
attributes::apply_target_cpu_attr(self, llfn);
self.eh_personality.set(Some(llfn));
llfn
}
Expand Down
24 changes: 24 additions & 0 deletions src/test/ui/panic-runtime/incompatible-type.rs
@@ -0,0 +1,24 @@
// Check that rust_eh_personality can have a different type signature than the
// one hardcoded in the compiler. Regression test for #70117. Used to fail with:
//
// Assertion `isa<X>(Val) && "cast<Ty>() argument of incompatible type!"' failed.
//
// build-pass
// compile-flags: --crate-type=lib -Ccodegen-units=1
#![no_std]
#![panic_runtime]
#![feature(panic_runtime)]
#![feature(rustc_attrs)]

pub struct DropMe;

impl Drop for DropMe {
fn drop(&mut self) {}
}

pub fn test(_: DropMe) {
unreachable!();
}

#[rustc_std_internal_symbol]
pub unsafe extern "C" fn rust_eh_personality() {}

0 comments on commit f612ba1

Please sign in to comment.