-
Notifications
You must be signed in to change notification settings - Fork 13.4k
Do not const prop unions #121628
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.
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
Merged
Merged
Do not const prop unions #121628
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -585,20 +585,32 @@ impl<'mir, 'tcx> ConstPropagator<'mir, 'tcx> { | |
val.into() | ||
} | ||
|
||
Aggregate(ref kind, ref fields) => Value::Aggregate { | ||
fields: fields | ||
.iter() | ||
.map(|field| self.eval_operand(field).map_or(Value::Uninit, Value::Immediate)) | ||
.collect(), | ||
variant: match **kind { | ||
AggregateKind::Adt(_, variant, _, _, _) => variant, | ||
AggregateKind::Array(_) | ||
| AggregateKind::Tuple | ||
| AggregateKind::Closure(_, _) | ||
| AggregateKind::Coroutine(_, _) | ||
| AggregateKind::CoroutineClosure(_, _) => VariantIdx::new(0), | ||
}, | ||
}, | ||
Aggregate(ref kind, ref fields) => { | ||
// Do not const pop union fields as they can be | ||
// made to produce values that don't match their | ||
// underlying layout's type (see ICE #121534). | ||
// If the last element of the `Adt` tuple | ||
// is `Some` it indicates the ADT is a union | ||
if let AggregateKind::Adt(_, _, _, _, Some(_)) = **kind { | ||
return None; | ||
}; | ||
Value::Aggregate { | ||
fields: fields | ||
.iter() | ||
.map(|field| { | ||
self.eval_operand(field).map_or(Value::Uninit, Value::Immediate) | ||
}) | ||
.collect(), | ||
variant: match **kind { | ||
AggregateKind::Adt(_, variant, _, _, _) => variant, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. could add the bail out logic here There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. That was my first approach, but it looked ugly especially with that longish comment |
||
AggregateKind::Array(_) | ||
| AggregateKind::Tuple | ||
| AggregateKind::Closure(_, _) | ||
| AggregateKind::Coroutine(_, _) | ||
| AggregateKind::CoroutineClosure(_, _) => VariantIdx::new(0), | ||
}, | ||
} | ||
} | ||
|
||
Repeat(ref op, n) => { | ||
trace!(?op, ?n); | ||
|
21 changes: 21 additions & 0 deletions
21
tests/ui/lint/ice-unions-known-panics-lint-issue-121534.rs
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
// Regression test for #121534 | ||
// Tests that no ICE occurs in KnownPanicsLint when it | ||
// evaluates an operation whose operands have different | ||
// layout types even though they have the same type. | ||
// This situation can be contrived through the use of | ||
// unions as in this test | ||
|
||
//@ build-pass | ||
union Union { | ||
u32_field: u32, | ||
i32_field: i32, | ||
} | ||
|
||
pub fn main() { | ||
let u32_variant = Union { u32_field: 2 }; | ||
let i32_variant = Union { i32_field: 3 }; | ||
let a = unsafe { u32_variant.u32_field }; | ||
let b = unsafe { i32_variant.u32_field }; | ||
|
||
let _diff = a - b; | ||
} |
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.
Uh oh!
There was an error while loading. Please reload this page.