Merge from rustc

RalfJung · RalfJung · commit 9eb834ac0fa3 · 2023-06-17T17:42:18.000+02:00
diff --git a/tests/fail/terminate-terminator.rs b/tests/fail/terminate-terminator.rs
@@ -1,4 +1,4 @@
-//@compile-flags: -Zmir-opt-level=3
+//@compile-flags: -Zmir-opt-level=3 -Zinline-mir-hint-threshold=1000
 // Enable MIR inlining to ensure that `TerminatorKind::Terminate` is generated
 // instead of just `UnwindAction::Terminate`.
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-//@compile-flags: -Zmir-opt-level=3`
	`1`	`+//@compile-flags: -Zmir-opt-level=3 -Zinline-mir-hint-threshold=1000`
`2`	`2`	// Enable MIR inlining to ensure that `TerminatorKind::Terminate` is generated
`3`	`3`	// instead of just `UnwindAction::Terminate`.
`4`	`4`