wip4

Author: hvitved

rust/ql/lib/codeql/rust/internal/typeinference/TypeInference.qll

@@ -1130,43 +1130,8 @@ private class FunctionDeclaration extends Function {
     this = i.asSome().getAnAssocItem()
   }
 
-  private TypeParam getTypeParam(ImplOrTraitItemNodeOption i, int j) {
-    i = parent and
-    (
-      result = this.getGenericParamList().getTypeParam(j)
-      or
-      result = i.asSome().getTypeParam(_) and
-      j = -1
-    )
-  }
-
-  private TypeParameter getTypeParameter(ImplOrTraitItemNodeOption i, int pos) {
-    (
-      result = TTypeParamTypeParameter(this.getTypeParam(i, pos))
-      or
-      // For every `TypeParam` of this function, any associated types accessed on
-      // the type parameter are also type parameters.
-      result.(TypeParamAssociatedTypeTypeParameter).getTypeParam() = this.getTypeParam(i, _) and
-      pos = -1
-      or
-      i = parent and
-      pos = -1 and
-      (
-        result = TSelfTypeParameter(i.asSome())
-        or
-        result.(AssociatedTypeTypeParameter).getTrait() = i.asSome()
-        or
-        this = result.(ImplTraitTypeTypeParameter).getFunction()
-      )
-    )
-  }
-
   TypeParameter getTypeParameter(int pos) {
-    exists(ImplOrTraitItemNodeOption i | result = this.getTypeParameter(i, pos) |
-      i.isNone()
-      or
-      i.asSome().getAnAssocItem() = this
-    )
+    result = TTypeParamTypeParameter(this.getGenericParamList().getTypeParam(pos))
   }
 }
 

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

@@ -1441,9 +1441,12 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
           Access a, AccessEnvironment e, Declaration target, TypePath path, Type t, TypeParameter tp
         ) {
           exists(AccessPosition apos, TypePath pathToTp |
-            argRootTypeSatisfiesTargetTypeCand(_, a, e, target, apos, tp, pathToTp) and
-            SatisfiesParameterConstraint::satisfiesConstraint(MkRelevantAccess(a, apos, e),
-              MkRelevantTarget(target, apos), pathToTp.appendInverse(path), t)
+            argRootTypeSatisfiesTargetTypeCand(_, a, e, target, pragma[only_bind_into](apos), tp,
+              pathToTp) and
+            SatisfiesParameterConstraint::satisfiesConstraint(MkRelevantAccess(a,
+                pragma[only_bind_into](apos), e),
+              MkRelevantTarget(target, pragma[only_bind_into](apos)), pathToTp.appendInverse(path),
+              t)
           )
         }
       }
@@ -1559,8 +1562,12 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
       private predicate typeParameterHasConstraint(
         Declaration target, TypeParameter constrainedTp, TypeMention constraint
       ) {
-        constrainedTp = target.getTypeParameter(_) and
-        constraint = getATypeParameterConstraint(constrainedTp, target)
+        constraint = getATypeParameterConstraint(constrainedTp, target) and
+        (
+          constrainedTp = target.getDeclaredType(_, _)
+          or
+          constrainedTp = target.getTypeParameter(_)
+        )
       }
 
       /**
@@ -1587,7 +1594,6 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
         TypeParameter tp
       ) {
         typeParameterHasConstraint(target, constrainedTp, constraint) and
-        tp = target.getTypeParameter(_) and
         tp = constraint.getTypeAt(pathToTp) and
         constrainedTp != tp
       }
@@ -2085,9 +2091,9 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
         /**
          * Gets the type parameter at position `pos` of this element, if any.
          *
-         * TODO:
-         * This should include type parameters declared on the element itself,
-         * as well as type parameters declared on the enclosing declaration(s).
+         * This should only include type parameters declared directly on the element
+         * itself; any type parameters that are in scope from the declaring element
+         * are handled via `getDeclaringType`.
          */
         TypeParameter getTypeParameter(int pos);
 
@@ -2645,7 +2651,6 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
           exists(Parameterizable target, TypeParameter tp |
             target = invocation.(InvocationMatchingGetTypeArgumentInput::Access).getTarget() and
             parameterizableReturnContextTypedAt(target, path, tp) and
-            tp = target.getTypeParameter(_) and
             // check that no explicit type arguments have been supplied which bind `tp`
             not exists(TypeParameter supplied |
               tp = getAConstrained*(supplied) and