Skip to content

Commit d8ac8dd

Browse files
committed
test(trim-paths): re-enable more symbols trimming check
rust-lang/rust#117652 has been fixed.
1 parent b646f83 commit d8ac8dd

File tree

1 file changed

+2
-11
lines changed

1 file changed

+2
-11
lines changed

tests/testsuite/profile_trim_paths.rs

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -620,21 +620,12 @@ fn object_works_helper(split_debuginfo: &str, run: impl Fn(&std::path::Path) ->
620620
if memchr::memmem::find(line, b" OSO ").is_some() {
621621
continue;
622622
}
623-
624-
// on macOS `SO` symbols are embedded in final binaries and should be trimmed.
625-
// See rust-lang/rust#117652.
626-
if memchr::memmem::find(line, b" SO ").is_some() {
627-
continue;
628-
}
629623
}
630624

631625
#[cfg(target_os = "linux")]
632626
{
633-
// There is a bug in rustc `-Zremap-path-scope`.
634-
// See rust-lang/rust/pull/118518
635-
if memchr::memmem::find(line, b"DW_AT_comp_dir").is_some() {
636-
continue;
637-
}
627+
// To fix this, we should also remap build.build-dir.
628+
// See <https://github.com/rust-lang/cargo/pull/15610/commits/a55c7f88fb8d592d993740176da95fc5d1a362e0#r2119070640>
638629
if memchr::memmem::find(line, b"DW_AT_GNU_dwo_name").is_some() {
639630
continue;
640631
}

0 commit comments

Comments
 (0)