Oops opaques

Author: compiler-errors

compiler/rustc_infer/src/infer/context.rs

@@ -260,6 +260,9 @@ impl<'tcx> rustc_type_ir::InferCtxtLike for InferCtxt<'tcx> {
     fn opaque_types_storage_num_entries(&self) -> OpaqueTypeStorageEntries {
         self.inner.borrow_mut().opaque_types().num_entries()
     }
+    fn opaque_types_storage_num_unique_entries_raw(&self) -> usize {
+        self.inner.borrow_mut().opaque_types().num_entries().opaque_types
+    }
     fn clone_opaque_types_lookup_table(&self) -> Vec<(ty::OpaqueTypeKey<'tcx>, Ty<'tcx>)> {
         self.inner.borrow_mut().opaque_types().iter_lookup_table().map(|(k, h)| (k, h.ty)).collect()
     }

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

@@ -20,7 +20,7 @@ pub struct OpaqueTypeStorage<'tcx> {
 /// the opaque types currently in the storage.
 #[derive(Default, Debug, Clone, Copy, PartialEq, Eq)]
 pub struct OpaqueTypeStorageEntries {
-    opaque_types: usize,
+    pub opaque_types: usize,
     duplicate_entries: usize,
 }
 

compiler/rustc_next_trait_solver/src/solve/eval_ctxt/canonical.rs

@@ -59,7 +59,16 @@ where
         cache_key: Option<CanonicalGoalCacheKey<I>>,
     ) -> (Vec<I::GenericArg>, CanonicalInput<I, I::Predicate>) {
         if let Some(cache_key) = cache_key {
-            if !cache_key.orig_values.iter().any(|value| self.delegate.is_changed_arg(value)) {
+            if !cache_key.orig_values.iter().any(|value| self.delegate.is_changed_arg(value))
+                && self.delegate.opaque_types_storage_num_unique_entries_raw()
+                    == cache_key
+                        .canonical_goal
+                        .canonical
+                        .value
+                        .predefined_opaques_in_body
+                        .opaque_types
+                        .len()
+            {
                 return (cache_key.orig_values.to_vec(), cache_key.canonical_goal);
             }
         }

compiler/rustc_type_ir/src/infer_ctxt.rs

@@ -252,6 +252,7 @@ pub trait InferCtxtLike: Sized {
 
     type OpaqueTypeStorageEntries: Debug + Copy + Default;
     fn opaque_types_storage_num_entries(&self) -> Self::OpaqueTypeStorageEntries;
+    fn opaque_types_storage_num_unique_entries_raw(&self) -> usize;
     fn clone_opaque_types_lookup_table(
         &self,
     ) -> Vec<(ty::OpaqueTypeKey<Self::Interner>, <Self::Interner as Interner>::Ty)>;