wip

Author: hvitved

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

@@ -2612,18 +2612,18 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
        * context, and also implements logic for performing contextual inference.
        */
       private module ContextualTyping {
+        pragma[nomagic]
+        private TypeParameter getAConstrained(TypeParameter tp) {
+          result = getATypeParameterConstraint(tp).getTypeAt(_)
+        }
+
         /**
          * Holds if parameterizable `p` mentions type parameter `tp` at some parameter,
          * possibly via a constraint on another mentioned type parameter.
          */
         pragma[nomagic]
         private predicate mentionsTypeParameterAtParameter(Parameterizable p, TypeParameter tp) {
-          tp = p.getParameter(_).getType().getTypeAt(_)
-          or
-          exists(TypeParameter mid |
-            mentionsTypeParameterAtParameter(p, mid) and
-            tp = getATypeParameterConstraint(mid).getTypeAt(_)
-          )
+          tp = getAConstrained*(p.getParameter(_).getType().getTypeAt(_))
         }
 
         /**
@@ -2674,9 +2674,12 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
             target = invocation.(InvocationMatchingGetTypeArgumentInput::Access).getTarget() and
             parameterizableReturnContextTypedAt(target, path, tp) and
             tp = target.getTypeParameter(_) and
-            // check that no explicit type arguments have been supplied for `tp`
-            not exists(
-              InvocationMatchingGetTypeArgument::getTypeArgument(invocation, target, tp, _)
+            // check that no explicit type arguments have been supplied which bind `tp`
+            not exists(TypeParameter supplied |
+              tp = getAConstrained*(supplied) and
+              exists(
+                InvocationMatchingGetTypeArgument::getTypeArgument(invocation, target, supplied, _)
+              )
             )
           )
         }