diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2022-03-06 19:08:39 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-06 19:08:39 +0100 |
| commit | 0480a3254afc371ee2f402cd588a1a61fc679eea (patch) | |
| tree | f89c0e661a9cfc2217c8e0bcee1f6e951d77a8d7 | |
| parent | e8f38a03b5915e2ed998671c98cfa92ff44205c7 (diff) | |
| parent | 0e604a7864268d1591a49e68a7155292c99c3662 (diff) | |
| download | rust-0480a3254afc371ee2f402cd588a1a61fc679eea.tar.gz rust-0480a3254afc371ee2f402cd588a1a61fc679eea.zip | |
Rollup merge of #94672 - joedeandev:master, r=Dylan-DPC
Improved error message for failed bitcode load "bc" is an unnecessary shorthand that obfuscates the compilation error
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/back/lto.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/lto/lto-duplicate-symbols.stderr | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_codegen_llvm/src/back/lto.rs b/compiler/rustc_codegen_llvm/src/back/lto.rs index 6afa649b6de..0f5b1c08ec2 100644 --- a/compiler/rustc_codegen_llvm/src/back/lto.rs +++ b/compiler/rustc_codegen_llvm/src/back/lto.rs @@ -317,7 +317,7 @@ fn fat_lto( info!("linking {:?}", name); let data = bc_decoded.data(); linker.add(data).map_err(|()| { - let msg = format!("failed to load bc of {:?}", name); + let msg = format!("failed to load bitcode of module {:?}", name); write::llvm_err(diag_handler, &msg) })?; serialized_bitcode.push(bc_decoded); diff --git a/src/test/ui/lto/lto-duplicate-symbols.stderr b/src/test/ui/lto/lto-duplicate-symbols.stderr index 50e6b81dcf4..f66afa94f4d 100644 --- a/src/test/ui/lto/lto-duplicate-symbols.stderr +++ b/src/test/ui/lto/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.HASH-cgu.0.rcgu.o": +error: failed to load bitcode of module "lto-duplicate-symbols2.lto_duplicate_symbols2.HASH-cgu.0.rcgu.o": error: aborting due to previous error; 1 warning emitted |