Fix transmute intrinsic mir validation ICE #109959
Merged
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
rustbot
added
S-waiting-on-review
scottmcm
approved these changes
Apr 5, 2023
JakobDegen
force-pushed
the
transmute-validate
branch
from
aa6aaac to
dd92a6a
Compare
|
I don't think we should just skip this check for opaques. We should probably instead normalize to reveal the opaque types, since we're always in a diff --git a/compiler/rustc_const_eval/src/transform/validate.rs b/compiler/rustc_const_eval/src/transform/validate.rs
index 0f56fda18f5..d4bed97380b 100644
--- a/compiler/rustc_const_eval/src/transform/validate.rs
+++ b/compiler/rustc_const_eval/src/transform/validate.rs
@@ -679,13 +679,21 @@ macro_rules! check_kinds {
// Unlike `mem::transmute`, a MIR `Transmute` is well-formed
// for any two `Sized` types, just potentially UB to run.
- if !op_ty.is_sized(self.tcx, self.param_env) {
+ if !self
+ .tcx
+ .normalize_erasing_regions(self.param_env, op_ty)
+ .is_sized(self.tcx, self.param_env)
+ {
self.fail(
location,
format!("Cannot transmute from non-`Sized` type {op_ty:?}"),
);
}
- if !target_type.is_sized(self.tcx, self.param_env) {
+ if !self
+ .tcx
+ .normalize_erasing_regions(self.param_env, *target_type)
+ .is_sized(self.tcx, self.param_env)
+ {
self.fail(
location,
format!("Cannot transmute to non-`Sized` type {target_type:?}"), |
|
For the more type system savvy, checking some "trivial" opaque self type obligation ... which means that we then try to equate the obligation ... which will fail because That's why normalizing here is the right thing to do -- we can only verify fully revealed predicates in fully revealed environments. |
JakobDegen
force-pushed
the
transmute-validate
branch
from
dd92a6a to
d8ed2fb
Compare
|
@bors r+ |
bors
added
S-waiting-on-bors
JohnTitor
added a commit
to JohnTitor/rust
that referenced
this pull request
Apr 11, 2023
…ompiler-errors Fix transmute intrinsic mir validation ICE I stumbled across this at work, the minimal reproducer is included as a test which ICEs before this change. I'm not 100% sure this is the right fix, but it matches what we do in `mir_assign_valid_types` so seems reasonable at least. fixes rust-lang#110151 r? `@lcnr` since they've been keeping the relevant logic correct, cc `@scottmcm`
|
⌛ Testing commit d8ed2fb with merge 8c9883e63fd369fd83fd5be467dc14f8476bc2cb... |
|
💔 Test failed - checks-actions |
bors
added
S-waiting-on-review
|
The job Click to see the possible cause of the failure (guessed by this bot) |
|
Segfault so... maybe spurious? |
|
@bors retry |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 12, 2023
…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#109959 (Fix transmute intrinsic mir validation ICE) - rust-lang#110176 (Renumbering cleanups) - rust-lang#110182 (Use `itertools::Either` instead of own impl) - rust-lang#110188 (Remove orphaned remove_dir_all implementation from rust-installer) - rust-lang#110190 (Custom MIR: Support `BinOp::Offset`) - rust-lang#110209 (Add regression test for rust-lang#59003) - rust-lang#110210 (`DescriptionCtx` cleanups) - rust-lang#110217 (doc: loongarch: Fix typos) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
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.
I stumbled across this at work, the minimal reproducer is included as a test which ICEs before this change.
I'm not 100% sure this is the right fix, but it matches what we do in
mir_assign_valid_typesso seems reasonable at least.fixes #110151
r? @lcnr since they've been keeping the relevant logic correct, cc @scottmcm