1
Fork 0

Mark drop calls in landing pads cold instead of noinline

Now that deferred inlining has been disabled in LLVM,
this shouldn't cause catastrophic size blowup.
This commit is contained in:
Erik Desjardins 2021-12-29 15:28:31 -05:00
parent 7ae5508426
commit 2b662217e7
6 changed files with 42 additions and 9 deletions

View file

@ -160,11 +160,8 @@ impl<'a, 'tcx> TerminatorCodegenHelper<'tcx> {
let llret = bx.call(fn_ty, fn_ptr, &llargs, self.funclet(fx));
bx.apply_attrs_callsite(&fn_abi, llret);
if fx.mir[self.bb].is_cleanup {
// Cleanup is always the cold path. Don't inline
// drop glue. Also, when there is a deeply-nested
// struct, there are "symmetry" issues that cause
// exponential inlining - see issue #41696.
bx.do_not_inline(llret);
// Cleanup is always the cold path.
bx.mark_callsite_cold(llret);
}
if let Some((ret_dest, target)) = destination {

View file

@ -311,5 +311,5 @@ pub trait BuilderMethods<'a, 'tcx>:
) -> Self::Value;
fn zext(&mut self, val: Self::Value, dest_ty: Self::Type) -> Self::Value;
fn do_not_inline(&mut self, llret: Self::Value);
fn mark_callsite_cold(&mut self, llret: Self::Value);
}