From 0d2278c6c6c215f0268c15946cb89a3fe9284fd3 Mon Sep 17 00:00:00 2001 From: Andy Wang Date: Wed, 12 May 2021 14:38:50 +0100 Subject: [PATCH 1/2] Prefer remapped filename in backtrace to match rustc behaviour --- src/shims/backtrace.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shims/backtrace.rs b/src/shims/backtrace.rs index 159a0bc1f8..224d8182b1 100644 --- a/src/shims/backtrace.rs +++ b/src/shims/backtrace.rs @@ -108,7 +108,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx let lo = tcx.sess.source_map().lookup_char_pos(pos); - let filename = lo.file.name.to_string(); + let filename = lo.file.name.prefer_remapped().to_string(); let lineno: u32 = lo.line as u32; // `lo.col` is 0-based - add 1 to make it 1-based for the caller. let colno: u32 = lo.col.0 as u32 + 1; From 5b88045bfa18dcfa17c9f4a4de2c1c7ad4b3ced9 Mon Sep 17 00:00:00 2001 From: Andy Wang Date: Wed, 12 May 2021 14:45:12 +0100 Subject: [PATCH 2/2] Update rust commit sha --- rust-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-version b/rust-version index f543240677..645e69c516 100644 --- a/rust-version +++ b/rust-version @@ -1 +1 @@ -506e75cbf8cb5305e49a41326307004ca3976029 +e1ff91f439bc09f566da211c6449821b4e949279 \ No newline at end of file