Merge pull request github#3210 from yo-h/java14-ql

yo-h · web-flow · commit b25b6f7992d1 · 2020-04-08T08:49:49.000-04:00
Java: dbscheme and library changes related to Java 14 extractor upgrade
diff --git a/docs/language/support/versions-compilers.rst b/docs/language/support/versions-compilers.rst
@@ -15,7 +15,7 @@
 
    .NET Core up to 3.0","``.sln``, ``.csproj``, ``.cs``, ``.cshtml``, ``.xaml``"
    Go (aka Golang), "Go up to 1.14", "Go 1.11 or more recent", ``.go``
-   Java,"Java 6 to 13 [4]_","javac (OpenJDK and Oracle JDK),
+   Java,"Java 6 to 14 [4]_","javac (OpenJDK and Oracle JDK),
 
    Eclipse compiler for Java (ECJ) [5]_",``.java``
    JavaScript,ECMAScript 2019 or lower,Not applicable,"``.js``, ``.jsx``, ``.mjs``, ``.es``, ``.es6``, ``.htm``, ``.html``, ``.xhm``, ``.xhtml``, ``.vue``, ``.json``, ``.yaml``, ``.yml``, ``.raml``, ``.xml`` [6]_"
@@ -27,7 +27,7 @@
     .. [1] Support for the clang-cl compiler is preliminary.
     .. [2] Support for the Arm Compiler (armcc) is preliminary.
     .. [3] In addition, support is included for the preview features of C# 8.0 and .NET Core 3.0.
-    .. [4] Builds that execute on Java 6 to 12 can be analyzed. The analysis understands Java 12 language features.
+    .. [4] Builds that execute on Java 6 to 14 can be analyzed. The analysis understands Java 14 standard language features.
     .. [5] ECJ is supported when the build invokes it via the Maven Compiler plugin or the Takari Lifecycle plugin.
     .. [6] JSX and Flow code, YAML, JSON, HTML, and XML files may also be analyzed with JavaScript files. 
     .. [7] TypeScript analysis is performed by running the JavaScript extractor with TypeScript enabled. This is the default for LGTM.   
diff --git a/java/ql/src/config/semmlecode.dbscheme b/java/ql/src/config/semmlecode.dbscheme
@@ -268,6 +268,10 @@ classes(
   int sourceid: @class ref
 );
 
+isRecord(
+  unique int id: @class ref
+);
+
 interfaces(
   unique int id: @interface,
   string nodeName: string ref,
diff --git a/java/ql/src/config/semmlecode.dbscheme.stats b/java/ql/src/config/semmlecode.dbscheme.stats
@@ -9263,6 +9263,17 @@
 </dependencies>
 </relation>
 <relation>
+<name>isRecord</name>
+<cardinality>100</cardinality>
+<columnsizes>
+<e>
+<k>id</k>
+<v>100</v>
+</e>
+</columnsizes>
+<dependencies/>
+</relation>
+<relation>
 <name>interfaces</name>
 <cardinality>249736</cardinality>
 <columnsizes>
diff --git a/java/ql/src/semmle/code/java/Expr.qll b/java/ql/src/semmle/code/java/Expr.qll
@@ -1076,8 +1076,6 @@ class ConditionalExpr extends Expr, @conditionalexpr {
 }
 
 /**
- * PREVIEW FEATURE in Java 13. Subject to removal in a future release.
- *
  * A `switch` expression.
  */
 class SwitchExpr extends Expr, @switchexpr {
@@ -1132,7 +1130,25 @@ deprecated class ParExpr extends Expr, @parexpr {
 /** An `instanceof` expression. */
 class InstanceOfExpr extends Expr, @instanceofexpr {
   /** Gets the expression on the left-hand side of the `instanceof` operator. */
-  Expr getExpr() { result.isNthChildOf(this, 0) }
+  Expr getExpr() {
+    if isPattern()
+    then result = getLocalVariableDeclExpr().getInit()
+    else result.isNthChildOf(this, 0)
+  }
+
+  /**
+   * PREVIEW FEATURE in Java 14. Subject to removal in a future release.
+   *
+   * Holds if this `instanceof` expression uses pattern matching.
+   */
+  predicate isPattern() { exists(getLocalVariableDeclExpr()) }
+
+  /**
+   * PREVIEW FEATURE in Java 14. Subject to removal in a future release.
+   *
+   * Gets the local variable declaration of this `instanceof` expression if pattern matching is used.
+   */
+  LocalVariableDeclExpr getLocalVariableDeclExpr() { result.isNthChildOf(this, 0) }
 
   /** Gets the access to the type on the right-hand side of the `instanceof` operator. */
   Expr getTypeName() { result.isNthChildOf(this, 1) }
@@ -1163,6 +1179,8 @@ class LocalVariableDeclExpr extends Expr, @localvariabledeclexpr {
     exists(ForStmt fs | fs.getAnInit() = this | result.isNthChildOf(fs, 0))
     or
     exists(EnhancedForStmt efs | efs.getVariable() = this | result.isNthChildOf(efs, -1))
+    or
+    exists(InstanceOfExpr ioe | this.getParent() = ioe | result.isNthChildOf(ioe, 1))
   }
 
   /** Gets the name of the variable declared by this local variable declaration expression. */
diff --git a/java/ql/src/semmle/code/java/Statement.qll b/java/ql/src/semmle/code/java/Statement.qll
@@ -417,8 +417,6 @@ class SwitchCase extends Stmt, @case {
   SwitchStmt getSwitch() { result.getACase() = this }
 
   /**
-   * PREVIEW FEATURE in Java 13. Subject to removal in a future release.
-   *
    * Gets the switch expression to which this case belongs, if any.
    */
   SwitchExpr getSwitchExpr() { result.getACase() = this }
@@ -432,8 +430,6 @@ class SwitchCase extends Stmt, @case {
   }
 
   /**
-   * PREVIEW FEATURE in Java 13. Subject to removal in a future release.
-   *
    * Holds if this `case` is a switch labeled rule of the form `... -> ...`.
    */
   predicate isRule() {
@@ -443,15 +439,11 @@ class SwitchCase extends Stmt, @case {
   }
 
   /**
-   * PREVIEW FEATURE in Java 13. Subject to removal in a future release.
-   *
    * Gets the expression on the right-hand side of the arrow, if any.
    */
   Expr getRuleExpression() { result.getParent() = this and result.getIndex() = -1 }
 
   /**
-   * PREVIEW FEATURE in Java 13. Subject to removal in a future release.
-   *
    * Gets the statement on the right-hand side of the arrow, if any.
    */
   Stmt getRuleStatement() { result.getParent() = this and result.getIndex() = -1 }
@@ -465,8 +457,6 @@ class ConstCase extends SwitchCase {
   Expr getValue() { result.getParent() = this and result.getIndex() = 0 }
 
   /**
-   * PREVIEW FEATURE in Java 13. Subject to removal in a future release.
-   *
    * Gets the `case` constant at the specified index.
    */
   Expr getValue(int i) { result.getParent() = this and result.getIndex() = i and i >= 0 }
@@ -624,8 +614,6 @@ class BreakStmt extends Stmt, @breakstmt {
 }
 
 /**
- * PREVIEW FEATURE in Java 13. Subject to removal in a future release.
- *
  * A `yield` statement.
  */
 class YieldStmt extends Stmt, @yieldstmt {
diff --git a/java/ql/src/semmle/code/java/Type.qll b/java/ql/src/semmle/code/java/Type.qll
@@ -615,6 +615,15 @@ class Class extends RefType, @class {
   }
 }
 
+/**
+ * PREVIEW FEATURE in Java 14. Subject to removal in a future release.
+ *
+ * A record declaration.
+ */
+class Record extends Class {
+  Record() { isRecord(this) }
+}
+
 /** An intersection type. */
 class IntersectionType extends RefType, @class {
   IntersectionType() {
diff --git a/java/ql/test/library-tests/guards12/options b/java/ql/test/library-tests/guards12/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args --enable-preview -source 13 -target 13
+//semmle-extractor-options: --javac-args -source 14 -target 14
diff --git a/java/ql/test/library-tests/structure/DeclaresMember.expected b/java/ql/test/library-tests/structure/DeclaresMember.expected
@@ -28,7 +28,6 @@
 | LocalClass | LocalClass |
 | LocalClass | n |
 | MemberClass | MemberClass |
-| Object | <clinit> |
 | Object | Object |
 | Object | clone |
 | Object | equals |
diff --git a/java/upgrades/054d7e823b2c5b93bf2a14d5c22a107934fbc133/old.dbscheme b/java/upgrades/054d7e823b2c5b93bf2a14d5c22a107934fbc133/old.dbscheme
diff --git a/java/upgrades/054d7e823b2c5b93bf2a14d5c22a107934fbc133/semmlecode.dbscheme b/java/upgrades/054d7e823b2c5b93bf2a14d5c22a107934fbc133/semmlecode.dbscheme
diff --git a/java/upgrades/054d7e823b2c5b93bf2a14d5c22a107934fbc133/upgrade.properties b/java/upgrades/054d7e823b2c5b93bf2a14d5c22a107934fbc133/upgrade.properties

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-//semmle-extractor-options: --javac-args --enable-preview -source 13 -target 13`
	`1`	`+//semmle-extractor-options: --javac-args -source 14 -target 14`