fix: identify type parameters using the DefId of the owner(e.g. fn f<T> for T in the body)

Author: coeff-aij

src/analyze.rs

@@ -441,8 +441,9 @@ impl<'tcx> Analyzer<'tcx> {
         &mut self,
         def_id: DefId,
         generic_args: mir_ty::GenericArgsRef<'tcx>,
+        caller_def_id: DefId,
     ) -> Option<rty::RefinedType> {
-        let type_builder = self.type_builder(self.def_ids(), def_id);
+        let type_builder = self.type_builder(self.def_ids(), caller_def_id);
 
         let deferred_ty = match self.defs.get(&def_id)? {
             DefTy::Concrete(rty) => {

src/analyze/basic_block.rs

@@ -636,7 +636,8 @@ impl<'tcx, 'ctx> Analyzer<'tcx, 'ctx> {
         def_id: DefId,
         args: mir_ty::GenericArgsRef<'tcx>,
     ) -> rty::Type<rty::Closed> {
-        if let Some(def_ty) = self.ctx.def_ty_with_args(def_id, args) {
+        let caller_def_id = self.type_builder.owner_fn_id;
+        if let Some(def_ty) = self.ctx.def_ty_with_args(def_id, args, caller_def_id) {
             return def_ty.ty;
         }
 
@@ -648,7 +649,7 @@ impl<'tcx, 'ctx> Analyzer<'tcx, 'ctx> {
             );
         }
         tracing::info!(?def_id, ?resolved_def_id, ?resolved_args, "resolved");
-        let Some(def_ty) = self.ctx.def_ty_with_args(resolved_def_id, resolved_args) else {
+        let Some(def_ty) = self.ctx.def_ty_with_args(resolved_def_id, resolved_args, caller_def_id) else {
             panic!(
                 "unknown def (resolved): {:?}, args: {:?}",
                 resolved_def_id, resolved_args

src/analyze/local_def.rs

@@ -318,7 +318,7 @@ impl<'tcx, 'ctx> Analyzer<'tcx, 'ctx> {
             .associated_item(self.local_def_id.to_def_id())
             .trait_item_def_id
             .unwrap();
-        self.ctx.def_ty_with_args(trait_item_did, trait_ref.args)
+        self.ctx.def_ty_with_args(trait_item_did, trait_ref.args, trait_ref.def_id)
     }
 
     // Note that we do not expect predicate variables to be generated here

src/refine/template.rs

@@ -73,7 +73,7 @@ where
 pub struct TypeBuilder<'tcx> {
     tcx: mir_ty::TyCtxt<'tcx>,
     def_ids: DefIdCache<'tcx>,
-    owner_fn_id: DefId,
+    pub owner_fn_id: DefId,
     typing_env: mir_ty::TypingEnv<'tcx>,
     type_params: Rc<RefCell<TypeParamMap>>,
     system: Rc<RefCell<chc::System>>,