Allow monomorphization time const eval failures if the cause is a type layout issue#124516
Merged
bors merged 2 commits intorust-lang:masterfrom May 23, 2024
Merged
Allow monomorphization time const eval failures if the cause is a type layout issue#124516bors merged 2 commits intorust-lang:masterfrom
bors merged 2 commits intorust-lang:masterfrom
Conversation
rustbot
added
the
S-waiting-on-review
Collaborator
|
Some changes occurred to the CTFE / Miri engine cc @rust-lang/miri Some changes occurred to the CTFE / Miri engine cc @rust-lang/miri |
rustbot
added
the
T-compiler
oli-obk
changed the title
RalfJung
reviewed
Apr 30, 2024
Member
RalfJung
left a comment
RalfJung
left a comment
There was a problem hiding this comment.
r=me with the comment nit -- but I think this does not entirely solve the problem; I just don't have the time to try and find an example right now
| err_inval!(Layout(LayoutError::ReferencesError(guar))) => { | ||
| ErrorHandled::Reported(guar.into(), span.unwrap_or(DUMMY_SP)) | ||
| } | ||
| err_inval!(Layout(LayoutError::ReferencesError(guar))) => ErrorHandled::Reported( |
Member
There was a problem hiding this comment.
What if there is aSizeOverflow in a promoted?
This PR seems like a good step so I am okay with landing it, but it seems to me there's still a potential for ICEs here.
Contributor
Author
There was a problem hiding this comment.
I added a test for promoteds. On master we got a bogus "erroneous constant" note. Now it's gone.
Member
There was a problem hiding this comment.
I was specifically wondering about SizeOverflow as that's a different LayoutError variant that would bypass your new case here,
Contributor
Author
|
@bors r=RalfJung rollup |
Collaborator
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 23, 2024
…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#124297 (Allow coercing functions whose signature differs in opaque types in their defining scope into a shared function pointer type) - rust-lang#124516 (Allow monomorphization time const eval failures if the cause is a type layout issue) - rust-lang#124976 (rustc: Use `tcx.used_crates(())` more) - rust-lang#125210 (Cleanup: Fix up some diagnostics) - rust-lang#125409 (Rename `FrameworkOnlyWindows` to `RawDylibOnlyWindows`) - rust-lang#125416 (Use correct param-env in `MissingCopyImplementations`) - rust-lang#125421 (Rewrite `core-no-oom-handling`, `issue-24445` and `issue-38237` `run-make` tests to new `rmake.rs` format) - rust-lang#125438 (Remove unneeded string conversion) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 23, 2024
Rollup merge of rust-lang#124516 - oli-obk:taint_const_eval, r=RalfJung Allow monomorphization time const eval failures if the cause is a type layout issue r? `@RalfJung` fixes rust-lang#124348
Closed
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
r? @RalfJung
fixes #124348