diff options
| author | bjorn3 <bjorn3@users.noreply.github.com> | 2021-07-05 11:33:04 +0200 |
|---|---|---|
| committer | bjorn3 <bjorn3@users.noreply.github.com> | 2021-07-06 11:36:23 +0200 |
| commit | 56c6a48d2e52fac9fec3124fa84c096668738917 (patch) | |
| tree | 6421ff9c1045ac79e9842fd198202caeb0eeba60 | |
| parent | ca935ddbf104b8b48eea8106f19e6a87f628d897 (diff) | |
| download | rust-56c6a48d2e52fac9fec3124fa84c096668738917.tar.gz rust-56c6a48d2e52fac9fec3124fa84c096668738917.zip | |
Truncate hex stable crate id to 8 characters (32 bits)
| -rw-r--r-- | compiler/rustc_middle/src/mir/mono.rs | 9 | ||||
| -rw-r--r-- | src/test/ui/lto-duplicate-symbols.stderr | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/compiler/rustc_middle/src/mir/mono.rs b/compiler/rustc_middle/src/mir/mono.rs index c354cdd985b..776cf002c17 100644 --- a/compiler/rustc_middle/src/mir/mono.rs +++ b/compiler/rustc_middle/src/mir/mono.rs @@ -494,14 +494,19 @@ impl CodegenUnitNameBuilder<'tcx> { format!( "-in-{}.{:08x}", tcx.crate_name(LOCAL_CRATE), - local_stable_crate_id.to_u64() + local_stable_crate_id.to_u64() as u32, ) } else { String::new() }; let stable_crate_id = tcx.sess.local_stable_crate_id(); - format!("{}.{:08x}{}", tcx.crate_name(cnum), stable_crate_id.to_u64(), local_crate_id) + format!( + "{}.{:08x}{}", + tcx.crate_name(cnum), + stable_crate_id.to_u64() as u32, + local_crate_id, + ) }); write!(cgu_name, "{}", crate_prefix).unwrap(); diff --git a/src/test/ui/lto-duplicate-symbols.stderr b/src/test/ui/lto-duplicate-symbols.stderr index 891cda8016c..e4de04ef3cc 100644 --- a/src/test/ui/lto-duplicate-symbols.stderr +++ b/src/test/ui/lto-duplicate-symbols.stderr @@ -1,6 +1,6 @@ warning: Linking globals named 'foo': symbol multiply defined! -error: failed to load bc of "lto-duplicate-symbols2.lto_duplicate_symbols2.288b404e693a75b4-cgu.0.rcgu.o": +error: failed to load bc of "lto-duplicate-symbols2.lto_duplicate_symbols2.693a75b4-cgu.0.rcgu.o": error: aborting due to previous error; 1 warning emitted |