Prevent type flags assertions being thrown in default_anon_const_substs if errors occurred #90396
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rust-highfive
added
the
S-waiting-on-review
This comment has been minimized.
This comment has been minimized.
b-naber
force-pushed
the
type_flags_ices_default_anon_consts
branch
from
acdfb53 to
03253ab
Compare
lcnr
reviewed
Oct 29, 2021
| @@ -293,7 +293,9 @@ pub(super) fn default_anon_const_substs(tcx: TyCtxt<'_>, def_id: DefId) -> Subst | |||
| for arg in substs.iter() { | |||
| let allowed_flags = ty::TypeFlags::MAY_NEED_DEFAULT_CONST_SUBSTS | |||
| | ty::TypeFlags::STILL_FURTHER_SPECIALIZABLE; | |||
| assert!(!arg.has_type_flags(!allowed_flags)); | |||
| if !arg.has_type_flags(ty::TypeFlags::HAS_ERROR) { | |||
There was a problem hiding this comment.
i prefer adding HAS_ERROR to allowed_flags instead of checking the type flags twice.
after that r=me
b-naber
force-pushed
the
type_flags_ices_default_anon_consts
branch
from
03253ab to
8397ffa
Compare
b-naber
force-pushed
the
type_flags_ices_default_anon_consts
branch
from
8397ffa to
87fbf3c
Compare
|
@bors r+ rollup |
|
📌 Commit 87fbf3c has been approved by |
bors
added
S-waiting-on-bors
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Oct 30, 2021
…n_consts, r=lcnr Prevent type flags assertions being thrown in default_anon_const_substs if errors occurred Fixes rust-lang#90364 Fixes rust-lang#88997 r? `@lcnr`
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Oct 30, 2021
…askrgr Rollup of 8 pull requests Successful merges: - rust-lang#89876 (Make most std::ops traits const on numeric types) - rust-lang#90371 (Fix incorrect doc link) - rust-lang#90374 (Unify titles in rustdoc book doc attributes chapter) - rust-lang#90377 (Make `core::slice::from_raw_parts[_mut]` const) - rust-lang#90395 (Restrict liveness of mutable borrow of inner infcx in ConstInferUnifier::consts) - rust-lang#90396 (Prevent type flags assertions being thrown in default_anon_const_substs if errors occurred) - rust-lang#90402 (Add a few query descriptions) - rust-lang#90412 (Remove unnecessary `macro_use`s in rustdoc) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
lcnr
added
A-const-generics
16 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #90364
Fixes #88997
r? @lcnr