wip

Author: hvitved

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

@@ -97,10 +97,17 @@ private module MkSiblingImpls<resolveTypeMentionAtSig/2 resolveTypeMentionAt> {
     // impl instanceof Builtins::BuiltinImpl and
     exists(Type t | implSiblings(trait, impl, impl2) |
       t = resolveTypeMentionAt(impl.getTraitPath(), path) and
-      not (t = resolveTypeMentionAt(impl2.getTraitPath(), path) and not t instanceof TypeParameter)
+      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)
+      // 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

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

@@ -11605,6 +11605,7 @@ inferType
 | main.rs:2223:9:2223:31 | ... .my_add(...) | T | main.rs:2107:5:2107:19 | S |
 | main.rs:2223:9:2223:31 | ... .my_add(...) | T.T | main.rs:2109:10:2109:17 | T::Output[MyAdd] |
 | main.rs:2223:9:2223:31 | ... .my_add(...) | T.T | main.rs:2118:10:2118:17 | T::Output[MyAdd] |
+| main.rs:2223:9:2223:31 | ... .my_add(...) | T.T | main.rs:2127:14:2127:14 | T::Output[MyAdd] |
 | main.rs:2223:11:2223:14 | 1i64 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:2223:24:2223:30 | S(...) |  | main.rs:2107:5:2107:19 | S |
 | main.rs:2223:24:2223:30 | S(...) | T | {EXTERNAL LOCATION} | i64 |
@@ -11899,8 +11900,10 @@ 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

@@ -626,6 +626,37 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
         )
       }
 
+      pragma[nomagic]
+      private predicate hasTypeParameterAt(
+        App app, TypeAbstraction abs, Constraint constraint, TypePath path, TypeParameter tp
+      ) {
+        tp = getTypeAt(app, abs, constraint, path) and
+        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)
+      }
+
+      pragma[nomagic]
+      private Type getNonPseudoTypeAt2(
+        App app, TypeAbstraction abs, Constraint constraint, TypeParameter tp, TypePath path
+      ) {
+        hasTypeParameterAt(app, abs, constraint, path, tp) and
+        result = getNonPseudoTypeAt(app, path)
+      }
+
       /**
        * Holds if `app` is _not_ a possible instantiation of `constraint`, because `app`
        * and `constraint` differ on concrete types at `path`.
@@ -649,22 +680,16 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
         exists(Type t, Type t2 |
           t = getTypeAt(app, abs, constraint, path) and
           not t = abs.getATypeParameter() and
-          app.getTypeAt(path) = t2 and
-          not isPseudoType(t2) and
+          t2 = getNonPseudoTypeAt(app, path) and
           t2 != t
         )
         or
         // satisfiesConcreteTypes(app, abs, constraint) and
         exists(TypeParameter tp, TypePath path2, Type t, Type t2 |
-          tp = getTypeAt(app, abs, constraint, path) and
-          tp = getTypeAt(app, abs, constraint, path2) and
-          tp = abs.getATypeParameter() and
-          path != path2 and
-          app.getTypeAt(path) = t and
-          app.getTypeAt(path2) = t2 and
-          not isPseudoType(t) and
-          not isPseudoType(t2) and
-          t != t2
+          t = getNonPseudoTypeAt2(app, abs, constraint, tp, path) and
+          t2 = getNonPseudoTypeAt2(app, abs, constraint, tp, path2) and
+          t != t2 and
+          path != path2
         )
       }
     }
@@ -1030,10 +1055,9 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
           ambiguous = true
           or
           forall(TypePath prefix, TypeAbstraction other |
-            typeAbstractionHasAmbiguousConstraintAt(abs, constraintRoot, other, prefix)
+            typeAbstractionHasAmbiguousConstraintAt(abs, constraintRoot, other, prefix) and
+            prefix.isPrefixOf(path)
           |
-            not prefix.isPrefixOf(path)
-            or
             TermIsInstantiationOfCondition::isNotInstantiationOf(term, other, _, _)
           ) and
           ambiguous = false