Merge pull request #6921 from igfoo/igfoo/types

Java: Replace @type with more specific types

Author: aschackmull

java/change-notes/2021-10-20-more-specific-types.md

@@ -0,0 +1,2 @@
+lgtm,codescanning
+* Some uses of `RefType` in the support for 'generics' and 'imports' now use the more specific `ClassOrInterface` instead

java/ql/lib/config/semmlecode.dbscheme

@@ -393,7 +393,7 @@ typeVars(
   string nodeName: string ref,
   int pos: int ref,
   int kind: int ref, // deprecated
-  int parentid: @typeorcallable ref
+  int parentid: @classorinterfaceorcallable ref
 );
 
 wildcards(
@@ -414,7 +414,7 @@ typeBounds(
 typeArgs(
   int argumentid: @reftype ref,
   int pos: int ref,
-  int parentid: @typeorcallable ref
+  int parentid: @classorinterfaceorcallable ref
 );
 
 isParameterized(
@@ -487,7 +487,7 @@ hasModifier(
 
 imports(
   unique int id: @import,
-  int holder: @typeorpackage ref,
+  int holder: @classorinterfaceorpackage ref,
   string name: string ref,
   int kind: int ref
 );
@@ -857,10 +857,9 @@ javadocText(
 @javadocParent = @javadoc | @javadocTag;
 @javadocElement = @javadocTag | @javadocText;
 
-@typeorpackage = @type | @package;
-
-@typeorcallable = @type | @callable;
 @classorinterface = @interface | @class;
+@classorinterfaceorpackage = @classorinterface | @package;
+@classorinterfaceorcallable = @classorinterface | @callable;
 @boundedtype = @typevariable | @wildcard;
 @reftype = @classorinterface | @array | @boundedtype;
 @classorarray = @class | @array;

java/ql/lib/semmle/code/java/Generics.qll

@@ -38,7 +38,7 @@ import Type
  *
  * For example, `X` in `class X<T> { }`.
  */
-class GenericType extends RefType {
+class GenericType extends ClassOrInterface {
   GenericType() { typeVars(_, _, _, _, this) }
 
   /**
@@ -139,7 +139,7 @@ abstract class BoundedType extends RefType, @boundedtype {
  */
 class TypeVariable extends BoundedType, @typevariable {
   /** Gets the generic type that is parameterized by this type parameter, if any. */
-  RefType getGenericType() { typeVars(this, _, _, _, result) }
+  GenericType getGenericType() { typeVars(this, _, _, _, result) }
 
   /** Gets the generic callable that is parameterized by this type parameter, if any. */
   GenericCallable getGenericCallable() { typeVars(this, _, _, _, result) }
@@ -321,7 +321,7 @@ class TypeBound extends @typebound {
  * For example, `List<Number>` is a parameterization of
  * the generic type `List<E>`, where `E` is a type parameter.
  */
-class ParameterizedType extends RefType {
+class ParameterizedType extends ClassOrInterface {
   ParameterizedType() {
     typeArgs(_, _, this) or
     typeVars(_, _, _, _, this)
@@ -367,7 +367,9 @@ class ParameterizedType extends RefType {
   }
 
   /** Holds if this type originates from source code. */
-  override predicate fromSource() { typeVars(_, _, _, _, this) and RefType.super.fromSource() }
+  override predicate fromSource() {
+    typeVars(_, _, _, _, this) and ClassOrInterface.super.fromSource()
+  }
 
   override string getAPrimaryQlClass() { result = "ParameterizedType" }
 }

java/ql/lib/semmle/code/java/Import.qll

@@ -25,7 +25,7 @@ class ImportType extends Import {
   ImportType() { imports(this, _, _, 1) }
 
   /** Gets the imported type. */
-  RefType getImportedType() { imports(this, result, _, _) }
+  ClassOrInterface getImportedType() { imports(this, result, _, _) }
 
   override string toString() { result = "import " + this.getImportedType().toString() }
 
@@ -44,7 +44,7 @@ class ImportOnDemandFromType extends Import {
   ImportOnDemandFromType() { imports(this, _, _, 2) }
 
   /** Gets the type from which accessible nested types are imported. */
-  RefType getTypeHoldingImport() { imports(this, result, _, _) }
+  ClassOrInterface getTypeHoldingImport() { imports(this, result, _, _) }
 
   /** Gets an imported type. */
   NestedType getAnImport() { result.getEnclosingType() = this.getTypeHoldingImport() }
@@ -87,7 +87,7 @@ class ImportStaticOnDemand extends Import {
   ImportStaticOnDemand() { imports(this, _, _, 4) }
 
   /** Gets the type from which accessible static members are imported. */
-  RefType getTypeHoldingImport() { imports(this, result, _, _) }
+  ClassOrInterface getTypeHoldingImport() { imports(this, result, _, _) }
 
   /** Gets an imported type. */
   NestedType getATypeImport() { result.getEnclosingType() = this.getTypeHoldingImport() }
@@ -118,7 +118,7 @@ class ImportStaticTypeMember extends Import {
   ImportStaticTypeMember() { imports(this, _, _, 5) }
 
   /** Gets the type from which static members with a given name are imported. */
-  RefType getTypeHoldingImport() { imports(this, result, _, _) }
+  ClassOrInterface getTypeHoldingImport() { imports(this, result, _, _) }
 
   /** Gets the name of the imported member(s). */
   override string getName() { imports(this, _, result, _) }