diff options
| -rw-r--r-- | library/std/src/sys_common/backtrace.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/panics/panic-short-backtrace-windows-x86_64.rs | 5 | ||||
| -rw-r--r-- | src/test/ui/panics/panic-short-backtrace-windows-x86_64.run.stderr | 8 |
3 files changed, 13 insertions, 2 deletions
diff --git a/library/std/src/sys_common/backtrace.rs b/library/std/src/sys_common/backtrace.rs index a549770d8b3..e6a099f0e81 100644 --- a/library/std/src/sys_common/backtrace.rs +++ b/library/std/src/sys_common/backtrace.rs @@ -75,7 +75,7 @@ unsafe fn _print_fmt(fmt: &mut fmt::Formatter<'_>, print_fmt: PrintFmt) -> fmt:: hit = true; if print_fmt == PrintFmt::Short { if let Some(sym) = symbol.name().and_then(|s| s.as_str()) { - if sym.contains("__rust_begin_short_backtrace") { + if start && sym.contains("__rust_begin_short_backtrace") { stop = true; return; } diff --git a/src/test/ui/panics/panic-short-backtrace-windows-x86_64.rs b/src/test/ui/panics/panic-short-backtrace-windows-x86_64.rs index eae3f861519..fd01337296f 100644 --- a/src/test/ui/panics/panic-short-backtrace-windows-x86_64.rs +++ b/src/test/ui/panics/panic-short-backtrace-windows-x86_64.rs @@ -10,6 +10,11 @@ // check-run-results // exec-env:RUST_BACKTRACE=1 +// We need to normalize out frame 5 because without debug info, dbghelp.dll doesn't know where CGU +// internal functions like `main` start or end and so it will return whatever symbol happens +// to be located near the address. +// normalize-stderr-test: "5: .*" -> "5: some Rust fn" + // Backtraces are pretty broken in general on i686-pc-windows-msvc (#62897). // only-x86_64-pc-windows-msvc diff --git a/src/test/ui/panics/panic-short-backtrace-windows-x86_64.run.stderr b/src/test/ui/panics/panic-short-backtrace-windows-x86_64.run.stderr index f855346532f..799a8b30e99 100644 --- a/src/test/ui/panics/panic-short-backtrace-windows-x86_64.run.stderr +++ b/src/test/ui/panics/panic-short-backtrace-windows-x86_64.run.stderr @@ -1,3 +1,9 @@ -thread 'main' panicked at 'd was called', $DIR/panic-short-backtrace-windows-x86_64.rs:43:5 +thread 'main' panicked at 'd was called', $DIR/panic-short-backtrace-windows-x86_64.rs:48:5 stack backtrace: + 0: std::panicking::begin_panic + 1: d + 2: c + 3: b + 4: a + 5: some Rust fn note: Some details are omitted, run with `RUST_BACKTRACE=full` for a verbose backtrace. |