// TODO(antoyo)
}
- fn landing_pad(&mut self, _ty: Type<'gcc>, _pers_fn: RValue<'gcc>, _num_clauses: usize) -> RValue<'gcc> {
+ fn cleanup_landing_pad(&mut self, _ty: Type<'gcc>, _pers_fn: RValue<'gcc>) -> RValue<'gcc> {
let field1 = self.context.new_field(None, self.u8_type, "landing_pad_field_1");
let field2 = self.context.new_field(None, self.i32_type, "landing_pad_field_1");
let struct_type = self.context.new_struct_type(None, "landing_pad", &[field1, field2]);
// rustc_codegen_ssa now calls the unwinding builder methods even on panic=abort.
}
- fn set_cleanup(&mut self, _landing_pad: RValue<'gcc>) {
- // TODO(antoyo)
- }
-
fn resume(&mut self, _exn: RValue<'gcc>) {
unimplemented!();
}
}
}
- fn landing_pad(
- &mut self,
- ty: &'ll Type,
- pers_fn: &'ll Value,
- num_clauses: usize,
- ) -> &'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 {
- llvm::LLVMBuildLandingPad(self.llbuilder, ty, None, num_clauses as c_uint, UNNAMED)
- }
- }
-
- fn set_cleanup(&mut self, landing_pad: &'ll Value) {
+ fn cleanup_landing_pad(&mut self, ty: &'ll Type, pers_fn: &'ll Value) -> &'ll Value {
+ let landing_pad = self.landing_pad(ty, pers_fn, 1 /* FIXME should this be 0? */);
unsafe {
llvm::LLVMSetCleanup(landing_pad, llvm::True);
}
+ landing_pad
}
fn resume(&mut self, exn: &'ll Value) {
None
}
}
+
+ pub(crate) fn landing_pad(
+ &mut self,
+ ty: &'ll Type,
+ pers_fn: &'ll Value,
+ num_clauses: usize,
+ ) -> &'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 {
+ llvm::LLVMBuildLandingPad(self.llbuilder, ty, None, num_clauses as c_uint, UNNAMED)
+ }
+ }
}
let llpersonality = self.cx.eh_personality();
let llretty = self.landing_pad_type();
- let lp = bx.landing_pad(llretty, llpersonality, 1);
- bx.set_cleanup(lp);
+ let lp = bx.cleanup_landing_pad(llretty, llpersonality);
let slot = self.get_personality_slot(&mut bx);
slot.storage_live(&mut bx);
fn set_personality_fn(&mut self, personality: Self::Value);
// These are used by everyone except msvc
- fn landing_pad(
- &mut self,
- ty: Self::Type,
- pers_fn: Self::Value,
- num_clauses: usize,
- ) -> Self::Value;
- fn set_cleanup(&mut self, landing_pad: Self::Value);
+ fn cleanup_landing_pad(&mut self, ty: Self::Type, pers_fn: Self::Value) -> Self::Value;
fn resume(&mut self, exn: Self::Value);
// These are used only by msvc