]> git.lizzy.rs Git - rust.git/commit - src/tools/miri
Auto merge of #86950 - tmiasko:personality, r=nagisa
authorbors <bors@rust-lang.org>
Sun, 18 Jul 2021 20:33:23 +0000 (20:33 +0000)
committerbors <bors@rust-lang.org>
Sun, 18 Jul 2021 20:33:23 +0000 (20:33 +0000)
commit59216858a323978a97593cba22b5ed84350a3783
treeaefe5dbab6851fbb1cbc03f28cc4495531e5909e
parent331da5820cfeb937dcdd76192d97a5fc4dd115c8
parentf612ba1f846c0e9ee16b0f19dd7a3719d1dddd4b
Auto merge of #86950 - tmiasko:personality, r=nagisa

Use existing declaration of rust_eh_personality

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).

Fixes #70117.
Fixes https://github.com/rust-lang/rust/pull/81469#issuecomment-809428126; probably.
compiler/rustc_codegen_llvm/src/builder.rs
compiler/rustc_codegen_llvm/src/context.rs
compiler/rustc_codegen_llvm/src/llvm/ffi.rs