Type parameter scoping check: distinguish type arguments from type parameters

smowton · smowton · commit 048a530aacba · 2022-05-19T11:55:31.000+01:00
I had forgotten that the Java QL lib regards a ParameterizedType as either an instantiation Generic&lt;String&gt;, or the unbound declaration Generic&lt;T&gt;.
diff --git a/java/ql/consistency-queries/typeParametersInScope.ql b/java/ql/consistency-queries/typeParametersInScope.ql
@@ -1,11 +1,17 @@
 import java
 
+class InstantiatedType extends ParameterizedType {
+  InstantiatedType() {
+    typeArgs(_, _, this)
+  }
+}
+
 Type getAMentionedType(RefType type) {
   result = type
   or
   result = getAMentionedType(type).(Array).getElementType()
   or
-  result = getAMentionedType(type).(ParameterizedType).getATypeArgument()
+  result = getAMentionedType(type).(InstantiatedType).getATypeArgument()
   or
   result = getAMentionedType(type).(NestedType).getEnclosingType()
 }
@@ -29,7 +35,7 @@ TypeVariable getATypeVariableInScope(RefType type) {
   or
   result = type.(GenericType).getATypeParameter()
   or
-  result = getAMentionedType(type.(ParameterizedType).getATypeArgument())
+  result = getAMentionedType(type.(InstantiatedType).getATypeArgument())
   or
   result = getATypeVariableInScope(type.getEnclosingType())
 }
