wip3

Author: hvitved

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

@@ -1235,10 +1235,19 @@ private module MethodCallResolution {
     private predicate isNotCandidate(
       ImplOrTraitItemNode i, FunctionPositionType self, string derefChainBorrow
     ) {
-      IsInstantiationOf<MethodCallCand, FunctionPositionType, MethodCallIsInstantiationOfInput2>::isNotInstantiationOf(MkMethodCallCand(this,
+      IsInstantiationOf<MethodCallCand, FunctionPositionType, MethodCallIsInstantiationOfInput>::isNotInstantiationOf(MkMethodCallCand(this,
           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)
+    }
+
     pragma[nomagic]
     private Type getACandidateReceiverTypeAtNoBorrowNoMatch(TypePath path, string derefChain) {
       result = this.getACandidateReceiverTypeAtNoBorrow(path, derefChain) and
@@ -1247,9 +1256,11 @@ 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(type, name, arity, derefChainBorrow)
       |
-        forall(ImplOrTraitItemNode i, FunctionPositionType self |
-          methodCallCandidate(this, type, i, self, _, _)
+        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)
         )
       )
@@ -1262,9 +1273,11 @@ private module MethodCallResolution {
         derefChainBorrow = derefChain + ";borrow" and
         this.isMethodCall0(type, name, arity, derefChainBorrow)
       |
-        forall(ImplOrTraitItemNode i, FunctionPositionType self |
-          methodCallCandidate(this, type, i, self, _, _)
+        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)
         )
       )
@@ -1384,9 +1397,16 @@ private module MethodCallResolution {
 
     pragma[nomagic]
     private predicate isNotInherentTarget(Impl impl) {
-      IsInstantiationOf<MethodCallCand, FunctionPositionType, MethodCallIsInstantiationOfInput2>::isNotInstantiationOf(this,
-        impl, _) and
-      not impl.hasTrait()
+      IsInstantiationOf<MethodCallCand, FunctionPositionType, MethodCallIsNotInstantiationOfInput>::isNotInstantiationOf(this,
+        impl, _)
+    }
+
+    pragma[nomagic]
+    private predicate blah(
+      Type type, Impl i, FunctionPositionType self, TypePath selfPath, Type selfType
+    ) {
+      not i.hasTrait() and
+      mc_.blah(type, i, self, selfPath, selfType, derefChainBorrow)
     }
 
     /**
@@ -1397,11 +1417,18 @@ private module MethodCallResolution {
     private predicate hasNoInherentTarget() {
       exists(Type type, string name, int arity |
         this.isMethodCall(_, TypePath::nil(), type, name, arity) and
-        forall(Impl impl |
-          methodCandidate(type, name, arity, impl, _, _, _) and
-          not impl.hasTrait()
+        forall(Impl i, FunctionPositionType self, TypePath selfPath, Type selfType |
+          methodCandidate(type, name, arity, i, self, selfPath, selfType) and
+          not i.hasTrait()
         |
-          this.isNotInherentTarget(impl)
+          this.blah(type, i, self, selfPath, selfType)
+          or
+          this.isNotInherentTarget(i)
+          // forall(Impl impl |
+          //   methodCandidate(type, name, arity, impl, _, _, _) and
+          //   not impl.hasTrait()
+          // |
+          //   this.isNotInherentTarget(impl)
         )
       )
     }
@@ -1475,17 +1502,15 @@ private module MethodCallResolution {
     }
   }
 
-  private module MethodCallIsInstantiationOfInput2 implements
+  private module MethodCallIsNotInstantiationOfInput implements
     IsInstantiationOfInputSig<MethodCallCand, FunctionPositionType>
   {
     pragma[nomagic]
     predicate potentialInstantiationOf(
       MethodCallCand mcc, TypeAbstraction abs, FunctionPositionType constraint
     ) {
-      exists(MethodCall mc, Type type, string name, int arity |
-        mcc.isMethodCall(mc, TypePath::nil(), type, name, arity) and
-        methodCallCandidate(mc, type, abs, constraint, _, _)
-      )
+      MethodCallIsInstantiationOfInput::potentialInstantiationOf(mcc, abs, constraint) and
+      abs = any(Impl i | not i.hasTrait())
     }
 
     predicate relevantTypeMention(FunctionPositionType constraint) {