Address review comments

Author: hvitved

unified/ql/lib/codeql/Definitions.qll

@@ -10,7 +10,7 @@ private import codeql.unified.internal.NameBinding
  */
 cached
 predicate definitionOf(Identifier reference, NameBinding definition, string kind) {
-  definition = getStaticBindingTarget(reference) and
+  definition = getStaticBindingTargetFromIdentifier(reference) and
   not reference instanceof NameBinding and
   kind = "name"
 }

unified/ql/lib/codeql/unified/internal/AnalysisQuality.qll

@@ -13,7 +13,7 @@ module StaticNameResolutionStats implements EntityStatsSig {
    */
   private predicate resolvesToValue(Identifier name) {
     exists(AstNode decl |
-      decl = getStaticBindingTarget(name).getDeclaration() and
+      decl = getStaticBindingTargetFromIdentifier(name).getDeclaration() and
       not decl instanceof ClassLikeDeclaration and
       not decl instanceof TypeAliasDeclaration and
       not decl instanceof TypeParameter and
@@ -49,7 +49,7 @@ module StaticNameResolutionStats implements EntityStatsSig {
     }
 
     NameBindingNode getTarget() {
-      result.asIdentifier() = getStaticBindingTarget(this)
+      result.asIdentifier() = getStaticBindingTargetFromIdentifier(this)
       or
       result.isModuleScopeNode(_) and
       result.(NamespaceNode).ref().isIdentifier(this)

unified/ql/lib/codeql/unified/internal/ExprPositions.qll

@@ -34,7 +34,7 @@ predicate isInTypeContext(Expr expr) {
   or
   expr.getParent() instanceof TypeConstraint
   or
-  exists(Identifier id | id = NameBinding::getStaticBindingTarget(expr) |
+  exists(Identifier id | id = NameBinding::getStaticBindingTargetFromRef(expr) |
     id = any(ClassLikeDeclaration c).getNameNode()
     or
     id = any(TypeAliasDeclaration t).getNameNode()

unified/ql/lib/codeql/unified/internal/FacadeAst.qll

@@ -150,8 +150,7 @@ module Unified {
     /** Gets a direct base class of this class. */
     ClassLikeDeclaration getABaseClass() {
       result.getNameNode() =
-        NameBinding::getStaticBindingTarget(NameBinding::getIdentifierFromRef(this.getABaseType()
-                .getType()))
+        NameBinding::getStaticBindingTargetFromRef(this.getABaseType().getType())
     }
   }
 

unified/ql/lib/codeql/unified/internal/StaticNameBinding.qll

@@ -717,14 +717,25 @@ module Public {
   }
 }
 
-/** Gets the declaration being accessed by `access`, as determined by static name binding. */
-NameBinding getStaticBindingTarget(Identifier access) {
+/** Gets the declaration being accessed by identifier `i`, as determined by static name binding. */
+NameBinding getStaticBindingTargetFromIdentifier(Identifier i) {
   // For unqualified accesses, use the shadowing-aware lookup
-  result = access.(UnqualifiedMemberAccess).getTarget()
+  result = i.(UnqualifiedMemberAccess).getTarget()
   or
   // For others, just follow the name binding graph
-  not access instanceof UnqualifiedMemberAccess and
-  trackNameBinding(result).asIdentifier() = access
+  not i instanceof UnqualifiedMemberAccess and
+  trackNameBinding(result).asIdentifier() = i
+}
+
+/**
+ * Gets the declaration being accessed by `access`, as determined by static name binding.
+ *
+ * Unlike `getStaticBindingTargetFromIdentifier`, this works with any AST node that contains
+ * a reference to an identifier, for example `x.foo` and `foo<Int>` resolve to whatever the
+ * identifiers `foo` resolve to.
+ */
+NameBinding getStaticBindingTargetFromRef(AstNode access) {
+  result = getStaticBindingTargetFromIdentifier(getIdentifierFromRef(access))
 }
 
 /**

unified/ql/lib/codeql/unified/internal/typeinference/Type.qll

@@ -32,7 +32,7 @@ predicate associatedTypeParameterInherited(
 ) {
   associatedTypeParameter(base, a, _) and
   baseRef = c.getABaseType().getType() and
-  base.getNameNode() = getStaticBindingTarget(baseRef) and
+  base.getNameNode() = getStaticBindingTargetFromRef(baseRef) and
   name = a.getName()
 }
 

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

@@ -435,7 +435,7 @@ private module Input3 implements InputSig3 {
       )
       or
       // no mutual recursion; can be resolved directly with static name binding
-      result.getNameNode() = getStaticBindingTarget(getIdentifierFromRef(this))
+      result.getNameNode() = getStaticBindingTargetFromRef(this)
     }
   }
 
@@ -457,7 +457,7 @@ private module Input3 implements InputSig3 {
     result = inferType(fa.getReceiver(), path)
     or
     // static field with type qualifier
-    result = fa.getReceiver().(TypeMention).getTypeAt(path)
+    result = fa.(MemberAccessExpr).getBase().(TypeMention).getTypeAt(path)
     or
     // field with implicit receiver
     result = getImplicitReceiverType(fa, path)
@@ -546,6 +546,7 @@ private module Input3 implements InputSig3 {
       exists(TypeMention tm | result = tm.getTypeAt(path) |
         tm = super.getCallee()
         or
+        not super.getCallee() instanceof TypeMention and
         tm = super.getCallee().(MemberAccessExpr).getBase()
       )
     }
@@ -573,7 +574,7 @@ private module Input3 implements InputSig3 {
     }
 
     private Unified::Callable getTargetViaStaticNameBinding() {
-      exists(NameBinding b | b = getStaticBindingTarget(getIdentifierFromRef(this.getCallee())) |
+      exists(NameBinding b | b = getStaticBindingTargetFromRef(this.getCallee()) |
         // object creation (including enum constructors): `String(42)`, `Optional.Some(42)`
         exists(ClassLikeDeclaration cls, ConstructorDeclaration init |
           cls.getNameNode() = b and
@@ -727,7 +728,7 @@ private module Input3 implements InputSig3 {
       tp = f.getType().getType().getATypeParameter() and
       path = TypePath::singleton(tp) and
       // `Optional<String>.none` does not have an unknown `Wrapper` type
-      not exists(n.(FieldAccess).getReceiver().(TypeMention).getTypeAt(path))
+      not exists(n.(MemberAccessExpr).getBase().(TypeMention).getTypeAt(path))
     ) and
     result instanceof UnknownType
   }

unified/ql/lib/codeql/unified/internal/typeinference/TypeInferencePlugin.qll

@@ -10,6 +10,8 @@ private module Plugins {
   private import TypeInferencePluginSwift
 }
 
+// todo: once we support multiple languages, these predicates  will need to be
+// tagged with the language
 class TypeInferencePlugin extends Unit {
   /** Gets the boolean type which will be assigned to boolean literals. */
   abstract Type getBoolType();

unified/ql/lib/codeql/unified/internal/typeinference/TypeInferencePluginSwift.qll

@@ -147,7 +147,7 @@ private class SwiftTypeInferencePlugin extends Plugin::TypeInferencePlugin {
   pragma[nomagic]
   override FunctionDeclaration getFunctionInvoke(Type t) {
     result = t.(FunctionType).getClassLikeDeclaration().getAMember() and
-    result.getName() = "invoke"
+    result.getName() = "callAsFunction"
   }
 
   bindingset[t, arity, i]

unified/ql/lib/codeql/unified/internal/typeinference/TypeMention.qll

@@ -20,7 +20,7 @@ abstract class TypeMention extends AstNode {
 }
 
 private Type resolveType(Identifier access) {
-  exists(NameBinding b | b = getStaticBindingTarget(access) |
+  exists(NameBinding b | b = getStaticBindingTargetFromIdentifier(access) |
     b = result.(ClassLikeDeclarationType).getClassLikeDeclaration().getNameNode()
     or
     b = result.(TypeParameterType).getTypeParameter().getNameNode()
@@ -40,7 +40,7 @@ abstract private class ExprTypeMention extends TypeMention, Expr {
 private class AliasExprTypeMention extends ExprTypeMention {
   private TypeAliasDeclaration alias;
 
-  AliasExprTypeMention() { alias.getNameNode() = getStaticBindingTarget(this) }
+  AliasExprTypeMention() { alias.getNameNode() = getStaticBindingTargetFromRef(this) }
 
   private TypeParameterType getAliasTypeParameter(int i) {
     result.getTypeParameter() = alias.getTypeParameter(i)