Rename some things around validation error reporting to signal that it is in fact about validation failures

oli-obk · oli-obk · commit a3fa7059dd5e · 2024-03-13T09:29:49.000Z
diff --git a/compiler/rustc_const_eval/src/const_eval/eval_queries.rs b/compiler/rustc_const_eval/src/const_eval/eval_queries.rs
@@ -382,7 +382,7 @@ fn eval_in_interpreter<'tcx, R: InterpretationResult<'tcx>>(
 }
 
 #[inline(always)]
-pub fn const_validate_mplace<'mir, 'tcx>(
+fn const_validate_mplace<'mir, 'tcx>(
     ecx: &InterpCx<'mir, 'tcx, CompileTimeInterpreter<'mir, 'tcx>>,
     mplace: &MPlaceTy<'tcx>,
     cid: GlobalId<'tcx>,
@@ -402,15 +402,17 @@ pub fn const_validate_mplace<'mir, 'tcx>(
             }
         };
         ecx.const_validate_operand(&mplace.into(), path, &mut ref_tracking, mode)
-            .map_err(|error| const_report_error(&ecx, error, alloc_id))?;
+            // Instead of just reporting the `InterpError` via the usual machinery, we give a more targetted
+            // error about the validation failure.
+            .map_err(|error| report_validation_error(&ecx, error, alloc_id))?;
         inner = true;
     }
 
     Ok(())
 }
 
 #[inline(always)]
-pub fn const_report_error<'mir, 'tcx>(
+fn report_validation_error<'mir, 'tcx>(
     ecx: &InterpCx<'mir, 'tcx, CompileTimeInterpreter<'mir, 'tcx>>,
     error: InterpErrorInfo<'tcx>,
     alloc_id: AllocId,
@@ -429,6 +431,6 @@ pub fn const_report_error<'mir, 'tcx>(
         error,
         None,
         || crate::const_eval::get_span_and_frames(ecx.tcx, ecx.stack()),
-        move |span, frames| errors::UndefinedBehavior { span, ub_note, frames, raw_bytes },
+        move |span, frames| errors::ValidationFailure { span, ub_note, frames, raw_bytes },
     )
 }
diff --git a/compiler/rustc_const_eval/src/errors.rs b/compiler/rustc_const_eval/src/errors.rs
@@ -410,7 +410,7 @@ pub struct NullaryIntrinsicError {
 
 #[derive(Diagnostic)]
 #[diag(const_eval_undefined_behavior, code = E0080)]
-pub struct UndefinedBehavior {
+pub struct ValidationFailure {
     #[primary_span]
     pub span: Span,
     #[note(const_eval_undefined_behavior_note)]

Original file line number	Diff line number	Diff line change
`@@ -382,7 +382,7 @@ fn eval_in_interpreter<'tcx, R: InterpretationResult<'tcx>>(`
`382`	`382`	`}`
`383`	`383`
`384`	`384`	`#[inline(always)]`
`385`		`-pub fn const_validate_mplace<'mir, 'tcx>(`
	`385`	`+fn const_validate_mplace<'mir, 'tcx>(`
`386`	`386`	`ecx: &InterpCx<'mir, 'tcx, CompileTimeInterpreter<'mir, 'tcx>>,`
`387`	`387`	`mplace: &MPlaceTy<'tcx>,`
`388`	`388`	`cid: GlobalId<'tcx>,`
`@@ -402,15 +402,17 @@ pub fn const_validate_mplace<'mir, 'tcx>(`
`402`	`402`	`}`
`403`	`403`	`};`
`404`	`404`	`ecx.const_validate_operand(&mplace.into(), path, &mut ref_tracking, mode)`
`405`		`- .map_err(\|error\| const_report_error(&ecx, error, alloc_id))?;`
	`405`	+ // Instead of just reporting the `InterpError` via the usual machinery, we give a more targetted
	`406`	`+ // error about the validation failure.`
	`407`	`+ .map_err(\|error\| report_validation_error(&ecx, error, alloc_id))?;`
`406`	`408`	`inner = true;`
`407`	`409`	`}`
`408`	`410`
`409`	`411`	`Ok(())`
`410`	`412`	`}`
`411`	`413`
`412`	`414`	`#[inline(always)]`
`413`		`-pub fn const_report_error<'mir, 'tcx>(`
	`415`	`+fn report_validation_error<'mir, 'tcx>(`
`414`	`416`	`ecx: &InterpCx<'mir, 'tcx, CompileTimeInterpreter<'mir, 'tcx>>,`
`415`	`417`	`error: InterpErrorInfo<'tcx>,`
`416`	`418`	`alloc_id: AllocId,`
`@@ -429,6 +431,6 @@ pub fn const_report_error<'mir, 'tcx>(`
`429`	`431`	`error,`
`430`	`432`	`None,`
`431`	`433`	`\|\| crate::const_eval::get_span_and_frames(ecx.tcx, ecx.stack()),`
`432`		`- move \|span, frames\| errors::UndefinedBehavior { span, ub_note, frames, raw_bytes },`
	`434`	`+ move \|span, frames\| errors::ValidationFailure { span, ub_note, frames, raw_bytes },`
`433`	`435`	`)`
`434`	`436`	`}`