wip2

Author: hvitved

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

@@ -22,12 +22,6 @@ private signature Type resolveTypeMentionAtSig(AstNode tm, TypePath path);
  * how to resolve type mentions (`PreTypeMention` vs. `TypeMention`).
  */
 private module MkSiblingImpls<resolveTypeMentionAtSig/2 resolveTypeMentionAt> {
-  pragma[nomagic]
-  private Type resolveNonTypeParameterTypeAt(AstNode tm, TypePath path) {
-    result = resolveTypeMentionAt(tm, path) and
-    not result instanceof TypeParameter
-  }
-
   private class Tm extends AstNode {
     Type getTypeAt(TypePath path) { result = resolveTypeMentionAt(this, path) }
   }
@@ -95,35 +89,23 @@ private module MkSiblingImpls<resolveTypeMentionAtSig/2 resolveTypeMentionAt> {
     ImplItemNode impl, ImplItemNode impl2, Trait trait, TypePath path
   ) {
     // impl instanceof Builtins::BuiltinImpl and
-    exists(Type t | implSiblings(trait, impl, impl2) |
-      t = resolveTypeMentionAt(impl.getTraitPath(), path) and
-      forall(Type t2 | t2 = resolveTypeMentionAt(impl2.getTraitPath(), path) |
-        t != t2 and
-        (not t instanceof TypeParameter or not t2 instanceof TypeParameter)
-      )
-      or
-      t = resolveTypeMentionAt(impl2.getTraitPath(), path) and
-      // not (t = resolveTypeMentionAt(impl.getTraitPath(), path) and not t instanceof TypeParameter)
-      forall(Type t2 | t2 = resolveTypeMentionAt(impl.getTraitPath(), path) |
-        t != t2 and
-        (not t instanceof TypeParameter or not t2 instanceof TypeParameter)
-      )
-      //   and
-      //   t1 = resolveTypeMentionAt(impl.getTraitPath(), path) and
-      //   t2 = resolveTypeMentionAt(impl2.getTraitPath(), path) and
-      //   t1 != t2
-      // |
-      //   not t1 instanceof TypeParameter or
-      //   not t2 instanceof TypeParameter
+    exists(Type t1, Type t2 |
+      implSiblings(trait, impl, impl2) and
+      t1 = resolveTypeMentionAt(impl.getTraitPath(), path) and
+      t2 = resolveTypeMentionAt(impl2.getTraitPath(), path) and
+      t1 != t2
+    |
+      not t1 instanceof TypeParameter or
+      not t2 instanceof TypeParameter
     )
-    // or
-    // // todo: handle blanket/non-blanket siblings in `implSiblings`
-    // trait =
-    //   any(IndexTrait it |
-    //     implSiblingCandidate(impl, it, _, _) and
-    //     impl instanceof Builtins::BuiltinImpl and
-    //     path = TypePath::singleton(TAssociatedTypeTypeParameter(trait, it.getOutputType()))
-    //   )
+    or
+    // todo: handle blanket/non-blanket siblings in `implSiblings`
+    trait =
+      any(IndexTrait it |
+        implSiblingCandidate(impl, it, _, _) and
+        impl instanceof Builtins::BuiltinImpl and
+        path = TypePath::singleton(TAssociatedTypeTypeParameter(trait, it.getOutputType()))
+      )
   }
 }
 

rust/ql/test/library-tests/type-inference/type-inference.expected

@@ -11900,10 +11900,8 @@ inferType
 | main.rs:2311:26:2311:27 | .. |  | {EXTERNAL LOCATION} | RangeFull |
 | main.rs:2312:9:2312:51 | for ... in ... { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2312:18:2312:48 | &... |  | {EXTERNAL LOCATION} | & |
-| main.rs:2312:18:2312:48 | &... | TRef | {EXTERNAL LOCATION} | i64 |
 | main.rs:2312:19:2312:36 | [...] |  | {EXTERNAL LOCATION} | [;] |
 | main.rs:2312:19:2312:36 | [...] | TArray | {EXTERNAL LOCATION} | i64 |
-| main.rs:2312:19:2312:48 | ...[range_full] |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:2312:20:2312:23 | 1i64 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:2312:26:2312:29 | 2i64 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:2312:32:2312:35 | 3i64 |  | {EXTERNAL LOCATION} | i64 |

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

@@ -634,17 +634,6 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
         tp = abs.getATypeParameter()
       }
 
-      pragma[nomagic]
-      private predicate hasTypeParameterAt2(
-        App app, TypeAbstraction abs, Constraint constraint, TypePath path1, TypePath path2
-      ) {
-        exists(TypeParameter tp |
-          hasTypeParameterAt(app, abs, constraint, path1, tp) and
-          hasTypeParameterAt(app, abs, constraint, path2, tp) and
-          path1 != path2
-        )
-      }
-
       private Type getNonPseudoTypeAt(App app, TypePath path) {
         result = app.getTypeAt(path) and not isPseudoType(result)
       }
@@ -1038,6 +1027,29 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
         )
       }
 
+      private module TermIsInstantiationOfConditionInput2 implements
+        IsInstantiationOfInputSig<Term, TypeMention>
+      {
+        predicate potentialInstantiationOf(Term term, TypeAbstraction abs, TypeMention cond) {
+          TermIsInstantiationOfConditionInput::potentialInstantiationOf(term, abs, cond) and
+          exists(
+            TypeMention sub, Type constraintRoot, TypeMention constraintMention,
+            TypeAbstraction abs2
+          |
+            hasConstraintMention(term, abs2, sub, _, constraintRoot, constraintMention) and
+            conditionSatisfiesConstraintTypeAt(abs2, sub, constraintMention, _, _) and
+            typeAbstractionHasAmbiguousConstraintAt(abs2, constraintRoot, abs, _)
+          )
+        }
+
+        predicate relevantConstraint(TypeMention constraint) {
+          TermIsInstantiationOfConditionInput::relevantConstraint(constraint)
+        }
+      }
+
+      private module TermIsInstantiationOfCondition2 =
+        IsInstantiationOf<Term, TypeMention, TermIsInstantiationOfConditionInput2>;
+
       pragma[nomagic]
       private predicate satisfiesConstraintTypeMention0(
         Term term, Constraint constraint, TypeMention constraintMention, TypeAbstraction abs,
@@ -1050,15 +1062,16 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
           exists(TypePath prefix, TypeAbstraction other |
             typeAbstractionHasAmbiguousConstraintAt(abs, constraintRoot, other, prefix) and
             prefix.isPrefixOf(path) and
-            hasConstraintMention(term, other, _, _, constraintRoot, _)
+            TermIsInstantiationOfCondition2::isInstantiationOf(term, other, _)
+            // hasConstraintMention(term, other, _, _, constraintRoot, _)
           ) and
           ambiguous = true
           or
           forall(TypePath prefix, TypeAbstraction other |
             typeAbstractionHasAmbiguousConstraintAt(abs, constraintRoot, other, prefix) and
             prefix.isPrefixOf(path)
           |
-            TermIsInstantiationOfCondition::isNotInstantiationOf(term, other, _, _)
+            TermIsInstantiationOfCondition2::isNotInstantiationOf(term, other, _, _)
           ) and
           ambiguous = false
         )