Print non-std frames to stdout in backtrace-api test

This commit is contained in:
Aaron Hill 2020-09-24 15:05:50 -04:00
parent ef43c5a614
commit 9fc384fcf9
No known key found for this signature in database
GPG key ID: B4087E510E98B164
3 changed files with 24 additions and 3 deletions

View file

@ -14,12 +14,26 @@ 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() } }
fn main() {
let frames = unsafe { miri_get_backtrace() };
let mut seen_main = false;
let frames = func_a();
for frame in frames.into_iter() {
let miri_frame = unsafe { miri_resolve_frame(*frame, 0) };
let name = String::from_utf8(miri_frame.name.into()).unwrap();
let filename = String::from_utf8(miri_frame.filename.into()).unwrap();
eprintln!("{}:{}:{} ({})", filename, miri_frame.lineno, miri_frame.colno, name);
// Print every frame to stderr.
let out = format!("{}:{}:{} ({})", filename, miri_frame.lineno, miri_frame.colno, name);
eprintln!("{}", out);
// Print the 'main' frame (and everything before it) to stdout, skipping
// the printing of internal (and possibly fragile) libstd frames.
if !seen_main {
println!("{}", out);
seen_main = name == "main";
}
}
}

View file

@ -1,4 +1,7 @@
$DIR/backtrace-api.rs:18:27 (main)
$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: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(), ()>)
RUSTLIB/src/rust/library/std/src/rt.rs:LL:COL (std::rt::lang_start::<()>::{{closure}}#0)

View file

@ -0,0 +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:23:18 (main)