sadf

Author: hvitved

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

@@ -1158,7 +1158,7 @@ private module MethodCallResolution {
     methodCallVisibleTraitCandidate(mc, impl.resolveTraitTy())
   }
 
-  pragma[nomagic]
+  pragma[inline]
   private predicate methodCallCandidate(
     MethodCall mc, Type type, ImplOrTraitItemNode i, FunctionPositionType self, TypePath selfPath,
     Type selfType
@@ -1250,44 +1250,16 @@ private module MethodCallResolution {
           derefChainBorrow), i, self)
     }
 
-    // pragma[nomagic]
-    // predicate blah(
-    //   Type type, ImplOrTraitItemNode i, FunctionPositionType self, TypePath selfPath, Type selfType,
-    //   string derefChainBorrow
-    // ) {
-    //   selfType != this.getACandidateReceiverTypeAt(selfPath, derefChainBorrow) and
-    //   methodCallCandidate(this, type, i, self, selfPath, selfType)
-    // }
-    // idOfImplOrTraitItemNode
-    // pragma[nomagic]
-    // private ImplOrTraitItemNode getARankedCandidate(TypePath path, string derefChain) {
-    //   result = this.getACandidateReceiverTypeAtNoBorrow(path, derefChain) and
-    //   exists(Type type, string name, int arity, string derefChainBorrow |
-    //     derefChainBorrow = derefChain + ";" and
-    //     not derefChain.matches("%.ref") and // no need to try a borrow if the last thing we did was a deref
-    //     this.isMethodCall0(type, name, arity, derefChainBorrow)
-    //   |
-    //     forall(ImplOrTraitItemNode i, FunctionPositionType self, TypePath selfPath, Type selfType |
-    //       methodCallCandidate(this, type, i, self, selfPath, selfType)
-    //     |
-    //       this.blah(type, i, self, selfPath, selfType, derefChainBorrow)
-    //       or
-    //       this.isNotCandidate(i, self, derefChainBorrow)
-    //     )
-    //   )
-    // }
     pragma[nomagic]
     private predicate getACandidateReceiverTypeAtNoBorrowNoMatch0(string derefChain) {
-      exists(Type type, string name, int arity, string derefChainBorrow |
+      exists(Type type, string derefChainBorrow |
         derefChainBorrow = derefChain + ";" and
         not derefChain.matches("%.ref") and // no need to try a borrow if the last thing we did was a deref
-        this.isMethodCall0(type, name, arity, derefChainBorrow)
+        this.isMethodCall0(type, _, _, derefChainBorrow)
       |
-        forall(ImplOrTraitItemNode i, FunctionPositionType self, TypePath selfPath, Type selfType |
-          methodCallCandidate(this, type, i, self, selfPath, selfType)
+        forall(ImplOrTraitItemNode i, FunctionPositionType self |
+          methodCallCandidate(this, type, i, self, _, _)
         |
-          // this.blah(type, i, self, selfPath, selfType, derefChainBorrow)
-          // or
           this.isNotCandidate(i, self, derefChainBorrow)
         )
       )
@@ -1297,32 +1269,20 @@ private module MethodCallResolution {
     private Type getACandidateReceiverTypeAtNoBorrowNoMatch(TypePath path, string derefChain) {
       result = this.getACandidateReceiverTypeAtNoBorrow(path, derefChain) and
       this.getACandidateReceiverTypeAtNoBorrowNoMatch0(derefChain)
-      // exists(Type type, string name, int arity, string derefChainBorrow |
-      //   derefChainBorrow = derefChain + ";" and
-      //   not derefChain.matches("%.ref") and // no need to try a borrow if the last thing we did was a deref
-      //   this.isMethodCall0(type, name, arity, derefChainBorrow)
-      // |
-      //   forall(ImplOrTraitItemNode i, FunctionPositionType self, TypePath selfPath, Type selfType |
-      //     methodCallCandidate(this, type, i, self, selfPath, selfType)
-      //   |
-      //     this.blah(type, i, self, selfPath, selfType, derefChainBorrow)
-      //     or
-      //     this.isNotCandidate(i, self, derefChainBorrow)
-      //   )
-      // )
+    }
+
+    pragma[nomagic]
+    private predicate hasRefCandidate(ImplOrTraitItemNode i, FunctionPositionType self) {
+      methodCallCandidate(this, TRefType(), i, self, _, _)
     }
 
     pragma[nomagic]
     private predicate getACandidateReceiverTypeAtNoMatch0(string derefChain) {
-      exists(Type type, string name, int arity, string derefChainBorrow |
+      exists(string derefChainBorrow |
         derefChainBorrow = derefChain + ";borrow" and
-        this.isMethodCall0(type, name, arity, derefChainBorrow)
+        this.isMethodCall0(_, _, _, derefChainBorrow)
       |
-        forall(ImplOrTraitItemNode i, FunctionPositionType self, TypePath selfPath, Type selfType |
-          methodCallCandidate(this, type, i, self, selfPath, selfType)
-        |
-          // this.blah(type, i, self, selfPath, selfType, derefChainBorrow)
-          // or
+        forall(ImplOrTraitItemNode i, FunctionPositionType self | this.hasRefCandidate(i, self) |
           this.isNotCandidate(i, self, derefChainBorrow)
         )
       )
@@ -1332,18 +1292,6 @@ private module MethodCallResolution {
     private Type getACandidateReceiverTypeAtNoMatch(TypePath path, string derefChain) {
       result = this.getACandidateReceiverTypeAtNoBorrowNoMatch(path, derefChain) and
       this.getACandidateReceiverTypeAtNoMatch0(derefChain)
-      // exists(Type type, string name, int arity, string derefChainBorrow |
-      //   derefChainBorrow = derefChain + ";borrow" and
-      //   this.isMethodCall0(type, name, arity, derefChainBorrow)
-      // |
-      //   forall(ImplOrTraitItemNode i, FunctionPositionType self, TypePath selfPath, Type selfType |
-      //     methodCallCandidate(this, type, i, self, selfPath, selfType)
-      //   |
-      //     this.blah(type, i, self, selfPath, selfType, derefChainBorrow)
-      //     or
-      //     this.isNotCandidate(i, self, derefChainBorrow)
-      //   )
-      // )
     }
 
     /**
@@ -1560,7 +1508,7 @@ private module MethodCallResolution {
     }
 
     predicate relevantTypeMention(FunctionPositionType constraint) {
-      methodCallCandidate(_, _, _, constraint, _, _)
+      methodCandidate(_, _, _, _, constraint, _, _)
     }
   }
 
@@ -1579,7 +1527,7 @@ private module MethodCallResolution {
     }
 
     predicate relevantTypeMention(FunctionPositionType constraint) {
-      methodCallCandidate(_, _, _, constraint, _, _)
+      methodCandidate(_, _, _, _, constraint, _, _)
     }
   }
 
@@ -1595,7 +1543,7 @@ private module MethodCallResolution {
     }
 
     predicate relevantTypeMention(FunctionPositionType constraint) {
-      methodCallCandidate(_, _, _, constraint, _, _)
+      methodCandidate(_, _, _, _, constraint, _, _)
     }
   }
 }