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

rustc_codegen_ssa: Don't let IncorrectCguReuseType errors get lost

Browse Source 
In [100753], `IncorrectCguReuseType` accidentally stopped being emitted.
Begin emitting it again rather than just blindly dropping it, and adjust
tests accordingly.

[100753]: 706452eba7 (diff-048389738ddcbe0f9765291a29db1fed9a5f03693d4781cfb5aaa97ffb3c7f84)
This commit is contained in:
Martin Nordholts 2023-12-12 16:47:32 +01:00
parent 1559dd2dbf
commit d46df80c73
4 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compiler/rustc_codegen_ssa/src/assert_module_sources.rs
View File

@ -278,13 +278,13 @@ fn check_expected_reuse(&self, sess: &Session) {
if error { if error {
let at_least = if at_least { 1 } else { 0 }; let at_least = if at_least { 1 } else { 0 };
errors::IncorrectCguReuseType { sess.emit_err(errors::IncorrectCguReuseType {
span: *error_span, span: *error_span,
cgu_user_name, cgu_user_name,
actual_reuse, actual_reuse,
expected_reuse, expected_reuse,
at_least, at_least,
}; });
} }
} else { } else {
sess.emit_fatal(errors::CguNotRecorded { cgu_user_name, cgu_name }); sess.emit_fatal(errors::CguNotRecorded { cgu_user_name, cgu_name });

4
tests/incremental/thinlto/cgu_invalidated_via_import.rs
View File

@ -14,14 +14,14 @@
kind="no")] kind="no")]
#![rustc_expected_cgu_reuse(module="cgu_invalidated_via_import-foo", #![rustc_expected_cgu_reuse(module="cgu_invalidated_via_import-foo",
cfg="cfail3", cfg="cfail3",
kind="post-lto")] kind="pre-lto")] // Should be "post-lto", see issue #119076
#![rustc_expected_cgu_reuse(module="cgu_invalidated_via_import-bar", #![rustc_expected_cgu_reuse(module="cgu_invalidated_via_import-bar",
cfg="cfail2", cfg="cfail2",
kind="pre-lto")] kind="pre-lto")]
#![rustc_expected_cgu_reuse(module="cgu_invalidated_via_import-bar", #![rustc_expected_cgu_reuse(module="cgu_invalidated_via_import-bar",
cfg="cfail3", cfg="cfail3",
kind="post-lto")] kind="pre-lto")] // Should be "post-lto", see issue #119076
mod foo { mod foo {

12
tests/incremental/thinlto/cgu_keeps_identical_fn.rs
View File

@ -9,21 +9,25 @@
#![feature(rustc_attrs)] #![feature(rustc_attrs)]
#![crate_type = "rlib"] #![crate_type = "rlib"]
#![rustc_expected_cgu_reuse(module = "cgu_keeps_identical_fn-foo", cfg = "cfail2", kind = "no")] #![rustc_expected_cgu_reuse(
module = "cgu_keeps_identical_fn-foo",
cfg = "cfail2",
kind = "pre-lto"
)]
#![rustc_expected_cgu_reuse( #![rustc_expected_cgu_reuse(
module = "cgu_keeps_identical_fn-foo", module = "cgu_keeps_identical_fn-foo",
cfg = "cfail3", cfg = "cfail3",
kind = "post-lto" kind = "pre-lto" // Should be "post-lto", see issue #119076
)] )]
#![rustc_expected_cgu_reuse( #![rustc_expected_cgu_reuse(
module = "cgu_keeps_identical_fn-bar", module = "cgu_keeps_identical_fn-bar",
cfg = "cfail2", cfg = "cfail2",
kind = "post-lto" kind = "pre-lto" // Should be "post-lto", see issue #119076
)] )]
#![rustc_expected_cgu_reuse( #![rustc_expected_cgu_reuse(
module = "cgu_keeps_identical_fn-bar", module = "cgu_keeps_identical_fn-bar",
cfg = "cfail3", cfg = "cfail3",
kind = "post-lto" kind = "pre-lto" // Should be "post-lto", see issue #119076
)] )]
mod foo { mod foo {

8
tests/incremental/thinlto/independent_cgus_dont_affect_each_other.rs
View File

@ -13,21 +13,21 @@
kind="no")] kind="no")]
#![rustc_expected_cgu_reuse(module="independent_cgus_dont_affect_each_other-foo", #![rustc_expected_cgu_reuse(module="independent_cgus_dont_affect_each_other-foo",
cfg="cfail3", cfg="cfail3",
kind="post-lto")] kind="pre-lto")] // Should be "post-lto", see issue #119076
#![rustc_expected_cgu_reuse(module="independent_cgus_dont_affect_each_other-bar", #![rustc_expected_cgu_reuse(module="independent_cgus_dont_affect_each_other-bar",
cfg="cfail2", cfg="cfail2",
kind="pre-lto")] kind="pre-lto")]
#![rustc_expected_cgu_reuse(module="independent_cgus_dont_affect_each_other-bar", #![rustc_expected_cgu_reuse(module="independent_cgus_dont_affect_each_other-bar",
cfg="cfail3", cfg="cfail3",
kind="post-lto")] kind="pre-lto")] // Should be "post-lto", see issue #119076
#![rustc_expected_cgu_reuse(module="independent_cgus_dont_affect_each_other-baz", #![rustc_expected_cgu_reuse(module="independent_cgus_dont_affect_each_other-baz",
cfg="cfail2", cfg="cfail2",
kind="post-lto")] kind="pre-lto")] // Should be "post-lto", see issue #119076
#![rustc_expected_cgu_reuse(module="independent_cgus_dont_affect_each_other-baz", #![rustc_expected_cgu_reuse(module="independent_cgus_dont_affect_each_other-baz",
cfg="cfail3", cfg="cfail3",
kind="post-lto")] kind="pre-lto")] // Should be "post-lto", see issue #119076
mod foo { mod foo {
#[cfg(cfail1)] #[cfg(cfail1)]