tests: extend remap-path-prefix-std to all stdlib rlibs by paradoxicalguy · Pull Request #156570 · rust-lang/rust

paradoxicalguy · 2026-05-14T11:31:51Z

problem:

the current remap-path-prefix-std run-make test validates path remapping for libstd.rlib, which leaves the rest of the distributed stdlib artifacts unchecked.

fix:

generalizing the test to go over over all distributed .rlib files found in the target sysroot libdir instead of checking only the libstd.

result:

improves reproducibility coverage for distributed stdlib artifacts.

r? @Urgau

Urgau · 2026-05-14T13:49:34Z

@bors try jobs=dist-x86_64-linux

tests: extend remap-path-prefix-std to all stdlib rlibs try-job: dist-x86_64-linux

rust-bors · 2026-05-14T16:59:37Z

☀️ Try build successful (CI)
Build commit: 8d33ecc (8d33ecc7330a13730e8a40214401163109712e5d, parent: 1a70f8d36e818b45829a5c065fd6004c9047e8d1)

Urgau · 2026-05-14T19:08:38Z

@bors r+ rollup

rust-bors · 2026-05-14T19:08:41Z

📌 Commit 6a3fc8b has been approved by Urgau

It is now in the queue for this repository.

@Urgau

…lean, r=Urgau tests: extend remap-path-prefix-std to all stdlib rlibs ### problem: the current `remap-path-prefix-std` run-make test validates path remapping for `libstd.rlib`, which leaves the rest of the distributed `stdlib` artifacts unchecked. ### fix: generalizing the test to go over over all distributed `.rlib` files found in the target `sysroot libdir` instead of checking only the `libstd`. ### result: improves reproducibility coverage for distributed `stdlib` artifacts. r? @Urgau

…uwer Rollup of 4 pull requests Successful merges: - #156452 (Implement pinned drop sugar) - #156571 (Disable `main_needs_argc_argv` for Wasm) - #156565 (delegation: emit error when self type is not specified and accessed) - #156570 (tests: extend remap-path-prefix-std to all stdlib rlibs)

JonathanBrouwer · 2026-05-15T06:33:49Z

@bors r-
#156584 (comment)

rust-bors · 2026-05-15T06:33:55Z

This pull request was unapproved.

This PR was contained in a rollup (#156584), which was unapproved.

View changes since this unapproval

Urgau · 2026-05-15T10:04:22Z

Let's do a quick try run to be sure.

@bors try jobs=dist-i586-gnu-i586-i686-musl

tests: extend remap-path-prefix-std to all stdlib rlibs try-job: dist-i586-gnu-i586-i686-musl

rust-bors · 2026-05-15T11:34:06Z

💔 Test for e47907c failed: CI. Failed job:

try - dist-i586-gnu-i586-i686-musl (web logs, enhanced plaintext logs)

tests: extend remap-path-prefix-std to all stdlib rlibs try-job: dist-i586-gnu-i586-i686-musl

rust-bors · 2026-07-17T09:46:05Z

☀️ Try build successful (CI)
Build commit: 32d8583 (32d8583df382b763630da17b83d38ed4532a3f94)
Base parent: 4a9d536 (4a9d5368df6450bbd2fc8dde4508c3e5d83bb19d)

paradoxicalguy · 2026-07-17T10:05:02Z

FINALLY 🎉
tho can we get a final code review for both files? if they are good to go, i'll open the compiler-builtins PR first.

@Urgau @tgross35

Urgau · 2026-07-18T09:41:55Z

+        let commit_hash = debuginfo_map
+            .split('\t')
+            .next()
+            .and_then(|first| first.split("/rustc/").nth(1))
+            .and_then(|s| s.split('/').next())
+            .map(String::from);


Why do we do this extraction? Looking at #t-compiler > Checking reproducibility of rustc @ 💬 I feel like we could just apply all remapping like we do for llvm, no?

rust/compiler/rustc_llvm/build.rs

Lines 276 to 283 in b26c8ef

// Remap ci-llvm include paths in debug info for reproducible builds.

if let Some(maps) = tracked_env_var_os("RUSTC_DEBUGINFO_MAP")

&& let Some(maps_str) = maps.to_str()

{

for map in maps_str.split('\t') {

cfg.flag_if_supported(&format!("-ffile-prefix-map={map}"));

}

}

View changes since the review

wait i'll test this one rn, thanks

tested this: switched to -ffile-prefix-map, looping over all RUSTC_DEBUGINFO_MAP entries like rustc_llvm's build.rs does.
added one extra mapping for the crate's own manifest dir since it's not covered by the existing entries.
removed the old line-538 mapping since it was conflicting with this.
verified via llvm-dwarfdump: all comp_dir entries now show /rustc/<hash>, no leaked paths.

I'm surprised the crate own manifest dir is still necessary, but oh well, if it works.

Ping me when you push.

mb it doesnt need a strict manifest dir
removing it gives: DW_AT_comp_dir ("/rustc/08f62523b1c3262cc2f0288a3369b760ab4bda45/library/compiler-builtins/compiler-builtins").
instead of the shorter DW_AT_comp_dir ("/rustc/08f62523b1c3262cc2f0288a3369b760ab4bda45").
no path leak tho. happy to keep code or drop it

Well, the first DW_AT_comp_dir is more inline with what I would expect, to be honest. I would say, let's drop it, that makes the code simpler and clearer.

sure, i'll open a separate pr first

paradoxicalguy · 2026-07-19T19:48:45Z

why bootstrap doesn't just thread this through CFLAGS/CXXFLAGS instead of the custom RUSTC_DEBUGINFO_MAP env var. does the same cargo#4423 forwarding issue apply to CFLAGS/CXXFLAGS too, or is there another reason bootstrap doesn't use them here?

Urgau · 2026-07-19T20:21:56Z

That's a very good point, I didn't think of that. Turns out we already even have such remapping flags set in

rust/src/bootstrap/src/lib.rs

Lines 1323 to 1332 in 9f36de7

    
           if let Some(map_to) = self.debuginfo_map_to(which, RemapScheme::NonCompiler) { 
        
               let map = format!("{}={}", self.src.display(), map_to); 
        
               let cc = self.cc(target); 
        
               if cc.ends_with("clang") || cc.ends_with("gcc") { 
        
                   base.push(format!("-fdebug-prefix-map={map}")); 
        
               } else if cc.ends_with("clang-cl.exe") { 
        
                   base.push("-Xclang".into()); 
        
                   base.push(format!("-fdebug-prefix-map={map}")); 
        
               } 
        
           }

rust/src/bootstrap/src/core/builder/cargo.rs

Line 433 in 9f36de7

let env = format!("CFLAGS_{triple_underscored}");

I wonder why it's not working then, could it be because we only set it for the target?

paradoxicalguy · 2026-07-20T07:50:23Z

mark was asking here
rust-lang/compiler-builtins#1236 (comment) .

and found it, cc_unhandled_cflags only pushes -fdebug-prefix-map if cc.ends_with("clang") || cc.ends_with("gcc"). my CC resolves to plain "cc" (common symlink), which doesn't match either suffix, so the flag never gets added.
not a target-scoping issue looks like a gap in that string check.

paradoxicalguy · 2026-07-20T22:46:40Z

i tried it with

if cc.ends_with("clang")
                || cc.ends_with("gcc")
                || cc.file_name().is_some_and(|f| f == "cc")
            {
                base.push(format!("-fdebug-prefix-map={map}"));
           }

while reverting the compiler-builtins as it was (only build.flag_if_supported(&format!("-ffile-prefix-map={}=.", root.display()));)

final result gives:
/rustc/08f62523b1c3262cc2f0288a3369b760ab4bda45/library/compiler-builtins/compiler-builtins

the remap-path-prefix-std run-make test also passes with just the bootstrap change locally.

rustbot · 2026-07-26T11:25:41Z

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

paradoxicalguy · 2026-07-26T11:29:06Z

@bors try jobs=dist-i586-gnu-i586-i686-musl

tests: extend remap-path-prefix-std to all stdlib rlibs try-job: dist-i586-gnu-i586-i686-musl

rust-bors · 2026-07-26T12:50:42Z

☀️ Try build successful (CI)
Build commit: ba1851e (ba1851e8e97bb613b296f1a33f21446d37245743)
Base parent: 5d48869 (5d4886964b04e1aa6aca158a677183a778e2950d)

Urgau

LGTM, thanks for pursing it the intermediate fixes.

View changes since this review

Urgau · 2026-07-26T13:13:34Z

@bors r+

rust-bors · 2026-07-26T13:13:38Z

📌 Commit 6fe13d9 has been approved by Urgau

It is now in the queue for this repository.

🌲 The tree is currently closed for pull requests below priority 100. This pull request will be tested once the tree is reopened.

Reason for tree closure: spurious failures

paradoxicalguy · 2026-07-26T13:30:18Z

yay :D

@Urgau

…lean, r=Urgau tests: extend remap-path-prefix-std to all stdlib rlibs ### problem: the current `remap-path-prefix-std` run-make test validates path remapping for `libstd.rlib`, which leaves the rest of the distributed `stdlib` artifacts unchecked. ### fix: generalizing the test to go over over all distributed `.rlib` files found in the target `sysroot libdir` instead of checking only the `libstd`. ### result: improves reproducibility coverage for distributed `stdlib` artifacts. r? @Urgau

@Urgau

…lean, r=Urgau tests: extend remap-path-prefix-std to all stdlib rlibs ### problem: the current `remap-path-prefix-std` run-make test validates path remapping for `libstd.rlib`, which leaves the rest of the distributed `stdlib` artifacts unchecked. ### fix: generalizing the test to go over over all distributed `.rlib` files found in the target `sysroot libdir` instead of checking only the `libstd`. ### result: improves reproducibility coverage for distributed `stdlib` artifacts. r? @Urgau

…uwer Rollup of 28 pull requests Successful merges: - #159638 (bootstrap: Split the `Step` trait into multiple traits) - #159774 (rustc_trait_selection: fix trait solver hang caused by degenerate obligations) - #159837 (line-tables-only test: check that the line number matches the function name) - #159946 (Update Enzyme submodule to imporve llvm-cov) - #159962 (miri subtree update) - #156570 (tests: extend remap-path-prefix-std to all stdlib rlibs) - #159617 (Fix up `#[linkage]` target checking) - #159633 (Improve workings of attribute suggestions) - #159733 (std: Switch implementations of `thread_local!` for WASI) - #159783 (Check unsafe impls on safe EIIs) - #159810 (Add tuple never coercion collection regression test) - #159826 (Remove redundant `#[rustc_paren_sugar]` feature gate) - #159846 (Implement `str::copy_from_str`) - #159849 (rustc_parse: Stop returning `Option` from statement parsing) - #159853 (Updated expect messages for `CString` struct and method documentation) - #159875 (More cleanup in `rustc_attr_parsing`) - #159882 (Update expect messages in library/alloc/boxed.rs and library/alloc/string.rs to follow the style guide) - #159891 (Split multiline derives into std/rustc macros) - #159893 (Fix `find_attr` hygiene and `rustc_hir` cleanups) - #159895 (rustc-dev-guide subtree update) - #159902 (Clarify that the expected runtime symbols signature is for the current target only) - #159914 (Fix error in diagnostic on_unmatched_args) - #159917 (spare capacity mut constification) - #159918 (rename abort_unwind → abort_on_unwind) - #159927 (Remove sve2 from the ImpliedFeatures of AArch64 v9a.) - #159936 (Minor `rustc_ast::ast` doc cleanups) - #159945 (Update expect messages in library/core/src/ptr/non_null.rs) - #159950 (Add CFI tests for return types and never type)

rustbot added A-run-make Area: port run-make Makefiles to rmake.rs S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels May 14, 2026

rustbot assigned Urgau May 14, 2026

Urgau reviewed May 14, 2026

View reviewed changes

Comment thread tests/run-make/remap-path-prefix-std/rmake.rs

This comment has been minimized.

Sign in to view

paradoxicalguy force-pushed the test-extend-rmake-clean branch from 4c83da0 to 6a3fc8b Compare May 14, 2026 13:28

This comment has been minimized.

Sign in to view

rust-bors Bot pushed a commit that referenced this pull request May 14, 2026

Auto merge of #156570 - paradoxicalguy:test-extend-rmake-clean, r=<try>

8d33ecc

tests: extend remap-path-prefix-std to all stdlib rlibs try-job: dist-x86_64-linux

Urgau approved these changes May 14, 2026

View reviewed changes

rust-bors Bot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 14, 2026

JonathanBrouwer mentioned this pull request May 14, 2026

Rollup of 4 pull requests #156584

Closed

rust-bors Bot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 15, 2026

Urgau reviewed May 15, 2026

View reviewed changes

Comment thread tests/run-make/remap-path-prefix-std/rmake.rs Outdated

This comment has been minimized.

Sign in to view

paradoxicalguy force-pushed the test-extend-rmake-clean branch from 94d97b7 to afa7f77 Compare May 15, 2026 09:29

rust-bors Bot pushed a commit that referenced this pull request May 15, 2026

Auto merge of #156570 - paradoxicalguy:test-extend-rmake-clean, r=<try>

e47907c

tests: extend remap-path-prefix-std to all stdlib rlibs try-job: dist-i586-gnu-i586-i686-musl

This comment has been minimized.

Sign in to view

rust-bors Bot pushed a commit that referenced this pull request Jul 17, 2026

Auto merge of #156570 - paradoxicalguy:test-extend-rmake-clean, r=<try>

32d8583

tests: extend remap-path-prefix-std to all stdlib rlibs try-job: dist-i586-gnu-i586-i686-musl

tgross35 reviewed Jul 17, 2026

View reviewed changes

Comment thread library/compiler-builtins/compiler-builtins/build.rs Outdated

Urgau reviewed Jul 18, 2026

View reviewed changes

paradoxicalguy mentioned this pull request Jul 19, 2026

compiler-builtins: remap RUSTC_DEBUGINFO_MAP paths via -ffile-prefix-map rust-lang/compiler-builtins#1236

Closed

tests: extend remap-path-prefix-std to all stdlib rlibs

6fe13d9

This comment has been minimized.

Sign in to view

rustbot added the has-merge-commits PR has merge commits, merge with caution. label Jul 26, 2026

paradoxicalguy force-pushed the test-extend-rmake-clean branch from d80659b to 6fe13d9 Compare July 26, 2026 11:28

rustbot removed has-merge-commits PR has merge commits, merge with caution. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 26, 2026

This comment has been minimized.

Sign in to view

rust-bors Bot pushed a commit that referenced this pull request Jul 26, 2026

Auto merge of #156570 - paradoxicalguy:test-extend-rmake-clean, r=<try>

ba1851e

tests: extend remap-path-prefix-std to all stdlib rlibs try-job: dist-i586-gnu-i586-i686-musl

Urgau approved these changes Jul 26, 2026

View reviewed changes

rust-bors Bot added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jul 26, 2026

JonathanBrouwer mentioned this pull request Jul 26, 2026

Rollup of 28 pull requests #159966

Open

	// Remap ci-llvm include paths in debug info for reproducible builds.
	if let Some(maps) = tracked_env_var_os("RUSTC_DEBUGINFO_MAP")
	&& let Some(maps_str) = maps.to_str()
	{
	for map in maps_str.split('\t') {
	cfg.flag_if_supported(&format!("-ffile-prefix-map={map}"));
	}
	}

Uh oh!

Uh oh!

Conversation

paradoxicalguy commented May 14, 2026 • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

problem:

fix:

result:

Uh oh!

Uh oh!

This comment has been minimized.

Urgau commented May 14, 2026

Uh oh!

This comment has been minimized.

rust-bors Bot commented May 14, 2026

Uh oh!

Urgau commented May 14, 2026

Uh oh!

rust-bors Bot commented May 14, 2026

Uh oh!

JonathanBrouwer commented May 15, 2026

Uh oh!

rust-bors Bot commented May 15, 2026

Uh oh!

Uh oh!

This comment has been minimized.

Urgau commented May 15, 2026

Uh oh!

This comment has been minimized.

rust-bors Bot commented May 15, 2026

Uh oh!

rust-bors Bot commented Jul 17, 2026

Uh oh!

paradoxicalguy commented Jul 17, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Urgau Jul 18, 2026 • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

paradoxicalguy Jul 18, 2026

Choose a reason for hiding this comment

Uh oh!

paradoxicalguy Jul 18, 2026

Choose a reason for hiding this comment

Uh oh!

Urgau Jul 18, 2026

Choose a reason for hiding this comment

Uh oh!

paradoxicalguy Jul 19, 2026

Choose a reason for hiding this comment

Uh oh!

Urgau Jul 19, 2026

Choose a reason for hiding this comment

Uh oh!

paradoxicalguy Jul 19, 2026

Choose a reason for hiding this comment

Uh oh!

paradoxicalguy commented Jul 19, 2026

Uh oh!

Urgau commented Jul 19, 2026

Uh oh!

paradoxicalguy commented Jul 20, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

paradoxicalguy commented Jul 20, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Jul 26, 2026

Uh oh!

This comment has been minimized.

paradoxicalguy commented Jul 26, 2026

Uh oh!

This comment has been minimized.

rust-bors Bot commented Jul 26, 2026

Uh oh!

Urgau left a comment • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

paradoxicalguy commented May 14, 2026 •

edited by rustbot

Loading

Urgau Jul 18, 2026 •

edited by rustbot

Loading

paradoxicalguy commented Jul 20, 2026 •

edited

Loading

paradoxicalguy commented Jul 20, 2026 •

edited

Loading

Urgau left a comment •

edited by rustbot

Loading