Fix guard basic block for switch cases

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

@@ -450,6 +450,20 @@ class SwitchCase extends Stmt, @case {
     result = this.getSwitch().getExpr() or result = this.getSwitchExpr().getExpr()
   }
 
+  /**
+   * Gets the `i`th case in this case's switch block.
+   */
+  SwitchCase getSiblingCase(int i) {
+    result = this.getSwitch().getCase(i) or result = this.getSwitchExpr().getCase(i)
+  }
+
+  /**
+   * Gets this case's ordinal in its switch block.
+   */
+  int getCaseIndex() {
+    this = this.getSwitch().getCase(result) or this = this.getSwitchExpr().getCase(result)
+  }
+
   /**
    * Holds if this `case` is a switch labeled rule of the form `... -> ...`.
    */