about summary refs log tree commit diff
path: root/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp
diff options
context:
space:
mode:
authorMichael Goulet <michael@errs.io>2023-05-11 17:43:08 -0700
committerGitHub <noreply@github.com>2023-05-11 17:43:08 -0700
commitd4d15e8a7450312debdb953689095f30fe33900d (patch)
tree8827b974e9099a7795678437409b979bf079d222 /compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp
parent691a5f388396d4cad18421dba55ac770f7e7a7f9 (diff)
parentcac7e42b5278ad46214c741f01e537dff1fa9372 (diff)
downloadrust-d4d15e8a7450312debdb953689095f30fe33900d.tar.gz
rust-d4d15e8a7450312debdb953689095f30fe33900d.zip
Rollup merge of #111439 - uweigand:backtrace-normalize, r=compiler-errors
Fix backtrace normalization in ice-bug-report-url.rs

This test case currently fails on s390x, and probably other platforms where the last line of a backtrace does not contain and " at <source location>" specification.

The problem with the existing normalization lines
// normalize-stderr-test "\s*\d{1,}: .*\n" -> ""
// normalize-stderr-test "\s at .*\n" -> ""
is that \s matches all whitespace, including newlines, so the first (but not second) of these regexes may merge multiple lines.  Thus the output differs depending on which of these matches on the last line of a backtrace.

As the whitespace used in backtraces is just normal space characters, change both regexes to just match at least one space character instead:
// normalize-stderr-test " +\d{1,}: .*\n" -> ""
// normalize-stderr-test " + at .*\n" -> ""
Diffstat (limited to 'compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp')
0 files changed, 0 insertions, 0 deletions