wip

Author: hvitved

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

@@ -1183,7 +1183,7 @@ private module MethodCallResolution {
         forall(Impl impl, FunctionPositionType self |
           methodCandidate(rootType, name, arity, impl, self)
         |
-          IsInstantiationOf<MethodCallCand, FunctionPositionType, MethodCallIsInstantiationOfInput>::isNotInstantiationOfStrict(MkMethodCallCand(this,
+          IsInstantiationOf<MethodCallCand, FunctionPositionType, MethodCallIsInstantiationOfInput>::isNotInstantiationOf(MkMethodCallCand(this,
               derefChainBorrow), impl, self)
         )
       )
@@ -1199,7 +1199,7 @@ private module MethodCallResolution {
         forall(Impl impl, FunctionPositionType self |
           methodCandidate(rootType, name, arity, impl, self)
         |
-          IsInstantiationOf<MethodCallCand, FunctionPositionType, MethodCallIsInstantiationOfInput>::isNotInstantiationOfStrict(MkMethodCallCand(this,
+          IsInstantiationOf<MethodCallCand, FunctionPositionType, MethodCallIsInstantiationOfInput>::isNotInstantiationOf(MkMethodCallCand(this,
               derefChainBorrow), impl, self)
         )
       )

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

@@ -694,38 +694,8 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
         exists(Type t, TypePath path |
           t = resolveNthTypeAt(app, abs, tm, _, path) and
           not t = abs.getATypeParameter() and
-          not path.isEmpty() and
           app.getTypeAt(path) != t
         )
-        // or
-        // // `app` uses inconsistent type parameter instantiations
-        // exists(TypeParameter tp, Type t1, Type t2 |
-        //   potentialInstantiationOf(app, abs, tm) and
-        //   t1 = app.getTypeAt(getNthTypeParameterPath(tm, tp, _)) and
-        //   t2 = app.getTypeAt(getNthTypeParameterPath(tm, tp, _)) and
-        //   t1 != t2
-        // )
-      }
-
-      /**
-       * Holds if `app` is _not_ a possible instantiation of `tm`.
-       */
-      pragma[nomagic]
-      predicate isNotInstantiationOfStrict(App app, TypeAbstraction abs, Constraint tm) {
-        // `app` and `tm` differ on a concrete type
-        exists(Type t, TypePath path |
-          t = resolveNthTypeAt(app, abs, tm, _, path) and
-          not t = abs.getATypeParameter() and
-          app.getTypeAt(path) != t
-        )
-        // or
-        // // `app` uses inconsistent type parameter instantiations
-        // exists(TypeParameter tp, Type t1, Type t2 |
-        //   potentialInstantiationOf(app, abs, tm) and
-        //   t1 = app.getTypeAt(getNthTypeParameterPath(tm, tp, _)) and
-        //   t2 = app.getTypeAt(getNthTypeParameterPath(tm, tp, _)) and
-        //   t1 != t2
-        // )
       }
     }