Skip to content

Commit 5857365

Browse files
committed
Apply #[inline(never)] to functions that we want in the backtrace
1 parent 43d1eac commit 5857365

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

tests/run-pass/backtrace-api.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ struct MiriFrame {
1414
colno: u32
1515
}
1616

17-
fn func_a() -> Box<[*mut ()]> { func_b::<u8>() }
18-
fn func_b<T>() -> Box<[*mut ()]> { func_c() }
19-
fn func_c() -> Box<[*mut ()]> { unsafe { miri_get_backtrace(0) } }
17+
#[inline(never)] fn func_a() -> Box<[*mut ()]> { func_b::<u8>() }
18+
#[inline(never)] fn func_b<T>() -> Box<[*mut ()]> { func_c() }
19+
#[inline(never)] fn func_c() -> Box<[*mut ()]> { unsafe { miri_get_backtrace(0) } }
2020

2121
fn main() {
2222
let mut seen_main = false;

tests/run-pass/backtrace-api.stderr

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
$DIR/backtrace-api.rs:19:42 (func_c)
2-
$DIR/backtrace-api.rs:18:36 (func_b::<u8>)
3-
$DIR/backtrace-api.rs:17:33 (func_a)
1+
$DIR/backtrace-api.rs:19:59 (func_c)
2+
$DIR/backtrace-api.rs:18:53 (func_b::<u8>)
3+
$DIR/backtrace-api.rs:17:50 (func_a)
44
$DIR/backtrace-api.rs:23:18 (main)
55
RUSTLIB/src/rust/library/core/src/ops/function.rs:LL:COL (<fn() as std::ops::FnOnce<()>>::call_once - shim(fn()))
66
RUSTLIB/src/rust/library/std/src/sys_common/backtrace.rs:LL:COL (std::sys_common::backtrace::__rust_begin_short_backtrace::<fn(), ()>)

tests/run-pass/backtrace-api.stdout

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
$DIR/backtrace-api.rs:19:42 (func_c)
2-
$DIR/backtrace-api.rs:18:36 (func_b::<u8>)
3-
$DIR/backtrace-api.rs:17:33 (func_a)
1+
$DIR/backtrace-api.rs:19:59 (func_c)
2+
$DIR/backtrace-api.rs:18:53 (func_b::<u8>)
3+
$DIR/backtrace-api.rs:17:50 (func_a)
44
$DIR/backtrace-api.rs:23:18 (main)

0 commit comments

Comments
 (0)