rust-lang
diff --git a/‎compiler/rustc_mir_transform/src/cross_crate_inline.rs‎
Lines changed: 6 additions & 1 deletion b/‎compiler/rustc_mir_transform/src/cross_crate_inline.rs‎
Lines changed: 6 additions & 1 deletion
diff --git a/‎compiler/rustc_monomorphize/src/partitioning.rs‎
Lines changed: 1 addition & 1 deletion b/‎compiler/rustc_monomorphize/src/partitioning.rs‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎tests/assembly-llvm/breakpoint.rs‎
Lines changed: 1 addition & 0 deletions b/‎tests/assembly-llvm/breakpoint.rs‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎tests/assembly-llvm/simd/reduce-fadd-unordered.rs‎
Lines changed: 1 addition & 0 deletions b/‎tests/assembly-llvm/simd/reduce-fadd-unordered.rs‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎tests/codegen-llvm/default-visibility.rs‎
Lines changed: 1 addition & 0 deletions b/‎tests/codegen-llvm/default-visibility.rs‎
Lines changed: 1 addition & 0 deletions
@@ -135,7 +135,12 @@ impl<'tcx> Visitor<'tcx> for CostChecker<'_, 'tcx> {
                     }
                 }
             }
-            TerminatorKind::Call { unwind, .. } => {
+            TerminatorKind::Call { ref func, unwind, .. } => {
+                if let Some((fn_def_id, _)) = func.const_fn_def() {
+                    if self.tcx.has_attr(fn_def_id, sym::rustc_intrinsic) {
+                        return;
+                    }
+                }
                 self.calls += 1;
                 if let UnwindAction::Cleanup(_) = unwind {
                     self.landing_pads += 1;
 
@@ -164,7 +164,7 @@ where
     // Merge until we don't exceed the max CGU count.
     // `merge_codegen_units` is responsible for updating the CGU size
     // estimates.
-    {
+    if tcx.sess.opts.incremental.is_none() {
         let _prof_timer = tcx.prof.generic_activity("cgu_partitioning_merge_cgus");
         merge_codegen_units(cx, &mut codegen_units);
         debug_dump(tcx, "MERGE", &codegen_units);
 
@@ -9,6 +9,7 @@
 // CHECK-LABEL: use_bp
 // aarch64: brk #0xf000
 // x86_64: int3
+#[inline(never)]
 pub fn use_bp() {
     core::arch::breakpoint();
 }
@@ -16,6 +16,7 @@ use std::simd::*;
 // It would emit about an extra fadd, depending on the architecture.
 
 // CHECK-LABEL: reduce_fadd_negative_zero
+#[inline(never)]
 pub unsafe fn reduce_fadd_negative_zero(v: f32x4) -> f32 {
     // x86_64: addps
     // x86_64-NEXT: movshdup
 
@@ -32,6 +32,7 @@ pub static tested_symbol: [u8; 6] = *b"foobar";
 // INTERPOSABLE: @{{.*}}default_visibility{{.*}}tested_symbol{{.*}} = constant
 // DEFAULT:      @{{.*}}default_visibility{{.*}}tested_symbol{{.*}} = constant
 
+#[inline(never)]
 pub fn do_memcmp(left: &[u8], right: &[u8]) -> i32 {
     left.cmp(right) as i32
 }
Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,12 @@ impl<'tcx> Visitor<'tcx> for CostChecker<'_, 'tcx> {`
`135`	`135`	`}`
`136`	`136`	`}`
`137`	`137`	`}`
`138`		`- TerminatorKind::Call { unwind, .. } => {`
	`138`	`+ TerminatorKind::Call { ref func, unwind, .. } => {`
	`139`	`+ if let Some((fn_def_id, _)) = func.const_fn_def() {`
	`140`	`+ if self.tcx.has_attr(fn_def_id, sym::rustc_intrinsic) {`
	`141`	`+ return;`
	`142`	`+ }`
	`143`	`+ }`
`139`	`144`	`self.calls += 1;`
`140`	`145`	`if let UnwindAction::Cleanup(_) = unwind {`
`141`	`146`	`self.landing_pads += 1;`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`	`// CHECK-LABEL: use_bp`
`10`	`10`	`// aarch64: brk #0xf000`
`11`	`11`	`// x86_64: int3`
	`12`	`+#[inline(never)]`
`12`	`13`	`pub fn use_bp() {`
`13`	`14`	`core::arch::breakpoint();`
`14`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ pub static tested_symbol: [u8; 6] = *b"foobar";`
`32`	`32`	`// INTERPOSABLE: @{{.}}default_visibility{{.}}tested_symbol{{.*}} = constant`
`33`	`33`	`// DEFAULT: @{{.}}default_visibility{{.}}tested_symbol{{.*}} = constant`
`34`	`34`
	`35`	`+#[inline(never)]`
`35`	`36`	`pub fn do_memcmp(left: &[u8], right: &[u8]) -> i32 {`
`36`	`37`	`left.cmp(right) as i32`
`37`	`38`	`}`