Move error handling into const_validate_mplace

Author: oli-obk

compiler/rustc_const_eval/src/const_eval/eval_queries.rs

@@ -298,15 +298,15 @@ pub trait InterpretationResult<'tcx>: Sized {
         mplace: &MPlaceTy<'tcx>,
         ecx: &mut InterpCx<'mir, 'tcx, CompileTimeInterpreter<'mir, 'tcx>>,
         cid: GlobalId<'tcx>,
-    ) -> InterpResult<'tcx, Self>;
+    ) -> Result<Self, ErrorHandled>;
 }
 
 impl<'tcx> InterpretationResult<'tcx> for ConstAlloc<'tcx> {
     fn make_result<'mir>(
         mplace: &MPlaceTy<'tcx>,
         ecx: &mut InterpCx<'mir, 'tcx, CompileTimeInterpreter<'mir, 'tcx>>,
         cid: GlobalId<'tcx>,
-    ) -> InterpResult<'tcx, Self> {
+    ) -> Result<Self, ErrorHandled> {
         const_validate_mplace(ecx, mplace, cid)?;
         Ok(ConstAlloc {
             alloc_id: mplace.ptr().provenance.unwrap().alloc_id(),
@@ -399,13 +399,7 @@ fn eval_in_interpreter<'mir, 'tcx, R: InterpretationResult<'tcx>>(
         }
         Ok(mplace) => {
             // Since evaluation had no errors, validate the resulting constant.
-            let res = R::make_result(&mplace, ecx, cid);
-
-            // Validation failed, report an error.
-            res.map_err(|error| {
-                let alloc_id = mplace.ptr().provenance.unwrap().alloc_id();
-                const_report_error(&ecx, error, alloc_id)
-            })
+            R::make_result(&mplace, ecx, cid)
         }
     }
 }
@@ -415,7 +409,8 @@ pub fn const_validate_mplace<'mir, 'tcx>(
     ecx: &InterpCx<'mir, 'tcx, CompileTimeInterpreter<'mir, 'tcx>>,
     mplace: &MPlaceTy<'tcx>,
     cid: GlobalId<'tcx>,
-) -> InterpResult<'tcx> {
+) -> Result<(), ErrorHandled> {
+    let alloc_id = mplace.ptr().provenance.unwrap().alloc_id();
     let mut ref_tracking = RefTracking::new(mplace.clone());
     let mut inner = false;
     while let Some((mplace, path)) = ref_tracking.todo.pop() {
@@ -429,7 +424,8 @@ pub fn const_validate_mplace<'mir, 'tcx>(
                 CtfeValidationMode::Const { allow_immutable_unsafe_cell }
             }
         };
-        ecx.const_validate_operand(&mplace.into(), path, &mut ref_tracking, mode)?;
+        ecx.const_validate_operand(&mplace.into(), path, &mut ref_tracking, mode)
+            .map_err(|error| const_report_error(&ecx, error, alloc_id))?;
         inner = true;
     }
 

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, GlobalId, InterpResult, Pointer};
+use rustc_middle::mir::interpret::{Allocation, ErrorHandled, GlobalId, InterpResult, Pointer};
 use rustc_middle::ty::layout::TyAndLayout;
 use rustc_middle::ty::{
     self, Ty, TyCtxt, TypeSuperVisitable, TypeVisitable, TypeVisitableExt, TypeVisitor,
@@ -86,7 +86,7 @@ impl<'tcx> InterpretationResult<'tcx> for mir::interpret::ConstAllocation<'tcx>
         mplace: &MPlaceTy<'tcx>,
         ecx: &mut InterpCx<'mir, 'tcx, CompileTimeInterpreter<'mir, 'tcx>>,
         cid: GlobalId<'tcx>,
-    ) -> InterpResult<'tcx, Self> {
+    ) -> Result<Self, ErrorHandled> {
         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;