mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Set personality with LLVMSetPersonalityFn

Browse Source
This commit is contained in:
Tomasz Miąsko 2021-07-07 00:00:00 +00:00
parent a84d1b21ae
commit ae33a9714e
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
compiler/rustc_codegen_llvm/src/builder.rs
View File

@ -937,8 +937,12 @@ fn landing_pad(
pers_fn: &'ll Value, pers_fn: &'ll Value,
num_clauses: usize, num_clauses: usize,
) -> &'ll Value { ) -> &'ll Value {
// Use LLVMSetPersonalityFn to set the personality. It supports arbitrary Consts while,
// LLVMBuildLandingPad requires the argument to be a Function (as of LLVM 12). The
// personality lives on the parent function anyway.
self.set_personality_fn(pers_fn);
unsafe { unsafe {
llvm::LLVMBuildLandingPad(self.llbuilder, ty, pers_fn, num_clauses as c_uint, UNNAMED) llvm::LLVMBuildLandingPad(self.llbuilder, ty, None, num_clauses as c_uint, UNNAMED)
} }
} }

2
compiler/rustc_codegen_llvm/src/llvm/ffi.rs
View File

@ -1165,7 +1165,7 @@ pub fn LLVMRustBuildInvoke(
pub fn LLVMBuildLandingPad( pub fn LLVMBuildLandingPad(
B: &Builder<'a>, B: &Builder<'a>,
Ty: &'a Type, Ty: &'a Type,
PersFn: &'a Value, PersFn: Option<&'a Value>,
NumClauses: c_uint, NumClauses: c_uint,
Name: *const c_char, Name: *const c_char,
) -> &'a Value; ) -> &'a Value;