fix: propagate owner_fn_id of type parameters

Author: coeff-aij

src/analyze.rs

@@ -435,7 +435,7 @@ impl<'tcx> Analyzer<'tcx> {
             owner_fn_id,
         )
         .with_generic_args(generic_args)
-        .with_def_id_cache(self.def_ids());
+        .with_def_id_cache(self.def_ids(), owner_fn_id);
         let formula_fn = translator.to_formula_fn();
         deferred_formula_fn_cache
             .borrow_mut()

src/analyze/annot_fn.rs

@@ -191,12 +191,12 @@ impl<'tcx> AnnotFnTranslator<'tcx> {
         self
     }
 
-    pub fn with_def_id_cache(mut self, def_ids: DefIdCache<'tcx>) -> Self {
+    pub fn with_def_id_cache(mut self, def_ids: DefIdCache<'tcx>, owner_fn_id: DefId) -> Self {
         self.def_ids = def_ids;
         self.type_builder = TypeBuilder::new(
             self.tcx,
             self.def_ids.clone(),
-            self.local_def_id.to_def_id(),
+            owner_fn_id,
             self.type_params.clone(),
             self.system.clone(),
         );
@@ -253,7 +253,7 @@ impl<'tcx> AnnotFnTranslator<'tcx> {
             .instantiate_generics(ty, self.generic_args)
             .unwrap_or(ty);
         let typing_env = mir_ty::TypingEnv::fully_monomorphized();
-        self.tcx.normalize_erasing_regions(typing_env, instantiated)
+        self.tcx.try_normalize_erasing_regions(typing_env, instantiated).unwrap_or(instantiated)
     }
 
     fn pat_ty(&self, pat: &'tcx rustc_hir::Pat<'tcx>) -> mir_ty::Ty<'tcx> {
@@ -572,6 +572,7 @@ impl<'tcx> AnnotFnTranslator<'tcx> {
                                         self.type_builder.build(ty).to_sort()
                                     })
                                     .collect();
+                                tracing::debug!("register ForallPred {:?} with signature {:?}", pred, sig);
                                 self.system
                                     .borrow_mut()
                                     .register_forall_pred(pred.clone(), sig);