Skip to content

Commit efa15eb

Browse files
committed
Auto merge of #123441 - saethlin:fixed-len-file-names, r=oli-obk
Stabilize the size of incr comp object file names The current implementation does not produce stable-length paths, and we create the paths in a way that makes our allocation behavior is nondeterministic. I think `@eddyb` fixed a number of other cases like this in the past, and this PR fixes another one. Whether that actually matters I have no idea, but we still have bimodal behavior in rustc-perf and the non-uniformity in `find` and `ls` was bothering me. I've also removed the truncation of the mangled CGU names. Before this PR incr comp paths look like this: ``` target/debug/incremental/scratch-38izrrq90cex7/s-gux6gz0ow8-1ph76gg-ewe1xj434l26w9up5bedsojpd/261xgo1oqnd90ry5.o ``` And after, they look like this: ``` target/debug/incremental/scratch-035omutqbfkbw/s-gux6borni0-16r3v1j-6n64tmwqzchtgqzwwim5amuga/55v2re42sztc8je9bva6g8ft3.o ``` On the one hand, I'm sure this will break some people's builds because they're on Windows and only a few bytes from the path length limit. But if we're that seriously worried about the length of our file names, I have some other ideas on how to make them smaller. And last time I deleted some hash truncations from the compiler, there was a huge drop in the number if incremental compilation ICEs that were reported: #110367 --- Upon further reading, this PR actually fixes a bug. This comment says the CGU names are supposed to be a fixed-length hash, and before this PR they aren't: https://github.com/rust-lang/rust/blob/ca7d34efa94afe271accf2bd3d44152a5bd6fff1/compiler/rustc_monomorphize/src/partitioning.rs#L445-L448
2 parents 7ed351a + 2d082ae commit efa15eb

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

src/context.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ use gccjit::{
66
use rustc_codegen_ssa::base::wants_msvc_seh;
77
use rustc_codegen_ssa::errors as ssa_errors;
88
use rustc_codegen_ssa::traits::{BackendTypes, BaseTypeMethods, MiscMethods};
9-
use rustc_data_structures::base_n;
9+
use rustc_data_structures::base_n::ToBaseN;
10+
use rustc_data_structures::base_n::ALPHANUMERIC_ONLY;
1011
use rustc_data_structures::fx::{FxHashMap, FxHashSet};
1112
use rustc_middle::mir::mono::CodegenUnit;
1213
use rustc_middle::span_bug;
@@ -621,7 +622,7 @@ impl<'b, 'tcx> CodegenCx<'b, 'tcx> {
621622
let mut name = String::with_capacity(prefix.len() + 6);
622623
name.push_str(prefix);
623624
name.push_str(".");
624-
base_n::push_str(idx as u128, base_n::ALPHANUMERIC_ONLY, &mut name);
625+
name.push_str(&(idx as u64).to_base(ALPHANUMERIC_ONLY));
625626
name
626627
}
627628
}

0 commit comments

Comments
 (0)