Skip to content

Rollup of 7 pull requests #119143

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 19 commits into from
Closed

Rollup of 7 pull requests #119143

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
ca718ff
track the source of nested goals
lcnr Dec 18, 2023
4a38442
dont discard overflow from normalizes-to goals
lcnr Dec 18, 2023
3f87043
Remove legacy bitcode defaults
arttet Dec 19, 2023
fd0033c
Use LLVM features for arm64e_apple_ios target
arttet Dec 19, 2023
ffdc6c7
effects: fix comment
fmease Dec 19, 2023
e6d6b1d
Do not evaluate in structurally_relate_tys
compiler-errors Dec 18, 2023
009cd9c
Remove unnecessary param-env from lexical region resolution and fully…
compiler-errors Dec 18, 2023
17705ea
add comment
lcnr Dec 19, 2023
a75d002
Remove param env from relation altogether
compiler-errors Dec 19, 2023
d46df80
rustc_codegen_ssa: Don't let `IncorrectCguReuseType` errors get lost
Enselic Dec 12, 2023
7571f6f
resolve: Feed visibilities for unresolved trait impl items
petrochenkov Dec 19, 2023
2c96025
Improve compiler error for c-strings in pre-2021
chfogelman Dec 7, 2023
ea5bfb8
Rollup merge of #118691 - chfogelman:improve-cstr-error, r=fmease
compiler-errors Dec 19, 2023
b25b723
Rollup merge of #118973 - Enselic:fix-IncorrectCguReuseType, r=michae…
compiler-errors Dec 19, 2023
49dc89d
Rollup merge of #119071 - lcnr:overflowo, r=compiler-errors
compiler-errors Dec 19, 2023
505ae86
Rollup merge of #119089 - fmease:dont-ice-on-tilde-const-non-const-tr…
compiler-errors Dec 19, 2023
f5a1261
Rollup merge of #119096 - compiler-errors:yeet-unnecessary-param-envs…
compiler-errors Dec 19, 2023
f06ab92
Rollup merge of #119118 - arttet:feature/fix-arm64e-targets, r=petroc…
compiler-errors Dec 19, 2023
41228d5
Rollup merge of #119134 - petrochenkov:feedvis2, r=compiler-errors
compiler-errors Dec 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
rustc_codegen_ssa: Don't let IncorrectCguReuseType errors get lost 
In [100753], `IncorrectCguReuseType` accidentally stopped being emitted.
Begin emitting it again rather than just blindly dropping it, and adjust
tests accordingly.

[100753]: 706452e#diff-048389738ddcbe0f9765291a29db1fed9a5f03693d4781cfb5aaa97ffb3c7f84
  • Loading branch information
@Enselic
Enselic committed Dec 19, 2023
commit d46df80c73aefdbad1a872337c3708f51ff3c376
4 changes: 2 additions & 2 deletions compiler/rustc_codegen_ssa/src/assert_module_sources.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,13 +278,13 @@ impl CguReuseTracker {

if error {
let at_least = if at_least { 1 } else { 0 };
errors::IncorrectCguReuseType {
sess.emit_err(errors::IncorrectCguReuseType {
span: *error_span,
cgu_user_name,
actual_reuse,
expected_reuse,
at_least,
};
});
}
} else {
sess.emit_fatal(errors::CguNotRecorded { cgu_user_name, cgu_name });
Expand Down
4 changes: 2 additions & 2 deletions tests/incremental/thinlto/cgu_invalidated_via_import.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
kind="no")]
#![rustc_expected_cgu_reuse(module="cgu_invalidated_via_import-foo",
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",
cfg="cfail2",
kind="pre-lto")]
#![rustc_expected_cgu_reuse(module="cgu_invalidated_via_import-bar",
cfg="cfail3",
kind="post-lto")]
kind="pre-lto")] // Should be "post-lto", see issue #119076

mod foo {

Expand Down
12 changes: 8 additions & 4 deletions tests/incremental/thinlto/cgu_keeps_identical_fn.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,25 @@

#![feature(rustc_attrs)]
#![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(
module = "cgu_keeps_identical_fn-foo",
cfg = "cfail3",
kind = "post-lto"
kind = "pre-lto" // Should be "post-lto", see issue #119076
)]
#![rustc_expected_cgu_reuse(
module = "cgu_keeps_identical_fn-bar",
cfg = "cfail2",
kind = "post-lto"
kind = "pre-lto" // Should be "post-lto", see issue #119076
)]
#![rustc_expected_cgu_reuse(
module = "cgu_keeps_identical_fn-bar",
cfg = "cfail3",
kind = "post-lto"
kind = "pre-lto" // Should be "post-lto", see issue #119076
)]

mod foo {
Expand Down
8 changes: 4 additions & 4 deletions tests/incremental/thinlto/independent_cgus_dont_affect_each_other.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,21 @@
kind="no")]
#![rustc_expected_cgu_reuse(module="independent_cgus_dont_affect_each_other-foo",
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",
cfg="cfail2",
kind="pre-lto")]
#![rustc_expected_cgu_reuse(module="independent_cgus_dont_affect_each_other-bar",
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",
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",
cfg="cfail3",
kind="post-lto")]
kind="pre-lto")] // Should be "post-lto", see issue #119076
mod foo {

#[cfg(cfail1)]
Expand Down