Merge pull request #8508 from igfoo/igfoo/error_elements

Java: Add ErrorExpr, ErrorStmt

Author: smowton

java/ql/lib/change-notes/2022-03-16-error-elements.md

@@ -0,0 +1,4 @@
+---
+category: feature
+---
+* There are now QL classes ErrorExpr and ErrorStmt. These may be generated by upgrade or downgrade scripts when databases cannot be fully converted.

java/ql/lib/config/semmlecode.dbscheme

@@ -528,6 +528,7 @@ case @stmt.kind of
 | 21 = @case
 | 22 = @catchclause
 | 23 = @yieldstmt
+| 24 = @errorstmt
 ;
 
 #keyset[parent,idx]
@@ -628,6 +629,7 @@ case @expr.kind of
 | 71  = @typeannotation
 | 72  = @intersectiontypeaccess
 | 73  = @switchexpr
+| 74  = @errorexpr
 ;
 
 @classinstancexpr = @newexpr | @lambdaexpr | @memberref

java/ql/lib/config/semmlecode.dbscheme.stats

@@ -1,5 +1,6 @@
 <dbstats>
-  <typesizes><e>
+    <typesizes>
+        <e>
             <k>@compilation</k>
             <v>8629</v>
         </e>
@@ -21,7 +22,7 @@
         </e>
         <e>
             <k>@location_default</k>
-            <v>13306607</v>
+            <v>17430587</v>
         </e>
         <e>
             <k>@file</k>
@@ -149,7 +150,7 @@
         </e>
         <e>
             <k>@emptystmt</k>
-            <v>886</v>
+            <v>1562</v>
         </e>
         <e>
             <k>@exprstmt</k>
@@ -191,6 +192,10 @@
             <k>@yieldstmt</k>
             <v>1</v>
         </e>
+        <e>
+            <k>@errorstmt</k>
+            <v>1</v>
+        </e>
         <e>
             <k>@arrayaccess</k>
             <v>181399</v>
@@ -265,7 +270,7 @@
         </e>
         <e>
             <k>@mulexpr</k>
-            <v>85898</v>
+            <v>204610</v>
         </e>
         <e>
             <k>@divexpr</k>
@@ -281,7 +286,7 @@
         </e>
         <e>
             <k>@subexpr</k>
-            <v>57171</v>
+            <v>84397</v>
         </e>
         <e>
             <k>@lshiftexpr</k>
@@ -483,6 +488,10 @@
             <k>@switchexpr</k>
             <v>1</v>
         </e>
+        <e>
+            <k>@errorexpr</k>
+            <v>1</v>
+        </e>
         <e>
             <k>@localvar</k>
             <v>385335</v>
@@ -519,10 +528,6 @@
             <k>@javadocTag</k>
             <v>335863</v>
         </e>
-        <e>
-            <k>@javadocText</k>
-            <v>2503256</v>
-        </e>
         <e>
             <k>@xmldtd</k>
             <v>569</v>
@@ -531,6 +536,10 @@
             <k>@xmlelement</k>
             <v>1199832</v>
         </e>
+        <e>
+            <k>@javadocText</k>
+            <v>2503256</v>
+        </e>
         <e>
             <k>@xmlattribute</k>
             <v>1841492</v>
@@ -560,7 +569,8 @@
             <v>1</v>
         </e>
     </typesizes>
-  <stats><relation>
+    <stats>
+        <relation>
             <name>compilations</name>
             <cardinality>8629</cardinality>
             <columnsizes>
@@ -16749,11 +16759,11 @@
         </relation>
         <relation>
             <name>isParenthesized</name>
-            <cardinality>84274</cardinality>
+            <cardinality>94666</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>84274</v>
+                    <v>94666</v>
                 </e>
                 <e>
                     <k>parentheses</k>
@@ -16771,7 +16781,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>84274</v>
+                                    <v>94666</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16785,13 +16795,13 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>12</a>
-                                    <b>13</b>
+                                    <a>58</a>
+                                    <b>59</b>
                                     <v>2</v>
                                 </b>
                                 <b>
-                                    <a>31863</a>
-                                    <b>31864</b>
+                                    <a>34605</a>
+                                    <b>34606</b>
                                     <v>2</v>
                                 </b>
                             </bs>

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

@@ -377,6 +377,18 @@ class CompileTimeConstantExpr extends Expr {
 /** An expression parent is an element that may have an expression as its child. */
 class ExprParent extends @exprparent, Top { }
 
+/**
+ * An error expression.
+ *
+ * These may be generated by upgrade or downgrade scripts when databases
+ * cannot be fully converted.
+ */
+class ErrorExpr extends Expr, @errorexpr {
+  override string toString() { result = "<error expr>" }
+
+  override string getAPrimaryQlClass() { result = "ErrorExpr" }
+}
+
 /**
  * An array access.
  *

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

@@ -59,6 +59,18 @@ class Stmt extends StmtParent, ExprParent, @stmt {
 /** A statement parent is any element that can have a statement as its child. */
 class StmtParent extends @stmtparent, Top { }
 
+/**
+ * An error statement.
+ *
+ * These may be generated by upgrade or downgrade scripts when databases
+ * cannot be fully converted.
+ */
+class ErrorStmt extends Stmt, @errorstmt {
+  override string toString() { result = "<error stmt>" }
+
+  override string getAPrimaryQlClass() { result = "ErrorStmt" }
+}
+
 /** A block of statements. */
 class BlockStmt extends Stmt, @block {
   /** Gets a statement that is an immediate child of this block. */