29 files changed, 4 insertions, 0 deletions
diff --git a/src/test/ui/rfc-2091-track-caller/call-chain.rs b/tests/ui/rfc-2091-track-caller/call-chain.rs
index fefb84de7..28b3f76c9 100644
--- a/src/test/ui/rfc-2091-track-caller/call-chain.rs
+++ b/tests/ui/rfc-2091-track-caller/call-chain.rs
@@ -1,10 +1,14 @@
 // run-pass
+// revisions: default mir-opt
+//[default] compile-flags: -Zinline-mir=no
+//[mir-opt] compile-flags: -Zmir-opt-level=4
 
 use std::panic::Location;
 
 struct Foo;
 
 impl Foo {
+    #[inline(always)]
     #[track_caller]
     fn check_loc(&self, line: u32, col: u32) -> &Self {
         let loc = Location::caller();
diff --git a/src/test/ui/rfc-2091-track-caller/caller-location-fnptr-rt-ctfe-equiv.rs b/tests/ui/rfc-2091-track-caller/caller-location-fnptr-rt-ctfe-equiv.rs
index a3bed707e..a3bed707e 100644
--- a/src/test/ui/rfc-2091-track-caller/caller-location-fnptr-rt-ctfe-equiv.rs
+++ b/tests/ui/rfc-2091-track-caller/caller-location-fnptr-rt-ctfe-equiv.rs
diff --git a/src/test/ui/rfc-2091-track-caller/caller-location-fnptr-rt-ctfe-equiv.stderr b/tests/ui/rfc-2091-track-caller/caller-location-fnptr-rt-ctfe-equiv.stderr
index cf8ca5771..cf8ca5771 100644
--- a/src/test/ui/rfc-2091-track-caller/caller-location-fnptr-rt-ctfe-equiv.stderr
+++ b/tests/ui/rfc-2091-track-caller/caller-location-fnptr-rt-ctfe-equiv.stderr
diff --git a/src/test/ui/rfc-2091-track-caller/caller-location-intrinsic.rs b/tests/ui/rfc-2091-track-caller/caller-location-intrinsic.rs
index e5754d355..e5754d355 100644
--- a/src/test/ui/rfc-2091-track-caller/caller-location-intrinsic.rs
+++ b/tests/ui/rfc-2091-track-caller/caller-location-intrinsic.rs
diff --git a/src/test/ui/rfc-2091-track-caller/const-caller-location.rs b/tests/ui/rfc-2091-track-caller/const-caller-location.rs
index 6e15cf3fe..6e15cf3fe 100644
--- a/src/test/ui/rfc-2091-track-caller/const-caller-location.rs
+++ b/tests/ui/rfc-2091-track-caller/const-caller-location.rs
diff --git a/src/test/ui/rfc-2091-track-caller/diverging-caller-location.rs b/tests/ui/rfc-2091-track-caller/diverging-caller-location.rs
index 668111955..668111955 100644
--- a/src/test/ui/rfc-2091-track-caller/diverging-caller-location.rs
+++ b/tests/ui/rfc-2091-track-caller/diverging-caller-location.rs
diff --git a/src/test/ui/rfc-2091-track-caller/error-odd-syntax.rs b/tests/ui/rfc-2091-track-caller/error-odd-syntax.rs
index 6f4290e2a..6f4290e2a 100644
--- a/src/test/ui/rfc-2091-track-caller/error-odd-syntax.rs
+++ b/tests/ui/rfc-2091-track-caller/error-odd-syntax.rs
diff --git a/src/test/ui/rfc-2091-track-caller/error-odd-syntax.stderr b/tests/ui/rfc-2091-track-caller/error-odd-syntax.stderr
index e7ddf8df4..e7ddf8df4 100644
--- a/src/test/ui/rfc-2091-track-caller/error-odd-syntax.stderr
+++ b/tests/ui/rfc-2091-track-caller/error-odd-syntax.stderr
diff --git a/src/test/ui/rfc-2091-track-caller/error-with-invalid-abi.rs b/tests/ui/rfc-2091-track-caller/error-with-invalid-abi.rs
index 074e1ceb7..074e1ceb7 100644
--- a/src/test/ui/rfc-2091-track-caller/error-with-invalid-abi.rs
+++ b/tests/ui/rfc-2091-track-caller/error-with-invalid-abi.rs
diff --git a/src/test/ui/rfc-2091-track-caller/error-with-invalid-abi.stderr b/tests/ui/rfc-2091-track-caller/error-with-invalid-abi.stderr
index bcc0c8170..bcc0c8170 100644
--- a/src/test/ui/rfc-2091-track-caller/error-with-invalid-abi.stderr
+++ b/tests/ui/rfc-2091-track-caller/error-with-invalid-abi.stderr
diff --git a/src/test/ui/rfc-2091-track-caller/error-with-main.rs b/tests/ui/rfc-2091-track-caller/error-with-main.rs
index b2ea31bb5..b2ea31bb5 100644
--- a/src/test/ui/rfc-2091-track-caller/error-with-main.rs
+++ b/tests/ui/rfc-2091-track-caller/error-with-main.rs
diff --git a/src/test/ui/rfc-2091-track-caller/error-with-main.stderr b/tests/ui/rfc-2091-track-caller/error-with-main.stderr
index 7e2ec3524..7e2ec3524 100644
--- a/src/test/ui/rfc-2091-track-caller/error-with-main.stderr
+++ b/tests/ui/rfc-2091-track-caller/error-with-main.stderr
diff --git a/src/test/ui/rfc-2091-track-caller/error-with-naked.rs b/tests/ui/rfc-2091-track-caller/error-with-naked.rs
index 43e33cbb1..43e33cbb1 100644
--- a/src/test/ui/rfc-2091-track-caller/error-with-naked.rs
+++ b/tests/ui/rfc-2091-track-caller/error-with-naked.rs
diff --git a/src/test/ui/rfc-2091-track-caller/error-with-naked.stderr b/tests/ui/rfc-2091-track-caller/error-with-naked.stderr
index 3f7d0df42..3f7d0df42 100644
--- a/src/test/ui/rfc-2091-track-caller/error-with-naked.stderr
+++ b/tests/ui/rfc-2091-track-caller/error-with-naked.stderr
diff --git a/src/test/ui/rfc-2091-track-caller/error-with-start.rs b/tests/ui/rfc-2091-track-caller/error-with-start.rs
index 0cab47170..0cab47170 100644
--- a/src/test/ui/rfc-2091-track-caller/error-with-start.rs
+++ b/tests/ui/rfc-2091-track-caller/error-with-start.rs
diff --git a/src/test/ui/rfc-2091-track-caller/error-with-start.stderr b/tests/ui/rfc-2091-track-caller/error-with-start.stderr
index 454c98ff9..454c98ff9 100644
--- a/src/test/ui/rfc-2091-track-caller/error-with-start.stderr
+++ b/tests/ui/rfc-2091-track-caller/error-with-start.stderr
diff --git a/src/test/ui/rfc-2091-track-caller/intrinsic-wrapper.rs b/tests/ui/rfc-2091-track-caller/intrinsic-wrapper.rs
index 87e52881c..87e52881c 100644
--- a/src/test/ui/rfc-2091-track-caller/intrinsic-wrapper.rs
+++ b/tests/ui/rfc-2091-track-caller/intrinsic-wrapper.rs
diff --git a/src/test/ui/rfc-2091-track-caller/macro-declaration.rs b/tests/ui/rfc-2091-track-caller/macro-declaration.rs
index 6ca09fac8..6ca09fac8 100644
--- a/src/test/ui/rfc-2091-track-caller/macro-declaration.rs
+++ b/tests/ui/rfc-2091-track-caller/macro-declaration.rs
diff --git a/src/test/ui/rfc-2091-track-caller/only-for-fns.rs b/tests/ui/rfc-2091-track-caller/only-for-fns.rs
index 2d2b01b6f..2d2b01b6f 100644
--- a/src/test/ui/rfc-2091-track-caller/only-for-fns.rs
+++ b/tests/ui/rfc-2091-track-caller/only-for-fns.rs
diff --git a/src/test/ui/rfc-2091-track-caller/only-for-fns.stderr b/tests/ui/rfc-2091-track-caller/only-for-fns.stderr
index b36597bde..b36597bde 100644
--- a/src/test/ui/rfc-2091-track-caller/only-for-fns.stderr
+++ b/tests/ui/rfc-2091-track-caller/only-for-fns.stderr
diff --git a/src/test/ui/rfc-2091-track-caller/pass.rs b/tests/ui/rfc-2091-track-caller/pass.rs
index 1b13ea3e9..1b13ea3e9 100644
--- a/src/test/ui/rfc-2091-track-caller/pass.rs
+++ b/tests/ui/rfc-2091-track-caller/pass.rs
diff --git a/src/test/ui/rfc-2091-track-caller/std-panic-locations.rs b/tests/ui/rfc-2091-track-caller/std-panic-locations.rs
index f11456250..f11456250 100644
--- a/src/test/ui/rfc-2091-track-caller/std-panic-locations.rs
+++ b/tests/ui/rfc-2091-track-caller/std-panic-locations.rs
diff --git a/src/test/ui/rfc-2091-track-caller/track-caller-attribute.rs b/tests/ui/rfc-2091-track-caller/track-caller-attribute.rs
index 9d28eb9de..9d28eb9de 100644
--- a/src/test/ui/rfc-2091-track-caller/track-caller-attribute.rs
+++ b/tests/ui/rfc-2091-track-caller/track-caller-attribute.rs
diff --git a/src/test/ui/rfc-2091-track-caller/track-caller-ffi.rs b/tests/ui/rfc-2091-track-caller/track-caller-ffi.rs
index 5115f687c..5115f687c 100644
--- a/src/test/ui/rfc-2091-track-caller/track-caller-ffi.rs
+++ b/tests/ui/rfc-2091-track-caller/track-caller-ffi.rs
diff --git a/src/test/ui/rfc-2091-track-caller/tracked-closure.rs b/tests/ui/rfc-2091-track-caller/tracked-closure.rs
index 670c423a7..670c423a7 100644
--- a/src/test/ui/rfc-2091-track-caller/tracked-closure.rs
+++ b/tests/ui/rfc-2091-track-caller/tracked-closure.rs
diff --git a/src/test/ui/rfc-2091-track-caller/tracked-fn-ptr-with-arg.rs b/tests/ui/rfc-2091-track-caller/tracked-fn-ptr-with-arg.rs
index 658812578..658812578 100644
--- a/src/test/ui/rfc-2091-track-caller/tracked-fn-ptr-with-arg.rs
+++ b/tests/ui/rfc-2091-track-caller/tracked-fn-ptr-with-arg.rs
diff --git a/src/test/ui/rfc-2091-track-caller/tracked-fn-ptr.rs b/tests/ui/rfc-2091-track-caller/tracked-fn-ptr.rs
index 8bb4dd288..8bb4dd288 100644
--- a/src/test/ui/rfc-2091-track-caller/tracked-fn-ptr.rs
+++ b/tests/ui/rfc-2091-track-caller/tracked-fn-ptr.rs
diff --git a/src/test/ui/rfc-2091-track-caller/tracked-trait-impls.rs b/tests/ui/rfc-2091-track-caller/tracked-trait-impls.rs
index 4db4c29e5..4db4c29e5 100644
--- a/src/test/ui/rfc-2091-track-caller/tracked-trait-impls.rs
+++ b/tests/ui/rfc-2091-track-caller/tracked-trait-impls.rs
diff --git a/src/test/ui/rfc-2091-track-caller/tracked-trait-obj.rs b/tests/ui/rfc-2091-track-caller/tracked-trait-obj.rs
index 06883a857..06883a857 100644
--- a/src/test/ui/rfc-2091-track-caller/tracked-trait-obj.rs
+++ b/tests/ui/rfc-2091-track-caller/tracked-trait-obj.rs