Update CodeQL submodule to v2.13.3 (#13)

* Update CodeQL submodule to v2.13.3

* Replace usage of deprecated CodeQL library classes

* Adjust getCompleteJavadocText expected test output due to CodeQL lib changes

---------

Co-authored-by: Marcono1234 <[email protected]>

Author: github-actions[bot]

codeql

@@ -18,7 +18,7 @@ from AndBitwiseExpr andExpr, BinaryExpr shiftExpr
 where
     shiftExpr.getLeftOperand() = andExpr
     and andExpr.getAnOperand() instanceof CompileTimeConstantExpr
-    and (shiftExpr instanceof RShiftExpr or shiftExpr instanceof URShiftExpr)
+    and (shiftExpr instanceof RightShiftExpr or shiftExpr instanceof UnsignedRightShiftExpr)
     // Only consider if shift distance is constant
     and shiftExpr.getRightOperand() instanceof CompileTimeConstantExpr
 select andExpr, "Should first perform shift and then apply bitmask"

codeql-custom-queries-java/queries/error-prone/bitmask-then-right-shift.ql

@@ -41,9 +41,9 @@ class ArithmeticKind extends BinaryExprKind {
 
 class ShiftKind extends BinaryExprKind {
     ShiftKind() {
-        this instanceof LShiftExpr
-        or this instanceof RShiftExpr
-        or this instanceof URShiftExpr
+        this instanceof LeftShiftExpr
+        or this instanceof RightShiftExpr
+        or this instanceof UnsignedRightShiftExpr
     }
 
     override predicate shouldBeParenthesized(BinaryExprKind op) {

codeql-custom-queries-java/queries/error-prone/mixed-binary-operators-without-parentheses.ql

@@ -36,12 +36,12 @@ class BitwiseExpr_ extends Expr {
         or this instanceof AssignAndExpr
         or this instanceof AssignOrExpr
         or this instanceof AssignXorExpr
-        or this instanceof LShiftExpr
-        or this instanceof AssignLShiftExpr
-        or this instanceof RShiftExpr
-        or this instanceof AssignRShiftExpr
-        or this instanceof URShiftExpr
-        or this instanceof AssignURShiftExpr
+        or this instanceof LeftShiftExpr
+        or this instanceof AssignLeftShiftExpr
+        or this instanceof RightShiftExpr
+        or this instanceof AssignRightShiftExpr
+        or this instanceof UnsignedRightShiftExpr
+        or this instanceof AssignUnsignedRightShiftExpr
     }
 }
 

codeql-custom-queries-java/queries/lib/Expressions.qll

@@ -133,14 +133,14 @@ class LeftShift extends Shift {
 
     LeftShift() {
         rightOperand = [
-            this.(LShiftExpr).getRightOperand(),
-            this.(AssignLShiftExpr).getRhs()
+            this.(LeftShiftExpr).getRightOperand(),
+            this.(AssignLeftShiftExpr).getRhs()
         ]
     }
 
     override
     Expr getLeftOperand() {
-        result = this.(LShiftExpr).getLeftOperand()
+        result = this.(LeftShiftExpr).getLeftOperand()
     }
 
     override
@@ -154,14 +154,14 @@ class RightShift extends Shift {
 
     RightShift() {
         rightOperand = [
-            this.(RShiftExpr).getRightOperand(),
-            this.(AssignRShiftExpr).getRhs()
+            this.(RightShiftExpr).getRightOperand(),
+            this.(AssignRightShiftExpr).getRhs()
         ]
     }
 
     override
     Expr getLeftOperand() {
-        result = this.(RShiftExpr).getLeftOperand()
+        result = this.(RightShiftExpr).getLeftOperand()
     }
 
     override
@@ -175,14 +175,14 @@ class URightShift extends Shift {
 
     URightShift() {
         rightOperand = [
-            this.(URShiftExpr).getRightOperand(),
-            this.(AssignURShiftExpr).getRhs()
+            this.(UnsignedRightShiftExpr).getRightOperand(),
+            this.(AssignUnsignedRightShiftExpr).getRhs()
         ]
     }
 
     override
     Expr getLeftOperand() {
-        result = this.(URShiftExpr).getLeftOperand()
+        result = this.(UnsignedRightShiftExpr).getLeftOperand()
     }
 
     override

codeql-custom-queries-java/queries/lib/Operations.qll

@@ -12,7 +12,7 @@ from AndBitwiseExpr andExpr, BinaryExpr shiftExpr, int bitmask, int firstBitmask
 where
     shiftExpr.getLeftOperand() = andExpr
     and bitmask = andExpr.getAnOperand().(CompileTimeConstantExpr).getIntValue()
-    and (shiftExpr instanceof RShiftExpr or shiftExpr instanceof URShiftExpr)
+    and (shiftExpr instanceof RightShiftExpr or shiftExpr instanceof UnsignedRightShiftExpr)
     and shiftDistance = shiftExpr.getRightOperand().(CompileTimeConstantExpr).getIntValue()
     and firstBitmaskBitIndex = [0..31]
     and bitmask.bitAnd(1.bitShiftLeft(firstBitmaskBitIndex)) != 0

codeql-custom-queries-java/queries/likely-bugs/bitmask-then-right-shift-selecting-wrong-bits.ql

@@ -37,12 +37,12 @@ class ShiftExpr extends Expr {
 
     ShiftExpr() {
         shiftDistance = [
-            this.(LShiftExpr).getRightOperand(),
-            this.(AssignLShiftExpr).getRhs(),
-            this.(RShiftExpr).getRightOperand(),
-            this.(AssignRShiftExpr).getRhs(),
-            this.(URShiftExpr).getRightOperand(),
-            this.(AssignURShiftExpr).getRhs()
+            this.(LeftShiftExpr).getRightOperand(),
+            this.(AssignLeftShiftExpr).getRhs(),
+            this.(RightShiftExpr).getRightOperand(),
+            this.(AssignRightShiftExpr).getRhs(),
+            this.(UnsignedRightShiftExpr).getRightOperand(),
+            this.(AssignUnsignedRightShiftExpr).getRhs()
         ]
     }
 

codeql-custom-queries-java/queries/likely-bugs/bitwise-shift-distance-out-of-range.ql

@@ -18,7 +18,7 @@ where
             loop.getCondition() = notZeroCheck
             and (
                 notZeroCheck.getAnOperand() = var.getAnAccess()
-                or notZeroCheck.getAnOperand().(AssignRShiftExpr) = shift
+                or notZeroCheck.getAnOperand().(AssignRightShiftExpr) = shift
             )
             and notZeroCheck.getAnOperand().(Literal).getValue() = "0"
         )
@@ -33,7 +33,7 @@ where
             )
             and (
                 bitAnd.getAnOperand() = var.getAnAccess()
-                or bitAnd.getAnOperand().(AssignRShiftExpr) = shift
+                or bitAnd.getAnOperand().(AssignRightShiftExpr) = shift
             )
         )
     )
@@ -43,10 +43,10 @@ where
         exists(AssignExpr assign |
             assign.getDest() = var.getAnAccess()
             and assign.getRhs() = shift
-            and shift.(RShiftExpr).getLeftOperand() = var.getAnAccess()
+            and shift.(RightShiftExpr).getLeftOperand() = var.getAnAccess()
             and assign.getAnEnclosingStmt() = loop
         )
         // Or `x >>= ...`
-        or shift.(AssignRShiftExpr).getDest() = var.getAnAccess()
+        or shift.(AssignRightShiftExpr).getDest() = var.getAnAccess()
     )
 select check, "Might result in endless loop due to $@", shift, "this signed right shift"

codeql-custom-queries-java/queries/likely-bugs/signed-rshift-on-loop-variable.ql

@@ -16,9 +16,9 @@ import java
 
 class ShiftExpr extends BinaryExpr {
     ShiftExpr() {
-        this instanceof LShiftExpr
-        or this instanceof RShiftExpr
-        or this instanceof URShiftExpr
+        this instanceof LeftShiftExpr
+        or this instanceof RightShiftExpr
+        or this instanceof UnsignedRightShiftExpr
     }
 }
 

codeql-custom-queries-java/queries/likely-bugs/wrong-shift-precedence.ql

@@ -21,14 +21,14 @@ class ShiftExpr extends Expr {
         exists(IntegralLiteral i | shiftDistance = i.getIntValue() |
             isLeftShift = true
             and i = [
-                this.(LShiftExpr).getRightOperand(),
-                this.(AssignLShiftExpr).getRhs()
+                this.(LeftShiftExpr).getRightOperand(),
+                this.(AssignLeftShiftExpr).getRhs()
             ]
             or
             isLeftShift = false
             and i = [
-                this.(RShiftExpr).getRightOperand(),
-                this.(AssignRShiftExpr).getRhs()
+                this.(RightShiftExpr).getRightOperand(),
+                this.(AssignRightShiftExpr).getRhs()
                 // Don't consider unsigned right shift because it is not equivalent to division
             ]
         )