Shared: Revert some changes

Author: paldepind

shared/typeinference/codeql/typeinference/internal/TypeInference.qll

@@ -515,11 +515,12 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
          * Holds if inferring types at `a` might depend on the type at `apos`
          * having `baseMention` as a transitive base type mention.
          */
-        private predicate relevantAccess(Access a, AccessPosition apos, TypeMention baseMention) {
+        private predicate relevantAccess(Access a, AccessPosition apos, Type base) {
           exists(Declaration target, DeclarationPosition dpos |
-            a.getTarget() = target and
+            adjustedAccessType(a, apos, target, _, _) and
+            target.getDeclaredType(_, _) instanceof TypeParameter and
             accessDeclarationPositionMatch(apos, dpos) and
-            declarationBaseType(target, dpos, baseMention, _, _)
+            declarationBaseType(target, dpos, base, _, _)
           )
         }
 
@@ -572,7 +573,7 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
         predicate hasBaseTypeMention(
           Access a, AccessPosition apos, TypeMention baseMention, TypePath path, Type t
         ) {
-          relevantAccess(a, apos, baseMention) and
+          relevantAccess(a, apos, resolveTypeMentionRoot(baseMention)) and
           exists(Type sub | sub = inferRootType(a, apos) |
             not t = sub.getATypeParameter() and
             baseTypeMentionHasTypeAt(sub, baseMention, path, t)
@@ -587,18 +588,30 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
         }
       }
 
+      /**
+       * Holds if the type of `a` at `apos` has the base type `base`, and when
+       * viewed as an element of that type has the type `t` at `path`.
+       */
+      pragma[nomagic]
+      private predicate accessBaseType(
+        Access a, AccessPosition apos, Type base, TypePath path, Type t
+      ) {
+        exists(TypeMention tm |
+          AccessBaseType::hasBaseTypeMention(a, apos, tm, path, t) and
+          base = resolveTypeMentionRoot(tm)
+        )
+      }
+
       /**
        * Holds if the declared type at `decl` for `dpos` at the `path` is `tp`
        * and `path` starts with a type parameter of `base`.
        */
       pragma[nomagic]
       private predicate declarationBaseType(
-        Declaration decl, DeclarationPosition dpos, TypeMention base, TypePath path,
-        TypeParameter tp
+        Declaration decl, DeclarationPosition dpos, Type base, TypePath path, TypeParameter tp
       ) {
-        base = getABaseTypeMention(_) and
         tp = decl.getDeclaredType(dpos, path) and
-        path.isCons(resolveTypeMentionRoot(base).getATypeParameter(), _)
+        path.isCons(base.getATypeParameter(), _)
       }
 
       /**
@@ -639,10 +652,8 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
       ) {
         not exists(getTypeArgument(a, target, tp, _)) and
         target = a.getTarget() and
-        exists(
-          AccessPosition apos, DeclarationPosition dpos, TypeMention base, TypePath pathToTypeParam
-        |
-          AccessBaseType::hasBaseTypeMention(a, apos, base, pathToTypeParam.append(path), t) and
+        exists(AccessPosition apos, DeclarationPosition dpos, Type base, TypePath pathToTypeParam |
+          accessBaseType(a, apos, base, pathToTypeParam.append(path), t) and
           declarationBaseType(target, dpos, base, pathToTypeParam, tp) and
           accessDeclarationPositionMatch(apos, dpos)
         )