Fix assembly $RUSTC replacing

madsmtm · Jul 31, 2023 · 413929d · 413929d
1 parent a9b4418
commit 413929d
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 5 deletions.
diff --git a/crates/test-assembly/crates/test_declare_class/expected/apple-aarch64.s b/crates/test-assembly/crates/test_declare_class/expected/apple-aarch64.s
@@ -783,7 +783,7 @@ l_anon.[ID].2:
 	.ascii	"called `Option::unwrap()` on a `None` value"
 
 l_anon.[ID].3:
-	.ascii	"/Users/madsmarquart/.rustup/toolchains/nightly-x86_64-apple-darwin/lib/rustlib/src/rust/library/std/src/sync/once.rs"
+	.ascii	"$RUSTC/library/std/src/sync/once.rs"
 
 	.section	__DATA,__const
 	.p2align	3, 0x0

diff --git a/crates/test-assembly/crates/test_declare_class/expected/apple-armv7.s b/crates/test-assembly/crates/test_declare_class/expected/apple-armv7.s
@@ -711,7 +711,7 @@ l_anon.[ID].2:
 	.ascii	"called `Option::unwrap()` on a `None` value"
 
 l_anon.[ID].3:
-	.ascii	"/Users/madsmarquart/.rustup/toolchains/nightly-x86_64-apple-darwin/lib/rustlib/src/rust/library/std/src/sync/once.rs"
+	.ascii	"$RUSTC/library/std/src/sync/once.rs"
 
 	.section	__DATA,__const
 	.p2align	2, 0x0

diff --git a/crates/test-assembly/crates/test_declare_class/expected/apple-armv7s.s b/crates/test-assembly/crates/test_declare_class/expected/apple-armv7s.s
@@ -714,7 +714,7 @@ l_anon.[ID].2:
 	.ascii	"called `Option::unwrap()` on a `None` value"
 
 l_anon.[ID].3:
-	.ascii	"/Users/madsmarquart/.rustup/toolchains/nightly-x86_64-apple-darwin/lib/rustlib/src/rust/library/std/src/sync/once.rs"
+	.ascii	"$RUSTC/library/std/src/sync/once.rs"
 
 	.section	__DATA,__const
 	.p2align	2, 0x0

diff --git a/crates/test-assembly/crates/test_declare_class/expected/apple-old-x86.s b/crates/test-assembly/crates/test_declare_class/expected/apple-old-x86.s
@@ -736,7 +736,7 @@ l_anon.[ID].2:
 	.ascii	"called `Option::unwrap()` on a `None` value"
 
 l_anon.[ID].3:
-	.ascii	"/Users/madsmarquart/.rustup/toolchains/nightly-x86_64-apple-darwin/lib/rustlib/src/rust/library/std/src/sync/once.rs"
+	.ascii	"$RUSTC/library/std/src/sync/once.rs"
 
 	.section	__DATA,__const
 	.p2align	2, 0x0

diff --git a/crates/test-assembly/crates/test_declare_class/expected/apple-x86.s b/crates/test-assembly/crates/test_declare_class/expected/apple-x86.s
@@ -736,7 +736,7 @@ l_anon.[ID].2:
 	.ascii	"called `Option::unwrap()` on a `None` value"
 
 l_anon.[ID].3:
-	.ascii	"/Users/madsmarquart/.rustup/toolchains/nightly-x86_64-apple-darwin/lib/rustlib/src/rust/library/std/src/sync/once.rs"
+	.ascii	"$RUSTC/library/std/src/sync/once.rs"
 
 	.section	__DATA,__const
 	.p2align	2, 0x0

diff --git a/crates/test-assembly/src/lib.rs b/crates/test-assembly/src/lib.rs
@@ -64,6 +64,8 @@ pub fn read_assembly<P: AsRef<Path>>(path: P, package_path: &Path) -> io::Result
         .as_os_str()
         .to_str()
         .unwrap();
+
+    // Replace paths
     let s = s.replace(workspace_dir, "$WORKSPACE");
     let s = s.replace(
         package_path
@@ -79,6 +81,14 @@ pub fn read_assembly<P: AsRef<Path>>(path: P, package_path: &Path) -> io::Result
     let s = regex::Regex::new(r"/rustc/[0-9a-f]*/")
         .unwrap()
         .replace_all(&s, |_: &regex::Captures| "$RUSTC/");
+    let s = regex::Regex::new(r"/.*/rustlib/src/rust/")
+        .unwrap()
+        .replace_all(&s, |_: &regex::Captures| "$RUSTC/");
+
+    // HACK: Make location data the same no matter which platform generated
+    // the data.
+    let s = s.replace(".asciz\t\"}", ".asciz\t\"t");
+
     // HACK: Replace Objective-C image info for simulator targets
     let s = s.replace(
         ".asciz\t\"\\000\\000\\000\\000`\\000\\000\"",