Auto merge of rust-lang#117192 - saethlin:leaves-can-assert, r=<try>

bors · bors · commit 47297289968e · 2023-10-25T21:35:51.000Z
Don't treat asserts as a call in cross-crate inlining

r? `@ghost`
diff --git a/compiler/rustc_mir_transform/src/cross_crate_inline.rs b/compiler/rustc_mir_transform/src/cross_crate_inline.rs
@@ -100,7 +100,6 @@ impl<'tcx> Visitor<'tcx> for CostChecker<'_, 'tcx> {
                 }
             }
             TerminatorKind::Assert { unwind, .. } => {
-                self.calls += 1;
                 if let UnwindAction::Cleanup(_) = unwind {
                     self.landing_pads += 1;
                 }
diff --git a/tests/codegen-units/item-collection/implicit-panic-call.rs b/tests/codegen-units/item-collection/implicit-panic-call.rs
@@ -48,11 +48,11 @@ impl Div for i32 {
 }
 
 #[allow(unconditional_panic)]
+#[inline(never)]
 pub fn foo() {
     // This implicitly generates a panic call.
     let _ = 1 / 0;
 }
 
 //~ MONO_ITEM fn foo
-//~ MONO_ITEM fn <i32 as Div>::div
 //~ MONO_ITEM fn panic

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,6 @@ impl<'tcx> Visitor<'tcx> for CostChecker<'_, 'tcx> {`
`100`	`100`	`}`
`101`	`101`	`}`
`102`	`102`	`TerminatorKind::Assert { unwind, .. } => {`
`103`		`- self.calls += 1;`
`104`	`103`	`if let UnwindAction::Cleanup(_) = unwind {`
`105`	`104`	`self.landing_pads += 1;`
`106`	`105`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,11 +48,11 @@ impl Div for i32 {`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`#[allow(unconditional_panic)]`
	`51`	`+#[inline(never)]`
`51`	`52`	`pub fn foo() {`
`52`	`53`	`// This implicitly generates a panic call.`
`53`	`54`	`let _ = 1 / 0;`
`54`	`55`	`}`
`55`	`56`
`56`	`57`	`//~ MONO_ITEM fn foo`
`57`		`-//~ MONO_ITEM fn <i32 as Div>::div`
`58`	`58`	`//~ MONO_ITEM fn panic`