diff options
| author | bors <bors@rust-lang.org> | 2021-07-18 20:33:23 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-07-18 20:33:23 +0000 |
| commit | 59216858a323978a97593cba22b5ed84350a3783 (patch) | |
| tree | aefe5dbab6851fbb1cbc03f28cc4495531e5909e /compiler/rustc_codegen_llvm/src/llvm | |
| parent | 331da5820cfeb937dcdd76192d97a5fc4dd115c8 (diff) | |
| parent | f612ba1f846c0e9ee16b0f19dd7a3719d1dddd4b (diff) | |
| download | rust-59216858a323978a97593cba22b5ed84350a3783.tar.gz rust-59216858a323978a97593cba22b5ed84350a3783.zip | |
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.
Diffstat (limited to 'compiler/rustc_codegen_llvm/src/llvm')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/llvm/ffi.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_llvm/src/llvm/ffi.rs b/compiler/rustc_codegen_llvm/src/llvm/ffi.rs index 2ade66ac41e..68d566cca09 100644 --- a/compiler/rustc_codegen_llvm/src/llvm/ffi.rs +++ b/compiler/rustc_codegen_llvm/src/llvm/ffi.rs @@ -1165,7 +1165,7 @@ extern "C" { pub fn LLVMBuildLandingPad( B: &Builder<'a>, Ty: &'a Type, - PersFn: &'a Value, + PersFn: Option<&'a Value>, NumClauses: c_uint, Name: *const c_char, ) -> &'a Value; |