wip6

Author: hvitved

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

@@ -525,7 +525,7 @@ private module Input3 implements InputSig3 {
   final class Invocation = InvocationImpl;
 
   abstract private class InvocationImpl extends Expr {
-    abstract TypeMention getTypeQualifier();
+    abstract Type getTypeQualifier(TypePath path);
 
     abstract Type getTypeArgument(int pos, TypePath path);
 
@@ -542,7 +542,9 @@ private module Input3 implements InputSig3 {
 
   private class AssocFunctionCall extends InvocationImpl instanceof AssocFunctionResolution::AssocFunctionCall
   {
-    override TypeMention getTypeQualifier() { result = getCallExprTypeArgument2(this) }
+    override Type getTypeQualifier(TypePath path) {
+      result = getCallExprTypeQualifier(this, path, _)
+    }
 
     pragma[nomagic]
     override Type getTypeArgument(int pos, TypePath path) {
@@ -589,7 +591,7 @@ private module Input3 implements InputSig3 {
   private class NonAssocFunctionCall extends InvocationImpl instanceof NonAssocCallExpr,
     CallExprImpl::CallExprCall
   {
-    override TypeMention getTypeQualifier() { none() }
+    override Type getTypeQualifier(TypePath path) { none() }
 
     pragma[nomagic]
     override Type getTypeArgument(int pos, TypePath path) {
@@ -627,7 +629,9 @@ private module Input3 implements InputSig3 {
       this instanceof CallExprImpl::TupleVariantExpr
     }
 
-    override TypeMention getTypeQualifier() { result = CallExprImpl::getFunctionPath(this) }
+    override Type getTypeQualifier(TypePath path) {
+      result = CallExprImpl::getFunctionPath(this).(TypeMention).getTypeAt(path)
+    }
 
     override Type getTypeArgument(int pos, TypePath path) {
       // result = NonAssocCallExpr.super.getTypeArgument(pos, path)
@@ -648,9 +652,9 @@ private module Input3 implements InputSig3 {
     pragma[nomagic]
     override Constructor getTarget() { result = resolvePath(super.getPath()) }
 
-    override TypeMention getTypeQualifier() {
+    override Type getTypeQualifier(TypePath path) {
       // Handle constructions that use `Self {...}` syntax
-      result = super.getPath()
+      result = super.getPath().(TypeMention).getTypeAt(path)
     }
 
     pragma[nomagic]
@@ -1149,25 +1153,6 @@ private Type getCallExprTypeArgument(CallExpr ce, int pos, TypePath path) {
   )
 }
 
-pragma[nomagic]
-private TypeMention getCallExprTypeArgument2(CallExpr ce) {
-  exists(Path p | p = CallExprImpl::getFunctionPath(ce) |
-    exists(Path qualifier |
-      qualifier = p.getQualifier() and
-      not result.getType() instanceof TraitType
-    |
-      result = qualifier
-      or
-      // `<Foo as Bar>::baz()`; `Foo` is the type qualifier
-      exists(PathSegment segment |
-        segment = qualifier.getSegment() and
-        result = segment.getTypeRepr() and
-        segment.hasTraitTypeRepr()
-      )
-    )
-  )
-}
-
 /**
  * Holds if `me` is a call to the `panic!` macro.
  *

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

@@ -2168,7 +2168,7 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
          */
         AstNode getArgument(int i);
 
-        TypeMention getTypeQualifier();
+        Type getTypeQualifier(TypePath path);
 
         /** Gets the target of this invocation in the given resolution context. */
         Parameterizable getTargetForTypeQualifierMatching();
@@ -2926,7 +2926,7 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
 
         final class Access extends InvocationFinal {
           Type getInferredType(AccessPosition apos, TypePath path) {
-            result = this.getTypeQualifier().getTypeAt(path) and
+            result = this.getTypeQualifier(path) and
             exists(apos)
           }