wip8

Author: hvitved

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

@@ -41,16 +41,19 @@ private predicate hasFirstNonTrivialTraitBound(TypeParamItemNode tp, Trait trait
  */
 pragma[nomagic]
 predicate isBlanketLike(ImplItemNode i, TypePath blanketSelfPath, TypeParam blanketTypeParam) {
-  blanketTypeParam = i.getBlanketImplementationTypeParam() and
-  blanketSelfPath.isEmpty()
-  or
-  exists(TypeMention tm, Type root, TypeParameter tp |
-    tm = i.(Impl).getSelfTy() and
-    complexSelfRoot(root, tp) and
-    tm.getType() = root and
-    tm.getTypeAt(blanketSelfPath) = TTypeParamTypeParameter(blanketTypeParam) and
-    blanketSelfPath = TypePath::singleton(tp) and
-    hasFirstNonTrivialTraitBound(blanketTypeParam, _)
+  i.(Impl).hasTrait() and
+  (
+    blanketTypeParam = i.getBlanketImplementationTypeParam() and
+    blanketSelfPath.isEmpty()
+    or
+    exists(TypeMention tm, Type root, TypeParameter tp |
+      tm = i.(Impl).getSelfTy() and
+      complexSelfRoot(root, tp) and
+      tm.getType() = root and
+      tm.getTypeAt(blanketSelfPath) = TTypeParamTypeParameter(blanketTypeParam) and
+      blanketSelfPath = TypePath::singleton(tp) and
+      hasFirstNonTrivialTraitBound(blanketTypeParam, _)
+    )
   )
 }
 

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

@@ -1369,6 +1369,21 @@ private class BorrowKind extends TBorrowKind {
  * [1]: https://doc.rust-lang.org/reference/expressions/method-call-expr.html#r-expr.method.candidate-receivers
  */
 private module MethodResolution {
+  pragma[nomagic]
+  private predicate functionResolutionDependsOnArgument(
+    ImplItemNode impl, Function f, TypeParameter tp, FunctionPosition pos
+  ) {
+    FunctionOverloading::functionResolutionDependsOnArgument(impl, f, tp, pos)
+    // or
+    // // For inherent implementations of generic types, we also need to check the type being
+    // // implemented. We arbitrarily choose the first type parameter of the type being implemented
+    // // to represent this case.
+    // f = impl.getAnAssocItem() and
+    // not impl.(Impl).hasTrait() and
+    // tp = TTypeParamTypeParameter(impl.resolveSelfTy().getTypeParam(0)) and
+    // pos.isSelf()
+  }
+
   pragma[nomagic]
   private predicate traitFunctionResolutionDependsOnArgument0(
     // todo: copied
@@ -1381,7 +1396,7 @@ private module MethodResolution {
     (
       traitTp = TSelfTypeParameter(trait)
       or
-      FunctionOverloading::functionResolutionDependsOnArgument(impl, implFunction, traitTp, pos)
+      functionResolutionDependsOnArgument(impl, implFunction, traitTp, pos)
     )
   }
 
@@ -1593,7 +1608,8 @@ private module MethodResolution {
     exists(string name, int arity |
       mc.hasNameAndArity(name, arity) and
       assocFunctionInfoNonBlanket(f, name, arity, selfPos, pos, i, self, strippedTypePath,
-        strippedType)
+        strippedType) and
+      if mc.hasReceiver() then f instanceof Method else any()
     |
       i =
         any(Impl impl |
@@ -1628,7 +1644,8 @@ private module MethodResolution {
     exists(string name, int arity |
       mc.hasNameAndArity(name, arity) and
       assocFunctionSelfInfoBlanketLike(f, name, arity, selfPos, pos, impl, _, self, blanketPath,
-        blanketTypeParam)
+        blanketTypeParam) and
+      if mc.hasReceiver() then f instanceof Method else any()
     |
       methodCallVisibleImplTraitCandidate(mc, impl)
       or
@@ -2201,7 +2218,8 @@ private module MethodResolution {
       exists(getCallExprPathQualifier(this)) and
       // even if a method cannot be resolved by path resolution, it may still
       // be possible to resolve a blanket implementation (so not `forex`)
-      forall(ItemNode i | i = CallExprImpl::getResolvedFunction(this) | i instanceof Function)
+      forall(ItemNode i | i = CallExprImpl::getResolvedFunction(this) | i instanceof Function) and
+      not exists(this.(NonMethodResolution::NonMethodCall).resolveCallTargetViaPathResolution())
     }
 
     pragma[nomagic]
@@ -2408,7 +2426,7 @@ private module MethodResolution {
     pragma[nomagic]
     Function resolveCallTarget(ImplOrTraitItemNode i) {
       result = this.resolveCallTargetCand(i) and
-      not FunctionOverloading::functionResolutionDependsOnArgument(i, result, _, _)
+      not functionResolutionDependsOnArgument(i, result, _, _)
       or
       MethodArgsAreInstantiationsOf::argsAreInstantiationsOf(mc_, i, result)
     }
@@ -2569,11 +2587,22 @@ private module MethodResolution {
     ) {
       mc = Debug::getRelevantLocatable() and
       mcc.hasSignature(mc, pos, strippedTypePath, strippedType, name, arity) and
-      (
-        methodCallNonBlanketCandidate(mc, f, _, pos, i, selfType, strippedTypePath, strippedType)
-        or
-        methodCallBlanketLikeCandidate(mc, f, _, pos, i, selfType, _, _) and
-        ReceiverSatisfiesBlanketLikeConstraint::satisfiesBlanketConstraint(mcc, i)
+      // methodCallNonBlanketCandidate(mc, f, _, pos, i, selfType, strippedTypePath, strippedType)
+      mc.hasNameAndArity(name, arity) and
+      exists(FunctionPosition selfPos |
+        assocFunctionInfoNonBlanket(f, name, arity, selfPos, pos, i, selfType, strippedTypePath,
+          strippedType)
+        // |
+        //   i =
+        //     any(Impl impl |
+        //       not impl.hasTrait()
+        //       or
+        //       methodCallVisibleImplTraitCandidate(mc, impl)
+        //     )
+        //   or
+        //   methodCallVisibleTraitCandidate(mc, i)
+        //   or
+        //   i.(ImplItemNode).resolveTraitTy() = mc.getTrait()
       )
     }
 
@@ -2650,7 +2679,7 @@ private module MethodResolution {
    */
   private module MethodArgsAreInstantiationsOfInput implements ArgsAreInstantiationsOfInputSig {
     predicate toCheck(ImplOrTraitItemNode i, Function f, TypeParameter traitTp, FunctionPosition pos) {
-      FunctionOverloading::functionResolutionDependsOnArgument(i, f, traitTp, pos)
+      functionResolutionDependsOnArgument(i, f, traitTp, pos)
     }
 
     final private class MethodCallFinal = MethodCall;
@@ -4116,8 +4145,8 @@ private module Debug {
   Locatable getRelevantLocatable() {
     exists(string filepath, int startline, int startcolumn, int endline, int endcolumn |
       result.getLocation().hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn) and
-      filepath.matches("%/overloading.rs") and
-      startline = 399
+      filepath.matches("%/main.rs") and
+      startline = 93
     )
   }