Switch functions to use readable name in visualization. [Merge after …

…CBMC-Viewer version update] (rust-lang#225)
celinval · Aug 19, 2021 · 28a4da3 · 28a4da3
1 parent 221558d
commit 28a4da3
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/compiler/rustc_codegen_llvm/src/gotoc/mir_to_goto/codegen/span.rs b/compiler/rustc_codegen_llvm/src/gotoc/mir_to_goto/codegen/span.rs
@@ -19,7 +19,12 @@ impl<'tcx> GotocCtx<'tcx> {
             Ok(pathbuf) => pathbuf.to_str().unwrap().to_string(),
             Err(_) => filename0,
         };
-        Location::new(filename1, self.current_fn.as_ref().map(|x| x.name()), line, Some(col))
+        Location::new(
+            filename1,
+            self.current_fn.as_ref().map(|x| x.readable_name().to_string()),
+            line,
+            Some(col),
+        )
     }
 
     pub fn codegen_span_option(&self, sp: Option<Span>) -> Location {

diff --git a/src/test/cargo-rmc/simple-config-toml/test_one_plus_two.expected b/src/test/cargo-rmc/simple-config-toml/test_one_plus_two.expected
@@ -1 +1 @@
-[test_one_plus_two.assertion.1] line 31 assertion failed: p.sum() == 3: SUCCESS
+[pair::rmc_tests::test_one_plus_two.assertion.1] line 31 assertion failed: p.sum() == 3: SUCCESS
diff --git a/src/test/cargo-rmc/simple-config-toml/test_sum.expected b/src/test/cargo-rmc/simple-config-toml/test_sum.expected
@@ -1 +1 @@
-[test_sum.assertion.1] line 27 assertion failed: p.sum() == a.wrapping_add(b): SUCCESS
+[rmc_tests::test_sum.assertion.1] line 27 assertion failed: p.sum() == a.wrapping_add(b): SUCCESS
diff --git a/src/test/cargo-rmc/simple-lib/test_one_plus_two.expected b/src/test/cargo-rmc/simple-lib/test_one_plus_two.expected
@@ -1 +1 @@
-[test_one_plus_two.assertion.1] line 31 assertion failed: p.sum() == 3: SUCCESS
+[pair::rmc_tests::test_one_plus_two.assertion.1] line 31 assertion failed: p.sum() == 3: SUCCESS
diff --git a/src/test/cargo-rmc/simple-lib/test_sum.expected b/src/test/cargo-rmc/simple-lib/test_sum.expected
@@ -1 +1 @@
-[test_sum.assertion.1] line 27 assertion failed: p.sum() == a.wrapping_add(b): SUCCESS
+[rmc_tests::test_sum.assertion.1] line 27 assertion failed: p.sum() == a.wrapping_add(b): SUCCESS
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		[test_one_plus_two.assertion.1] line 31 assertion failed: p.sum() == 3: SUCCESS
		[pair::rmc_tests::test_one_plus_two.assertion.1] line 31 assertion failed: p.sum() == 3: SUCCESS
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		[test_sum.assertion.1] line 27 assertion failed: p.sum() == a.wrapping_add(b): SUCCESS
		[rmc_tests::test_sum.assertion.1] line 27 assertion failed: p.sum() == a.wrapping_add(b): SUCCESS