mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #97328 - petrochenkov:nativice, r=michaelwoerister

Browse Source 
rustc: Fix ICE in native library error reporting

Fixes https://github.com/rust-lang/rust/issues/97299
This commit is contained in:
Dylan DPC 2022-05-25 17:37:20 +02:00 committed by GitHub
commit 006707834f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
compiler/rustc_metadata/src/native_libs.rs
View File

@ -418,10 +418,11 @@ impl<'tcx> Collector<'tcx> {
// involved or not, library reordering and kind overriding without
// explicit `:rename` in particular.
if lib.has_modifiers() || passed_lib.has_modifiers() {
self.tcx.sess.span_err(
self.tcx.def_span(lib.foreign_module.unwrap()),
"overriding linking modifiers from command line is not supported"
);
let msg = "overriding linking modifiers from command line is not supported";
match lib.foreign_module {
Some(def_id) => self.tcx.sess.span_err(self.tcx.def_span(def_id), msg),
None => self.tcx.sess.err(msg),
};
}
if passed_lib.kind != NativeLibKind::Unspecified {
lib.kind = passed_lib.kind;

7
src/test/ui/native-library-link-flags/modifiers-override-3.rs Normal file
View File

@ -0,0 +1,7 @@
// Regression test for issue #97299, one command line library with modifiers
// overrides another command line library with modifiers.
// compile-flags:-lstatic:+whole-archive=foo -lstatic:+whole-archive=foo
// error-pattern: overriding linking modifiers from command line is not supported
fn main() {}

4
src/test/ui/native-library-link-flags/modifiers-override-3.stderr Normal file
View File

@ -0,0 +1,4 @@
error: overriding linking modifiers from command line is not supported
error: aborting due to previous error