Skip to content

Miri read_discriminant: return a scalar instead of raw underlying bytes #72419

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

Merged
merged 7 commits into from
May 30, 2020
Merged

Miri read_discriminant: return a scalar instead of raw underlying bytes #72419

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0f18203
Miri: refactor read_discriminant and make it return Scalar
RalfJung Apr 14, 2020
5a3971c
comments and refactor variable names
RalfJung May 23, 2020
f8f8033
assert that types without discriminant use variant idx of 0
RalfJung May 23, 2020
d94923e
Format and more tracing
RalfJung May 23, 2020
64fbe2f
Add helper method for determining the type of a discriminant
RalfJung May 23, 2020
ad7179d
fix discriminant_ty for non-enums
RalfJung May 23, 2020
c4b6224
more type sanity checks in Miri
RalfJung May 29, 2020
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
Prev Previous commit
Next Next commit
assert that types without discriminant use variant idx of 0
  • Loading branch information
@RalfJung
RalfJung committed May 25, 2020
commit f8f80334872cf63412b0fe2e79b87505af2ba6a1
3 changes: 2 additions & 1 deletion src/librustc_mir/interpret/operand.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -596,7 +596,8 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
Scalar::from_uint(discr.val, discr_layout.size)
}
None => {
// On a type without actual discriminants, return variant idx as `u8`.
// On a type without actual discriminants, variant is 0. Return variant idx as `u8`.
assert_eq!(index.as_u32(), 0);
let discr_layout = self.layout_of(self.tcx.types.u8)?;
Scalar::from_uint(index.as_u32(), discr_layout.size)
}
Expand Down