perf

Author: hvitved

rust/ql/lib/codeql/rust/internal/PathResolution.qll

@@ -1446,6 +1446,17 @@ module TraitIsVisible<relevantTraitVisibleSig/2 relevantTraitVisible> {
   predicate traitIsVisible(Element element, Trait trait) {
     exists(ItemNode encl | traitLookup(encl, element, trait) and trait = encl.getASuccessor(_, _))
   }
+
+  /** Holds if the trait `trait` is _not_ visible at `element`. */
+  pragma[nomagic]
+  predicate traitIsNotVisible(Element element, Trait trait) {
+    relevantTraitVisible(element, trait) and
+    exists(ItemNode encl |
+      traitLookup(encl, element, trait) and
+      not trait = encl.getASuccessor(_, _) and
+      not exists(getOuterScope(encl))
+    )
+  }
 }
 
 pragma[nomagic]

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

@@ -1167,11 +1167,29 @@ private module MethodCallResolution {
     }
 
     pragma[nomagic]
-    private predicate isMethodCall0(Type rootType, string name, int arity, string derefChainBorrow) {
+    predicate isMethodCall0(Type rootType, string name, int arity, string derefChainBorrow) {
       rootType = this.getACandidateReceiverTypeAt(TypePath::nil(), derefChainBorrow) and
       this.isMethodCall(name, arity)
     }
 
+    pragma[nomagic]
+    private predicate isNot(
+      ImplOrTraitItemNode i, FunctionPositionType self, string derefChainBorrow
+    ) {
+      IsInstantiationOf<MethodCallCand, FunctionPositionType, MethodCallIsInstantiationOfInput>::isNotInstantiationOf(MkMethodCallCand(this,
+          derefChainBorrow), i, self)
+      or
+      exists(Trait trait |
+        relevantTraitVisible0(i, self, derefChainBorrow, this, trait) and
+        TraitIsVisible<relevantTraitVisible1/2>::traitIsNotVisible(this,
+          pragma[only_bind_into](trait)) and
+        not (
+          this instanceof IndexExpr and
+          trait instanceof IndexTrait
+        )
+      )
+    }
+
     pragma[nomagic]
     private Type getACandidateReceiverTypeAtNoBorrowNoMatch(TypePath path, string derefChain) {
       result = this.getACandidateReceiverTypeAtNoBorrow(path, derefChain) and
@@ -1180,11 +1198,12 @@ private module MethodCallResolution {
         not derefChain.matches("%.ref") and // no need to try a borrow if the last thing we did was a deref
         this.isMethodCall0(rootType, name, arity, derefChainBorrow)
       |
-        forall(Impl impl, FunctionPositionType self |
-          methodCandidate(rootType, name, arity, impl, self)
+        forall(ImplOrTraitItemNode i, FunctionPositionType self |
+          methodCandidate(rootType, name, arity, i, self)
         |
-          IsInstantiationOf<MethodCallCand, FunctionPositionType, MethodCallIsInstantiationOfInput>::isNotInstantiationOf(MkMethodCallCand(this,
-              derefChainBorrow), impl, self)
+          this.isNot(i, self, derefChainBorrow)
+          // IsInstantiationOf<MethodCallCand, FunctionPositionType, MethodCallIsInstantiationOfInput>::isNotInstantiationOf(MkMethodCallCand(this,
+          //     derefChainBorrow), i, self)
         )
       )
     }
@@ -1196,11 +1215,12 @@ private module MethodCallResolution {
         derefChainBorrow = derefChain + ";borrow" and
         this.isMethodCall0(rootType, name, arity, derefChainBorrow)
       |
-        forall(Impl impl, FunctionPositionType self |
-          methodCandidate(rootType, name, arity, impl, self)
+        forall(ImplOrTraitItemNode i, FunctionPositionType self |
+          methodCandidate(rootType, name, arity, i, self)
         |
-          IsInstantiationOf<MethodCallCand, FunctionPositionType, MethodCallIsInstantiationOfInput>::isNotInstantiationOf(MkMethodCallCand(this,
-              derefChainBorrow), impl, self)
+          // IsInstantiationOf<MethodCallCand, FunctionPositionType, MethodCallIsInstantiationOfInput>::isNotInstantiationOf(MkMethodCallCand(this,
+          //     derefChainBorrow), i, self)
+          this.isNot(i, self, derefChainBorrow)
         )
       )
     }
@@ -1256,6 +1276,20 @@ private module MethodCallResolution {
     }
   }
 
+  private predicate relevantTraitVisible0(
+    ImplItemNode i, FunctionPositionType self, string derefChainBorrow, MethodCall mc, Trait trait
+  ) {
+    exists(Type rootType, string name, int arity |
+      mc.(MethodCall).isMethodCall0(rootType, name, arity, derefChainBorrow) and
+      methodCandidate(rootType, name, arity, i, self) and
+      trait = i.resolveTraitTy()
+    )
+  }
+
+  private predicate relevantTraitVisible1(Element mc, Trait trait) {
+    relevantTraitVisible0(_, _, _, mc, trait)
+  }
+
   private class MethodCallMethodCallExpr extends MethodCall, MethodCallExpr {
     pragma[nomagic]
     override predicate isMethodCall(string name, int arity) {

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

@@ -1131,6 +1131,16 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
         )
       }
 
+      pragma[nomagic]
+      private predicate directTypeMatch0(
+        Access a, State state, Declaration target, DeclarationPosition dpos,
+        TypePath pathToTypeParam, TypeParameter tp
+      ) {
+        not exists(getTypeArgument(a, target, tp, _)) and
+        tp = target.getDeclaredType(dpos, pathToTypeParam) and
+        target = a.getTarget(state)
+      }
+
       /**
        * Holds if the type `t` at `path` of `a` in `state` matches the type parameter `tp`
        * of `target`.
@@ -1139,11 +1149,9 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
       private predicate directTypeMatch(
         Access a, State state, Declaration target, TypePath path, Type t, TypeParameter tp
       ) {
-        not exists(getTypeArgument(a, target, tp, _)) and
         exists(AccessPosition apos, DeclarationPosition dpos, TypePath pathToTypeParam |
-          tp = target.getDeclaredType(dpos, pathToTypeParam) and
+          directTypeMatch0(a, state, target, dpos, pathToTypeParam, tp) and
           accessDeclarationPositionMatch(apos, dpos) and
-          target = a.getTarget(state) and
           t = a.getInferredType(state, apos, pathToTypeParam.appendInverse(path))
         )
       }