user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Format and more tracing

Browse source
This commit is contained in:
Ralf Jung 2020-05-23 14:51:50 +02:00
parent f8f8033487
commit d94923ea46
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/librustc_mir/interpret/operand.rs
View file

@ -642,6 +642,7 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
}
_ => bug!("multiple variants for non-adt non-generator"),
};
trace!("discriminant type: {:?}", discr_ty);
// Figure out which discriminant and variant this corresponds to.
Ok(match *tag_kind {
@ -651,8 +652,7 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
.map_err(|_| err_ub!(InvalidDiscriminant(tag_val.erase_tag())))?;
// Cast bits from tag layout to discriminant layout.
let discr_layout = self.layout_of(discr_ty)?;
let discr_val_cast =
self.cast_from_scalar(tag_bits, tag_layout, discr_ty);
let discr_val_cast = self.cast_from_scalar(tag_bits, tag_layout, discr_ty);
let discr_bits = discr_val_cast.assert_bits(discr_layout.size);
// Convert discriminant to variant index, and catch invalid discriminants.
let index = match rval.layout.ty.kind {