move drop bomb from OpaqueTypeStorage into InferCtxt's Drop

Author: jdonszelmann

compiler/rustc_infer/src/infer/mod.rs

@@ -321,9 +321,11 @@ pub struct InferCtxt<'tcx> {
 
 impl<'tcx> Drop for InferCtxt<'tcx> {
     fn drop(&mut self) {
-        // Defuse the drop bomb in the OpaqueTypeStorage when we're in TypingMode::Borrowck,
-        // and the InferCtxt doesn't consider regions. This is okay since in `Borrowck`,
-        // the only reason we care about opaques is in relation to regions.
+        let mut inner = self.inner.borrow_mut();
+        let opaque_type_storage = &mut inner.opaque_type_storage;
+
+        // No need for the drop bomb when we're in TypingMode::Borrowck, and the InferCtxt doesn't consider regions.
+        // This is okay since in `Borrowck`, the only reason we care about opaques is in relation to regions.
         // In some places *after* typeck, like in lints we use `TypingMode::Borrowck`
         // to prevent defining opaque types and we simply don't care about regions.
         match self.typing_mode() {
@@ -333,10 +335,14 @@ impl<'tcx> Drop for InferCtxt<'tcx> {
             | TypingMode::PostAnalysis => {}
             TypingMode::Borrowck { .. } => {
                 if !self.considering_regions {
-                    let _ = self.inner.borrow_mut().opaque_type_storage.take_opaque_types();
+                    return;
                 }
             }
         }
+
+        if !opaque_type_storage.is_empty() {
+            ty::tls::with(|tcx| tcx.dcx().delayed_bug(format!("{opaque_type_storage:?}")));
+        }
     }
 }
 

compiler/rustc_infer/src/infer/opaque_types/table.rs

@@ -3,7 +3,7 @@ use std::ops::Deref;
 use rustc_data_structures::fx::FxIndexMap;
 use rustc_data_structures::undo_log::UndoLogs;
 use rustc_middle::bug;
-use rustc_middle::ty::{self, OpaqueTypeKey, ProvisionalHiddenType, Ty};
+use rustc_middle::ty::{OpaqueTypeKey, ProvisionalHiddenType, Ty};
 use tracing::instrument;
 
 use crate::infer::snapshot::undo_log::{InferCtxtUndoLogs, UndoLog};
@@ -121,14 +121,6 @@ impl<'tcx> OpaqueTypeStorage<'tcx> {
     }
 }
 
-impl<'tcx> Drop for OpaqueTypeStorage<'tcx> {
-    fn drop(&mut self) {
-        if !self.is_empty() {
-            ty::tls::with(|tcx| tcx.dcx().delayed_bug(format!("{:?}", self.opaque_types)));
-        }
-    }
-}
-
 pub struct OpaqueTypeTable<'a, 'tcx> {
     storage: &'a mut OpaqueTypeStorage<'tcx>,