Use less fragile error handling

compiler/rustc_const_eval/src/const_eval/eval_queries.rs

@@ -98,14 +98,16 @@ fn eval_body_using_ecx<'mir, 'tcx, R: InterpretationResult<'tcx>>(
     // Only report this after validation, as validaiton produces much better diagnostics.
     // FIXME: ensure validation always reports this and stop making interning care about it.
 
-    if let Err(InternResult { found_bad_mutable_pointer, found_dangling_pointer }) = intern_result {
+    match intern_result {
-        if found_dangling_pointer {
+        Ok(()) => {}
+        Err(InternResult::FoundDanglingPointer) => {
             return Err(ecx
                 .tcx
                 .dcx()
                 .emit_err(DanglingPtrInFinal { span: ecx.tcx.span, kind: intern_kind })
                 .into());
-        } else if found_bad_mutable_pointer {
+        }
+        Err(InternResult::FoundBadMutablePointer) => {
             // only report mutable pointers if there were no dangling pointers
             let err_diag = errors::MutablePtrInFinal { span: ecx.tcx.span, kind: intern_kind };
             ecx.tcx.emit_node_span_lint(

compiler/rustc_const_eval/src/interpret/intern.rs

@@ -132,17 +132,10 @@ pub enum InternKind {
     Promoted,
 }
 
-#[derive(Default, Debug)]
+#[derive(Debug)]
-pub struct InternResult {
+pub enum InternResult {
-    pub found_bad_mutable_pointer: bool,
+    FoundBadMutablePointer,
-    pub found_dangling_pointer: bool,
+    FoundDanglingPointer,
-}
-
-impl InternResult {
-    fn has_errors(&self) -> bool {
-        let Self { found_bad_mutable_pointer, found_dangling_pointer } = *self;
-        found_bad_mutable_pointer || found_dangling_pointer
-    }
 }
 
 /// Intern `ret` and everything it references.
@@ -212,7 +205,7 @@ pub fn intern_const_alloc_recursive<
     // Whether we encountered a bad mutable pointer.
     // We want to first report "dangling" and then "mutable", so we need to delay reporting these
     // errors.
-    let mut result = InternResult::default();
+    let mut result = Ok(());
 
     // Keep interning as long as there are things to intern.
     // We show errors if there are dangling pointers, or mutable pointers in immutable contexts
@@ -262,7 +255,10 @@ pub fn intern_const_alloc_recursive<
             // on the promotion analysis not screwing up to ensure that it is sound to intern
             // promoteds as immutable.
             trace!("found bad mutable pointer");
-            result.found_bad_mutable_pointer = true;
+            // Prefer dangling pointer errors over mutable pointer errors
+            if result.is_ok() {
+                result = Err(InternResult::FoundBadMutablePointer);
+            }
         }
         if ecx.tcx.try_get_global_alloc(alloc_id).is_some() {
             // Already interned.
@@ -284,11 +280,11 @@ pub fn intern_const_alloc_recursive<
             Ok(nested) => todo.extend(nested),
             Err(()) => {
                 ecx.tcx.dcx().delayed_bug("found dangling pointer during const interning");
-                result.found_dangling_pointer = true
+                result = Err(InternResult::FoundDanglingPointer);
             }
         }
     }
-    if result.has_errors() { Err(result) } else { Ok(()) }
+    result
 }
 
 /// Intern `ret`. This function assumes that `ret` references no other allocation.