Update to rustc sanity check branch

Author: oli-obk

src/intrinsic.rs

@@ -245,10 +245,11 @@ impl<'a, 'mir, 'tcx> EvalContextExt<'tcx> for EvalContext<'a, 'mir, 'tcx, super:
 
             "discriminant_value" => {
                 let ty = substs.type_at(0);
+                let layout = self.layout_of(ty)?;
                 let adt_ptr = self.into_ptr(args[0].value)?;
                 let adt_align = self.layout_of(args[0].ty)?.align;
                 let place = Place::from_scalar_ptr(adt_ptr, adt_align);
-                let discr_val = self.read_discriminant_value(place, ty)?;
+                let discr_val = self.read_discriminant_value(place, layout)?;
                 self.write_scalar(dest, Scalar::from_u128(discr_val), dest_layout.ty)?;
             }
 

src/validation.rs

@@ -768,7 +768,8 @@ impl<'a, 'mir, 'tcx: 'mir + 'a> EvalContextExt<'tcx> for EvalContext<'a, 'mir, '
 
                     match adt.adt_kind() {
                         AdtKind::Enum => {
-                            let variant_idx = self.read_discriminant_as_variant_index(query.place.1, query.ty)?;
+                            let layout = self.layout_of(query.ty)?;
+                            let variant_idx = self.read_discriminant_as_variant_index(query.place.1, layout)?;
                             let variant = &adt.variants[variant_idx];
 
                             if variant.fields.len() > 0 {