Apply #[inline(never)] to functions that we want in the backtrace

diff --git a/tests/run-pass/backtrace-api.rs b/tests/run-pass/backtrace-api.rs
index 655a52c7fc7d0ca9f89c07a30a37596614ca0a61..1322e15fc9624f3b653c0e4bb9d1e2adf8d0d2d8 100644 (file)
--- a/tests/run-pass/backtrace-api.rs
+++ b/tests/run-pass/backtrace-api.rs
@@ -14,9 +14,9 @@ struct MiriFrame {
     colno: u32
 }
 
-fn func_a() -> Box<[*mut ()]> { func_b::<u8>() }
-fn func_b<T>() -> Box<[*mut ()]> { func_c() }
-fn func_c() -> Box<[*mut ()]> { unsafe { miri_get_backtrace(0) } }
+#[inline(never)] fn func_a() -> Box<[*mut ()]> { func_b::<u8>() }
+#[inline(never)] fn func_b<T>() -> Box<[*mut ()]> { func_c() }
+#[inline(never)] fn func_c() -> Box<[*mut ()]> { unsafe { miri_get_backtrace(0) } }
 
 fn main() {
     let mut seen_main = false;

diff --git a/tests/run-pass/backtrace-api.stderr b/tests/run-pass/backtrace-api.stderr
index b96def8093a4449798a1a4f29d552d10f4de4e6f..d94a7ce4aec229b8df3fdeca3cecd8dcfaa78d2c 100644 (file)
--- a/tests/run-pass/backtrace-api.stderr
+++ b/tests/run-pass/backtrace-api.stderr
@@ -1,6 +1,6 @@
-$DIR/backtrace-api.rs:19:42 (func_c)
-$DIR/backtrace-api.rs:18:36 (func_b::<u8>)
-$DIR/backtrace-api.rs:17:33 (func_a)
+$DIR/backtrace-api.rs:19:59 (func_c)
+$DIR/backtrace-api.rs:18:53 (func_b::<u8>)
+$DIR/backtrace-api.rs:17:50 (func_a)
 $DIR/backtrace-api.rs:23:18 (main)
 RUSTLIB/src/rust/library/core/src/ops/function.rs:LL:COL (<fn() as std::ops::FnOnce<()>>::call_once - shim(fn()))
 RUSTLIB/src/rust/library/std/src/sys_common/backtrace.rs:LL:COL (std::sys_common::backtrace::__rust_begin_short_backtrace::<fn(), ()>)

diff --git a/tests/run-pass/backtrace-api.stdout b/tests/run-pass/backtrace-api.stdout
index 0d8aaa7a3261ccf403da2f5f5e0d4561a70cf4f5..0353f98ed76a449351fdb6cb7d825499a608e525 100644 (file)
--- a/tests/run-pass/backtrace-api.stdout
+++ b/tests/run-pass/backtrace-api.stdout
@@ -1,4 +1,4 @@
-$DIR/backtrace-api.rs:19:42 (func_c)
-$DIR/backtrace-api.rs:18:36 (func_b::<u8>)
-$DIR/backtrace-api.rs:17:33 (func_a)
+$DIR/backtrace-api.rs:19:59 (func_c)
+$DIR/backtrace-api.rs:18:53 (func_b::<u8>)
+$DIR/backtrace-api.rs:17:50 (func_a)
 $DIR/backtrace-api.rs:23:18 (main)