about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSantiago Pastorino <spastorino@gmail.com>2021-03-04 10:35:11 -0300
committerSantiago Pastorino <spastorino@gmail.com>2021-03-05 17:13:57 -0300
commitaf63afc09a1912146ce5d2ce226d4308587421d5 (patch)
tree8d73d4d113b710907dc33b06a6fedfbb6afd03d7
parent705813c84b8c896f415ef8ccb2500b153572f590 (diff)
downloadrust-af63afc09a1912146ce5d2ce226d4308587421d5.tar.gz
rust-af63afc09a1912146ce5d2ce226d4308587421d5.zip
Bump mir-opt-level from 2 to 3 in tests
-rw-r--r--src/test/codegen/issue-59352.rs4
-rw-r--r--src/test/codegen/naked-noinline.rs2
-rw-r--r--src/test/codegen/try_identity.rs2
-rw-r--r--src/test/mir-opt/const_prop/issue-66971.rs2
-rw-r--r--src/test/mir-opt/const_prop/issue-67019.rs2
-rw-r--r--src/test/mir-opt/issues/issue-59352.rs2
-rw-r--r--src/test/mir-opt/simplify-arm-identity.rs2
-rw-r--r--src/test/mir-opt/simplify-arm.rs2
-rw-r--r--src/test/ui/const_prop/inline_spans.rs2
-rw-r--r--src/test/ui/const_prop/inline_spans_lint_attribute.rs2
-rw-r--r--src/test/ui/consts/issue-67529.rs2
-rw-r--r--src/test/ui/consts/issue-67641.rs2
-rw-r--r--src/test/ui/consts/issue-67862.rs2
-rw-r--r--src/test/ui/consts/trait_specialization.rs2
-rw-r--r--src/test/ui/dest-prop/skeptic-miscompile.rs2
-rw-r--r--src/test/ui/issues/issue-50865-private-impl-trait/auxiliary/lib.rs2
-rw-r--r--src/test/ui/issues/issue-77002.rs2
-rw-r--r--src/test/ui/mir/auxiliary/issue_76375_aux.rs2
-rw-r--r--src/test/ui/mir/issue-66851.rs2
-rw-r--r--src/test/ui/mir/issue-67710-inline-projection.rs2
-rw-r--r--src/test/ui/mir/issue-68841.rs2
-rw-r--r--src/test/ui/mir/issue-71793-inline-args-storage.rs2
-rw-r--r--src/test/ui/mir/issue-75053.rs2
-rw-r--r--src/test/ui/mir/issue-76248.rs2
-rw-r--r--src/test/ui/mir/issue-76375.rs2
-rw-r--r--src/test/ui/mir/issue-77911.rs2
-rw-r--r--src/test/ui/mir/issue-78496.rs2
-rw-r--r--src/test/ui/mir/issue66339.rs2
-rw-r--r--src/test/ui/mir/mir-inlining/array-clone-with-generic-size.rs2
-rw-r--r--src/test/ui/mir/mir-inlining/ice-issue-45493.rs2
-rw-r--r--src/test/ui/mir/mir-inlining/ice-issue-45885.rs2
-rw-r--r--src/test/ui/mir/mir-inlining/ice-issue-68347.rs2
-rw-r--r--src/test/ui/mir/mir-inlining/ice-issue-77306-1.rs2
-rw-r--r--src/test/ui/mir/mir-inlining/ice-issue-77306-2.rs2
-rw-r--r--src/test/ui/mir/mir-inlining/ice-issue-77564.rs2
-rw-r--r--src/test/ui/mir/mir-inlining/inline-instrument-coverage-fail.rs4
-rw-r--r--src/test/ui/mir/mir-inlining/no-trait-method-issue-40473.rs2
-rw-r--r--src/test/ui/mir/mir-inlining/var-debuginfo-issue-67586.rs2
-rw-r--r--src/test/ui/mir/mir_const_prop_tuple_field_reorder.rs2
39 files changed, 41 insertions, 41 deletions
diff --git a/src/test/codegen/issue-59352.rs b/src/test/codegen/issue-59352.rs
index 28bb8591232..d271fe027e3 100644
--- a/src/test/codegen/issue-59352.rs
+++ b/src/test/codegen/issue-59352.rs
@@ -5,8 +5,8 @@
 // Once the optimizer can do that, mir-opt/issues/issue-59352.rs will need to be updated and this
 // test case should be removed as it will become redundant.
 
-// mir-opt-level=2 enables inlining and enables LLVM to optimize away the unreachable panic call.
-// compile-flags: -O -Z mir-opt-level=2
+// mir-opt-level=3 enables inlining and enables LLVM to optimize away the unreachable panic call.
+// compile-flags: -O -Z mir-opt-level=3
 
 #![crate_type = "rlib"]
 
diff --git a/src/test/codegen/naked-noinline.rs b/src/test/codegen/naked-noinline.rs
index 2a2208d4fce..d9e6f6c34ec 100644
--- a/src/test/codegen/naked-noinline.rs
+++ b/src/test/codegen/naked-noinline.rs
@@ -1,5 +1,5 @@
 // Checks that naked functions are never inlined.
-// compile-flags: -O -Zmir-opt-level=2
+// compile-flags: -O -Zmir-opt-level=3
 // ignore-wasm32
 #![crate_type = "lib"]
 #![feature(asm)]
diff --git a/src/test/codegen/try_identity.rs b/src/test/codegen/try_identity.rs
index d51bd575719..81e2435e5b8 100644
--- a/src/test/codegen/try_identity.rs
+++ b/src/test/codegen/try_identity.rs
@@ -1,4 +1,4 @@
-// compile-flags: -C no-prepopulate-passes -O -Z mir-opt-level=2 -Zunsound-mir-opts
+// compile-flags: -C no-prepopulate-passes -O -Z mir-opt-level=3 -Zunsound-mir-opts
 
 // Ensure that `x?` has no overhead on `Result<T, E>` due to identity `match`es in lowering.
 // This requires inlining to trigger the MIR optimizations in `SimplifyArmIdentity`.
diff --git a/src/test/mir-opt/const_prop/issue-66971.rs b/src/test/mir-opt/const_prop/issue-66971.rs
index 986177b5c0a..81eccae46b9 100644
--- a/src/test/mir-opt/const_prop/issue-66971.rs
+++ b/src/test/mir-opt/const_prop/issue-66971.rs
@@ -1,4 +1,4 @@
-// compile-flags: -Z mir-opt-level=2
+// compile-flags: -Z mir-opt-level=3
 
 // Due to a bug in propagating scalar pairs the assertion below used to fail. In the expected
 // outputs below, after ConstProp this is how _2 would look like with the bug:
diff --git a/src/test/mir-opt/const_prop/issue-67019.rs b/src/test/mir-opt/const_prop/issue-67019.rs
index d277bd5869c..c78b8b97178 100644
--- a/src/test/mir-opt/const_prop/issue-67019.rs
+++ b/src/test/mir-opt/const_prop/issue-67019.rs
@@ -1,4 +1,4 @@
-// compile-flags: -Z mir-opt-level=2
+// compile-flags: -Z mir-opt-level=3
 
 // This used to ICE in const-prop
 
diff --git a/src/test/mir-opt/issues/issue-59352.rs b/src/test/mir-opt/issues/issue-59352.rs
index 9e59337a01d..1e0045555ab 100644
--- a/src/test/mir-opt/issues/issue-59352.rs
+++ b/src/test/mir-opt/issues/issue-59352.rs
@@ -7,7 +7,7 @@
 // removed.
 
 // EMIT_MIR issue_59352.num_to_digit.PreCodegen.after.mir
-// compile-flags: -Z mir-opt-level=2 -Z span_free_formats
+// compile-flags: -Z mir-opt-level=3 -Z span_free_formats
 
 pub fn num_to_digit(num: char) -> u32 {
     // CHECK-NOT: panic
diff --git a/src/test/mir-opt/simplify-arm-identity.rs b/src/test/mir-opt/simplify-arm-identity.rs
index 0a59032e87b..bedc86bbacb 100644
--- a/src/test/mir-opt/simplify-arm-identity.rs
+++ b/src/test/mir-opt/simplify-arm-identity.rs
@@ -1,7 +1,7 @@
 // Checks that `SimplifyArmIdentity` is not applied if enums have incompatible layouts.
 // Regression test for issue #66856.
 //
-// compile-flags: -Zmir-opt-level=2
+// compile-flags: -Zmir-opt-level=3
 // EMIT_MIR_FOR_EACH_BIT_WIDTH
 
 enum Src {
diff --git a/src/test/mir-opt/simplify-arm.rs b/src/test/mir-opt/simplify-arm.rs
index a7df786357b..50b5147e0cf 100644
--- a/src/test/mir-opt/simplify-arm.rs
+++ b/src/test/mir-opt/simplify-arm.rs
@@ -1,4 +1,4 @@
-// compile-flags: -Z mir-opt-level=2 -Zunsound-mir-opts
+// compile-flags: -Z mir-opt-level=3 -Zunsound-mir-opts
 // EMIT_MIR simplify_arm.id.SimplifyArmIdentity.diff
 // EMIT_MIR simplify_arm.id.SimplifyBranchSame.diff
 // EMIT_MIR simplify_arm.id_result.SimplifyArmIdentity.diff
diff --git a/src/test/ui/const_prop/inline_spans.rs b/src/test/ui/const_prop/inline_spans.rs
index 32902b49d02..adc7874104a 100644
--- a/src/test/ui/const_prop/inline_spans.rs
+++ b/src/test/ui/const_prop/inline_spans.rs
@@ -1,5 +1,5 @@
 // build-fail
-// compile-flags: -Zmir-opt-level=2
+// compile-flags: -Zmir-opt-level=3
 
 #![deny(warnings)]
 
diff --git a/src/test/ui/const_prop/inline_spans_lint_attribute.rs b/src/test/ui/const_prop/inline_spans_lint_attribute.rs
index 656ff02dc67..1db53d77193 100644
--- a/src/test/ui/const_prop/inline_spans_lint_attribute.rs
+++ b/src/test/ui/const_prop/inline_spans_lint_attribute.rs
@@ -1,6 +1,6 @@
 // Must be build-pass, because check-pass will not run const prop and thus not emit the lint anyway.
 // build-pass
-// compile-flags: -Zmir-opt-level=2
+// compile-flags: -Zmir-opt-level=3
 
 #![deny(warnings)]
 
diff --git a/src/test/ui/consts/issue-67529.rs b/src/test/ui/consts/issue-67529.rs
index df4bc668bee..dd24c2d27e2 100644
--- a/src/test/ui/consts/issue-67529.rs
+++ b/src/test/ui/consts/issue-67529.rs
@@ -1,4 +1,4 @@
-// compile-flags: -Z mir-opt-level=2
+// compile-flags: -Z mir-opt-level=3
 // run-pass
 
 struct Baz<T: ?Sized> {
diff --git a/src/test/ui/consts/issue-67641.rs b/src/test/ui/consts/issue-67641.rs
index f50fba287a2..e5a74f15654 100644
--- a/src/test/ui/consts/issue-67641.rs
+++ b/src/test/ui/consts/issue-67641.rs
@@ -1,4 +1,4 @@
-// compile-flags: -Z mir-opt-level=2
+// compile-flags: -Z mir-opt-level=3
 // run-pass
 
 use std::cell::Cell;
diff --git a/src/test/ui/consts/issue-67862.rs b/src/test/ui/consts/issue-67862.rs
index 84f72154d26..b9e96a87f14 100644
--- a/src/test/ui/consts/issue-67862.rs
+++ b/src/test/ui/consts/issue-67862.rs
@@ -1,4 +1,4 @@
-// compile-flags: -Z mir-opt-level=2
+// compile-flags: -Z mir-opt-level=3
 // run-pass
 
 fn e220() -> (i64, i64) {
diff --git a/src/test/ui/consts/trait_specialization.rs b/src/test/ui/consts/trait_specialization.rs
index 3adbbb53046..c581ef6b0f7 100644
--- a/src/test/ui/consts/trait_specialization.rs
+++ b/src/test/ui/consts/trait_specialization.rs
@@ -1,5 +1,5 @@
 // ignore-wasm32-bare which doesn't support `std::process:exit()`
-// compile-flags: -Zmir-opt-level=2
+// compile-flags: -Zmir-opt-level=3
 // run-pass
 
 // Tests that specialization does not cause optimizations running on polymorphic MIR to resolve
diff --git a/src/test/ui/dest-prop/skeptic-miscompile.rs b/src/test/ui/dest-prop/skeptic-miscompile.rs
index c27a1f04532..4bb61dbc7f4 100644
--- a/src/test/ui/dest-prop/skeptic-miscompile.rs
+++ b/src/test/ui/dest-prop/skeptic-miscompile.rs
@@ -1,6 +1,6 @@
 // run-pass
 
-// compile-flags: -Zmir-opt-level=2
+// compile-flags: -Zmir-opt-level=3
 
 trait IterExt: Iterator {
     fn fold_ex<B, F>(mut self, init: B, mut f: F) -> B
diff --git a/src/test/ui/issues/issue-50865-private-impl-trait/auxiliary/lib.rs b/src/test/ui/issues/issue-50865-private-impl-trait/auxiliary/lib.rs
index fb4bf2b8b44..1e20a546069 100644
--- a/src/test/ui/issues/issue-50865-private-impl-trait/auxiliary/lib.rs
+++ b/src/test/ui/issues/issue-50865-private-impl-trait/auxiliary/lib.rs
@@ -1,5 +1,5 @@
 // revisions: default miropt
-//[miropt]compile-flags: -Z mir-opt-level=2
+//[miropt]compile-flags: -Z mir-opt-level=3
 // ~^ This flag is for #77668, it used to be ICE.
 
 #![crate_type = "lib"]
diff --git a/src/test/ui/issues/issue-77002.rs b/src/test/ui/issues/issue-77002.rs
index c7dd3cf8109..0c37346eaf8 100644
--- a/src/test/ui/issues/issue-77002.rs
+++ b/src/test/ui/issues/issue-77002.rs
@@ -1,4 +1,4 @@
-// compile-flags: -Zmir-opt-level=2 -Copt-level=0
+// compile-flags: -Zmir-opt-level=3 -Copt-level=0
 // run-pass
 
 type M = [i64; 2];
diff --git a/src/test/ui/mir/auxiliary/issue_76375_aux.rs b/src/test/ui/mir/auxiliary/issue_76375_aux.rs
index 72f32ecf7ea..90f4df739f1 100644
--- a/src/test/ui/mir/auxiliary/issue_76375_aux.rs
+++ b/src/test/ui/mir/auxiliary/issue_76375_aux.rs
@@ -1,5 +1,5 @@
 // edition:2018
-// compile-flags: -Z mir-opt-level=2
+// compile-flags: -Z mir-opt-level=3
 
 #[inline(always)]
 pub fn copy_prop(s: bool) -> String {
diff --git a/src/test/ui/mir/issue-66851.rs b/src/test/ui/mir/issue-66851.rs
index 72d62a30a33..878ad4e475a 100644
--- a/src/test/ui/mir/issue-66851.rs
+++ b/src/test/ui/mir/issue-66851.rs
@@ -2,7 +2,7 @@
 // did not check that the types matched up in the `Ok(r)` branch.
 //
 // run-pass
-// compile-flags: -Zmir-opt-level=2
+// compile-flags: -Zmir-opt-level=3
 
 #[derive(Debug, PartialEq, Eq)]
 enum SpecialsRes { Res(u64) }
diff --git a/src/test/ui/mir/issue-67710-inline-projection.rs b/src/test/ui/mir/issue-67710-inline-projection.rs
index 37d8f2eac9b..1ff6b4d628c 100644
--- a/src/test/ui/mir/issue-67710-inline-projection.rs
+++ b/src/test/ui/mir/issue-67710-inline-projection.rs
@@ -1,4 +1,4 @@
-// compile-flags: -Z mir-opt-level=2
+// compile-flags: -Z mir-opt-level=3
 // build-pass
 
 // This used to ICE due to the inling pass not examining projections
diff --git a/src/test/ui/mir/issue-68841.rs b/src/test/ui/mir/issue-68841.rs
index 14884a97fab..550bd452a80 100644
--- a/src/test/ui/mir/issue-68841.rs
+++ b/src/test/ui/mir/issue-68841.rs
@@ -1,4 +1,4 @@
-// compile-flags: -Z mir-opt-level=2
+// compile-flags: -Z mir-opt-level=3
 // edition:2018
 // build-pass
 
diff --git a/src/test/ui/mir/issue-71793-inline-args-storage.rs b/src/test/ui/mir/issue-71793-inline-args-storage.rs
index 87b2806d4e2..18f2e38d14c 100644
--- a/src/test/ui/mir/issue-71793-inline-args-storage.rs
+++ b/src/test/ui/mir/issue-71793-inline-args-storage.rs
@@ -4,7 +4,7 @@
 //
 // check-pass
 // edition:2018
-// compile-args: -Zmir-opt-level=2
+// compile-args: -Zmir-opt-level=3
 
 #![crate_type = "lib"]
 
diff --git a/src/test/ui/mir/issue-75053.rs b/src/test/ui/mir/issue-75053.rs
index 6e7211c2ee6..d54e23169c4 100644
--- a/src/test/ui/mir/issue-75053.rs
+++ b/src/test/ui/mir/issue-75053.rs
@@ -1,4 +1,4 @@
-// compile-flags: -Z mir-opt-level=2
+// compile-flags: -Z mir-opt-level=3
 // build-pass
 
 #![feature(type_alias_impl_trait)]
diff --git a/src/test/ui/mir/issue-76248.rs b/src/test/ui/mir/issue-76248.rs
index b01a9727852..18473e79e86 100644
--- a/src/test/ui/mir/issue-76248.rs
+++ b/src/test/ui/mir/issue-76248.rs
@@ -3,7 +3,7 @@
 // Regression test for #76248.
 //
 // build-pass
-// compile-flags: -Zmir-opt-level=2
+// compile-flags: -Zmir-opt-level=3
 
 const N: usize = 1;
 
diff --git a/src/test/ui/mir/issue-76375.rs b/src/test/ui/mir/issue-76375.rs
index a7772cb1fe6..e635caca9fd 100644
--- a/src/test/ui/mir/issue-76375.rs
+++ b/src/test/ui/mir/issue-76375.rs
@@ -2,7 +2,7 @@
 //
 // edition:2018
 // build-pass
-// compile-flags: -Z mir-opt-level=2
+// compile-flags: -Z mir-opt-level=3
 // aux-build:issue_76375_aux.rs
 
 #![crate_type = "lib"]
diff --git a/src/test/ui/mir/issue-77911.rs b/src/test/ui/mir/issue-77911.rs
index fff303495e7..acf4c20542d 100644
--- a/src/test/ui/mir/issue-77911.rs
+++ b/src/test/ui/mir/issue-77911.rs
@@ -1,4 +1,4 @@
-// compile-flags: -Z mir-opt-level=2
+// compile-flags: -Z mir-opt-level=3
 // build-pass
 
 use std::fs::File;
diff --git a/src/test/ui/mir/issue-78496.rs b/src/test/ui/mir/issue-78496.rs
index 1b0687cfac3..a0d1f5a780e 100644
--- a/src/test/ui/mir/issue-78496.rs
+++ b/src/test/ui/mir/issue-78496.rs
@@ -1,5 +1,5 @@
 // run-pass
-// compile-flags: -Z mir-opt-level=2 -C opt-level=0
+// compile-flags: -Z mir-opt-level=3 -C opt-level=0
 
 // example from #78496
 pub enum E<'a> {
diff --git a/src/test/ui/mir/issue66339.rs b/src/test/ui/mir/issue66339.rs
index 98e178c0551..2507af38cdf 100644
--- a/src/test/ui/mir/issue66339.rs
+++ b/src/test/ui/mir/issue66339.rs
@@ -1,4 +1,4 @@
-// compile-flags: -Z mir-opt-level=2
+// compile-flags: -Z mir-opt-level=3
 // build-pass
 
 // This used to ICE in const-prop
diff --git a/src/test/ui/mir/mir-inlining/array-clone-with-generic-size.rs b/src/test/ui/mir/mir-inlining/array-clone-with-generic-size.rs
index eec0a4599c3..e36e8bd746d 100644
--- a/src/test/ui/mir/mir-inlining/array-clone-with-generic-size.rs
+++ b/src/test/ui/mir/mir-inlining/array-clone-with-generic-size.rs
@@ -2,7 +2,7 @@
 // Regression test for issue #79269.
 //
 // build-pass
-// compile-flags: -Zmir-opt-level=2 -Zvalidate-mir
+// compile-flags: -Zmir-opt-level=3 -Zvalidate-mir
 #[derive(Clone)]
 struct Array<T, const N: usize>([T; N]);
 
diff --git a/src/test/ui/mir/mir-inlining/ice-issue-45493.rs b/src/test/ui/mir/mir-inlining/ice-issue-45493.rs
index 1bd16dc43e1..04a23212e7b 100644
--- a/src/test/ui/mir/mir-inlining/ice-issue-45493.rs
+++ b/src/test/ui/mir/mir-inlining/ice-issue-45493.rs
@@ -1,5 +1,5 @@
 // run-pass
-// compile-flags:-Zmir-opt-level=2
+// compile-flags:-Zmir-opt-level=3
 
 trait Array {
     type Item;
diff --git a/src/test/ui/mir/mir-inlining/ice-issue-45885.rs b/src/test/ui/mir/mir-inlining/ice-issue-45885.rs
index e930a4d1ccd..09b1279ef34 100644
--- a/src/test/ui/mir/mir-inlining/ice-issue-45885.rs
+++ b/src/test/ui/mir/mir-inlining/ice-issue-45885.rs
@@ -1,5 +1,5 @@
 // run-pass
-// compile-flags:-Zmir-opt-level=2
+// compile-flags:-Zmir-opt-level=3
 
 pub enum Enum {
     A,
diff --git a/src/test/ui/mir/mir-inlining/ice-issue-68347.rs b/src/test/ui/mir/mir-inlining/ice-issue-68347.rs
index 88b80bc3333..7c135250940 100644
--- a/src/test/ui/mir/mir-inlining/ice-issue-68347.rs
+++ b/src/test/ui/mir/mir-inlining/ice-issue-68347.rs
@@ -1,5 +1,5 @@
 // run-pass
-// compile-flags:-Zmir-opt-level=2
+// compile-flags:-Zmir-opt-level=3
 pub fn main() {
     let _x: fn() = handle_debug_column;
 }
diff --git a/src/test/ui/mir/mir-inlining/ice-issue-77306-1.rs b/src/test/ui/mir/mir-inlining/ice-issue-77306-1.rs
index 4d083bf2321..ef05ff9ce03 100644
--- a/src/test/ui/mir/mir-inlining/ice-issue-77306-1.rs
+++ b/src/test/ui/mir/mir-inlining/ice-issue-77306-1.rs
@@ -1,5 +1,5 @@
 // run-pass
-// compile-flags:-Zmir-opt-level=2
+// compile-flags:-Zmir-opt-level=3
 
 // Previously ICEd because we did not normalize during inlining,
 // see https://github.com/rust-lang/rust/pull/77306 for more discussion.
diff --git a/src/test/ui/mir/mir-inlining/ice-issue-77306-2.rs b/src/test/ui/mir/mir-inlining/ice-issue-77306-2.rs
index a346d450586..cb208401313 100644
--- a/src/test/ui/mir/mir-inlining/ice-issue-77306-2.rs
+++ b/src/test/ui/mir/mir-inlining/ice-issue-77306-2.rs
@@ -1,5 +1,5 @@
 // run-pass
-// compile-flags:-Zmir-opt-level=2
+// compile-flags:-Zmir-opt-level=3
 
 struct Cursor {}
 struct TokenTree {}
diff --git a/src/test/ui/mir/mir-inlining/ice-issue-77564.rs b/src/test/ui/mir/mir-inlining/ice-issue-77564.rs
index 262402df2cc..0d3fbfe5d1a 100644
--- a/src/test/ui/mir/mir-inlining/ice-issue-77564.rs
+++ b/src/test/ui/mir/mir-inlining/ice-issue-77564.rs
@@ -1,5 +1,5 @@
 // run-pass
-// compile-flags:-Zmir-opt-level=2
+// compile-flags:-Zmir-opt-level=3
 
 use std::mem::MaybeUninit;
 const N: usize = 2;
diff --git a/src/test/ui/mir/mir-inlining/inline-instrument-coverage-fail.rs b/src/test/ui/mir/mir-inlining/inline-instrument-coverage-fail.rs
index 2437155d981..8ed7f25d2bb 100644
--- a/src/test/ui/mir/mir-inlining/inline-instrument-coverage-fail.rs
+++ b/src/test/ui/mir/mir-inlining/inline-instrument-coverage-fail.rs
@@ -1,9 +1,9 @@
-// Ensures -Zmir-opt-level=2 (specifically, inlining) is not allowed with -Zinstrument-coverage.
+// Ensures -Zmir-opt-level=3 (specifically, inlining) is not allowed with -Zinstrument-coverage.
 // Regression test for issue #80060.
 //
 // needs-profiler-support
 // build-pass
-// compile-flags: -Zmir-opt-level=2 -Zinstrument-coverage
+// compile-flags: -Zmir-opt-level=3 -Zinstrument-coverage
 #[inline(never)]
 fn foo() {}
 
diff --git a/src/test/ui/mir/mir-inlining/no-trait-method-issue-40473.rs b/src/test/ui/mir/mir-inlining/no-trait-method-issue-40473.rs
index 8f570dbd4ad..8b3cb703dc0 100644
--- a/src/test/ui/mir/mir-inlining/no-trait-method-issue-40473.rs
+++ b/src/test/ui/mir/mir-inlining/no-trait-method-issue-40473.rs
@@ -1,5 +1,5 @@
 // run-pass
-// compile-flags:-Zmir-opt-level=2
+// compile-flags:-Zmir-opt-level=3
 pub trait Foo {
     fn bar(&self) -> usize { 2 }
 }
diff --git a/src/test/ui/mir/mir-inlining/var-debuginfo-issue-67586.rs b/src/test/ui/mir/mir-inlining/var-debuginfo-issue-67586.rs
index 23cc114880c..e2620682679 100644
--- a/src/test/ui/mir/mir-inlining/var-debuginfo-issue-67586.rs
+++ b/src/test/ui/mir/mir-inlining/var-debuginfo-issue-67586.rs
@@ -1,5 +1,5 @@
 // run-pass
-// compile-flags: -Z mir-opt-level=2 -C opt-level=0 -C debuginfo=2
+// compile-flags: -Z mir-opt-level=3 -C opt-level=0 -C debuginfo=2
 
 #[inline(never)]
 pub fn foo(bar: usize) -> usize {
diff --git a/src/test/ui/mir/mir_const_prop_tuple_field_reorder.rs b/src/test/ui/mir/mir_const_prop_tuple_field_reorder.rs
index 629b50dec65..b66a85d07d3 100644
--- a/src/test/ui/mir/mir_const_prop_tuple_field_reorder.rs
+++ b/src/test/ui/mir/mir_const_prop_tuple_field_reorder.rs
@@ -1,4 +1,4 @@
-// compile-flags: -Z mir-opt-level=2
+// compile-flags: -Z mir-opt-level=3
 // build-pass
 #![crate_type="lib"]