Skip to content

Commit da4a392

Browse files
committed
Auto merge of #92419 - erikdesjardins:coldland, r=nagisa
Mark drop calls in landing pads `cold` instead of `noinline` Now that deferred inlining has been disabled in LLVM (#92110), this shouldn't cause catastrophic size blowup. I confirmed that the test cases from #41696 (comment) still compile quickly (<1s) after this change. ~Although note that I wasn't able to reproduce the original issue using a recent rustc/llvm with deferred inlining enabled, so those tests may no longer be representative. I was also unable to create a modified test case that reproduced the original issue.~ (edit: I reproduced it on CI by accident--the first commit timed out on the LLVM 12 builder, because I forgot to make it conditional on LLVM version) r? `@nagisa` cc `@arielb1` (this effectively reverts #42771 "mark calls in the unwind path as !noinline") cc `@RalfJung` (fixes #46515) edit: also fixes #87055
2 parents e6e4605 + f3e1f33 commit da4a392

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/builder.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1403,7 +1403,7 @@ impl<'a, 'gcc, 'tcx> BuilderMethods<'a, 'tcx> for Builder<'a, 'gcc, 'tcx> {
14031403
self.cx
14041404
}
14051405

1406-
fn do_not_inline(&mut self, _llret: RValue<'gcc>) {
1406+
fn apply_attrs_to_cleanup_callsite(&mut self, _llret: RValue<'gcc>) {
14071407
unimplemented!();
14081408
}
14091409

0 commit comments

Comments
 (0)