Move valiation into InterpretationResult

Author: oli-obk

compiler/rustc_const_eval/src/const_eval/eval_queries.rs

@@ -293,19 +293,25 @@ pub fn eval_static_initializer_provider<'tcx>(
     eval_in_interpreter(&mut ecx, cid, true)
 }
 
-pub trait InterpretationResult<'tcx> {
+pub trait InterpretationResult<'tcx>: Sized {
     fn make_result<'mir>(
-        mplace: MPlaceTy<'tcx>,
+        mplace: &MPlaceTy<'tcx>,
         ecx: &mut InterpCx<'mir, 'tcx, CompileTimeInterpreter<'mir, 'tcx>>,
-    ) -> Self;
+        cid: GlobalId<'tcx>,
+    ) -> InterpResult<'tcx, Self>;
 }
 
 impl<'tcx> InterpretationResult<'tcx> for ConstAlloc<'tcx> {
     fn make_result<'mir>(
-        mplace: MPlaceTy<'tcx>,
-        _ecx: &mut InterpCx<'mir, 'tcx, CompileTimeInterpreter<'mir, 'tcx>>,
-    ) -> Self {
-        ConstAlloc { alloc_id: mplace.ptr().provenance.unwrap().alloc_id(), ty: mplace.layout.ty }
+        mplace: &MPlaceTy<'tcx>,
+        ecx: &mut InterpCx<'mir, 'tcx, CompileTimeInterpreter<'mir, 'tcx>>,
+        cid: GlobalId<'tcx>,
+    ) -> InterpResult<'tcx, Self> {
+        const_validate_mplace(ecx, mplace, cid)?;
+        Ok(ConstAlloc {
+            alloc_id: mplace.ptr().provenance.unwrap().alloc_id(),
+            ty: mplace.layout.ty,
+        })
     }
 }
 
@@ -393,15 +399,13 @@ fn eval_in_interpreter<'mir, 'tcx, R: InterpretationResult<'tcx>>(
         }
         Ok(mplace) => {
             // Since evaluation had no errors, validate the resulting constant.
-            let res = const_validate_mplace(&ecx, &mplace, cid);
+            let res = R::make_result(&mplace, ecx, cid);
 
             // Validation failed, report an error.
-            if let Err(error) = res {
+            res.map_err(|error| {
                 let alloc_id = mplace.ptr().provenance.unwrap().alloc_id();
-                Err(const_report_error(&ecx, error, alloc_id))
-            } else {
-                Ok(R::make_result(mplace, ecx))
-            }
+                const_report_error(&ecx, error, alloc_id)
+            })
         }
     }
 }

compiler/rustc_const_eval/src/interpret/util.rs

@@ -1,7 +1,7 @@
 use crate::const_eval::{CompileTimeEvalContext, CompileTimeInterpreter, InterpretationResult};
 use crate::interpret::{MemPlaceMeta, MemoryKind};
 use rustc_middle::mir;
-use rustc_middle::mir::interpret::{Allocation, InterpResult, Pointer};
+use rustc_middle::mir::interpret::{Allocation, GlobalId, InterpResult, Pointer};
 use rustc_middle::ty::layout::TyAndLayout;
 use rustc_middle::ty::{
     self, Ty, TyCtxt, TypeSuperVisitable, TypeVisitable, TypeVisitableExt, TypeVisitor,
@@ -83,12 +83,14 @@ where
 
 impl<'tcx> InterpretationResult<'tcx> for mir::interpret::ConstAllocation<'tcx> {
     fn make_result<'mir>(
-        mplace: MPlaceTy<'tcx>,
+        mplace: &MPlaceTy<'tcx>,
         ecx: &mut InterpCx<'mir, 'tcx, CompileTimeInterpreter<'mir, 'tcx>>,
-    ) -> Self {
+        cid: GlobalId<'tcx>,
+    ) -> InterpResult<'tcx, Self> {
+        crate::const_eval::const_validate_mplace(ecx, mplace, cid)?;
         let alloc_id = mplace.ptr().provenance.unwrap().alloc_id();
         let alloc = ecx.memory.alloc_map.swap_remove(&alloc_id).unwrap().1;
-        ecx.tcx.mk_const_alloc(alloc)
+        Ok(ecx.tcx.mk_const_alloc(alloc))
     }
 }