Resolve variant field access

diff --git a/src/librustc_mir/const_eval/pattern.rs b/src/librustc_mir/const_eval/pattern.rs
index a1109dbfdd1e09bb9d87d2a1c69769efa3ece612..48822c506aef27e1a405194b534c3d786b44fb9c 100644 (file)
--- a/src/librustc_mir/const_eval/pattern.rs
+++ b/src/librustc_mir/const_eval/pattern.rs
@@ -803,7 +803,7 @@ fn const_to_pat(
                                 let field = Field::new(i);
                                 let val = match cv.val {
                                     ConstVal::Value(miri) => const_val_field(
-                                        self.tcx, self.param_env, instance, field, miri, cv.ty,
+                                        self.tcx, self.param_env, instance, Some(variant_index), field, miri, cv.ty,
                                     ).unwrap(),
                                     _ => bug!("{:#?} is not a valid tuple", cv),
                                 };
@@ -846,7 +846,7 @@ fn const_to_pat(
                                 consts.iter().find(|&&(name, _)| name == f.name).unwrap().1
                             },
                             ConstVal::Value(miri) => const_val_field(
-                                self.tcx, self.param_env, instance, field, miri, cv.ty,
+                                self.tcx, self.param_env, instance, None, field, miri, cv.ty,
                             ).unwrap(),
                             _ => bug!("{:#?} is not a valid tuple", cv),
                         };
@@ -864,7 +864,7 @@ fn const_to_pat(
                         let val = match cv.val {
                             ConstVal::Aggregate(ConstAggregate::Tuple(consts)) => consts[i],
                             ConstVal::Value(miri) => const_val_field(
-                                self.tcx, self.param_env, instance, field, miri, cv.ty,
+                                self.tcx, self.param_env, instance, None, field, miri, cv.ty,
                             ).unwrap(),
                             _ => bug!("{:#?} is not a valid tuple", cv),
                         };
@@ -884,7 +884,7 @@ fn const_to_pat(
                             ConstVal::Aggregate(ConstAggregate::Array(consts)) => consts[i],
                             ConstVal::Aggregate(ConstAggregate::Repeat(cv, _)) => cv,
                             ConstVal::Value(miri) => const_val_field(
-                                self.tcx, self.param_env, instance, field, miri, cv.ty,
+                                self.tcx, self.param_env, instance, None, field, miri, cv.ty,
                             ).unwrap(),
                             _ => bug!("{:#?} is not a valid tuple", cv),
                         };

diff --git a/src/librustc_mir/interpret/const_eval.rs b/src/librustc_mir/interpret/const_eval.rs
index f5408c73818596628325817ff663e1899499f663..3a9149b44bba7146632439e055c2cc467c13ec9f 100644 (file)
--- a/src/librustc_mir/interpret/const_eval.rs
+++ b/src/librustc_mir/interpret/const_eval.rs
@@ -13,7 +13,7 @@
 use syntax::codemap::Span;
 
 use rustc::mir::interpret::{EvalResult, EvalError, EvalErrorKind, GlobalId, Value, MemoryPointer, Pointer, PrimVal};
-use super::{Place, EvalContext, StackPopCleanup, ValTy, HasMemory};
+use super::{Place, EvalContext, StackPopCleanup, ValTy, HasMemory, PlaceExtra};
 
 use rustc_const_math::ConstInt;
 
@@ -308,11 +308,12 @@ pub fn const_val_field<'a, 'tcx>(
     tcx: TyCtxt<'a, 'tcx, 'tcx>,
     param_env: ty::ParamEnv<'tcx>,
     instance: ty::Instance<'tcx>,
+    variant: Option<usize>,
     field: mir::Field,
     val: Value,
     ty: Ty<'tcx>,
 ) -> ::rustc::middle::const_val::EvalResult<'tcx> {
-    match const_val_field_inner(tcx, param_env, instance, field, val, ty) {
+    match const_val_field_inner(tcx, param_env, instance, variant, field, val, ty) {
         Ok((field, ty)) => Ok(tcx.mk_const(ty::Const {
             val: ConstVal::Value(field),
             ty,
@@ -328,6 +329,7 @@ fn const_val_field_inner<'a, 'tcx>(
     tcx: TyCtxt<'a, 'tcx, 'tcx>,
     param_env: ty::ParamEnv<'tcx>,
     instance: ty::Instance<'tcx>,
+    variant: Option<usize>,
     field: mir::Field,
     value: Value,
     ty: Ty<'tcx>,
@@ -337,7 +339,11 @@ fn const_val_field_inner<'a, 'tcx>(
     let (mut field, ty) = match value {
         Value::ByValPair(..) | Value::ByVal(_) => ecx.read_field(value, field, ty)?.expect("const_val_field on non-field"),
         Value::ByRef(ptr, align) => {
-            let place = Place::from_primval_ptr(ptr, align);
+            let place = Place::Ptr {
+                ptr,
+                align,
+                extra: variant.map_or(PlaceExtra::None, PlaceExtra::DowncastVariant),
+            };
             let layout = ecx.layout_of(ty)?;
             let (place, layout) = ecx.place_field(place, field, layout)?;
             let (ptr, align) = place.to_ptr_align();