Java: Final rewrites to get things to compile

The equivalence relation needed for range analysis
is now on underlying `ExprParent`s, as `BasicBlock` is now an IPA type and ids are opaque.

Author: yoff

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

@@ -160,6 +160,12 @@ module ControlFlow {
       result = this.asStmt().getLocation() or
       result = this.(ExitNode).getEnclosingCallable().getLocation()
     }
+
+    ExprParent getAstNode() {
+      result = this.asExpr() or
+      result = this.asStmt() or
+      this = TExitNode(result)
+    }
   }
 
   class ExitNode extends Node, TExitNode { }
@@ -754,7 +760,7 @@ private module ControlFlowGraphImpl {
     or
     result.asExpr() = n and n instanceof WhenExpr
     or
-    result.asExpr() = n and n instanceof WhenBranch
+    result.asStmt() = n and n instanceof WhenBranch
     or
     result.asExpr() = n and n instanceof StmtExpr
     or

java/ql/lib/semmle/code/java/dataflow/RangeAnalysis.qll

@@ -211,9 +211,11 @@ module Sem implements Semantic {
 
   BasicBlock getABasicBlockSuccessor(BasicBlock bb) { result = bb.getABBSuccessor() }
 
-  private predicate id(BasicBlock x, BasicBlock y) { x = y }
+  private predicate id(ExprParent x, ExprParent y) { x = y }
 
-  private predicate idOf(BasicBlock x, int y) = equivalenceRelation(id/2)(x, y)
+  private predicate idOfAst(ExprParent x, int y) = equivalenceRelation(id/2)(x, y)
+
+  private predicate idOf(BasicBlock x, int y) { idOfAst(x.getAstNode(), y) }
 
   int getBlockId1(BasicBlock bb) { idOf(bb, result) }
 

java/ql/lib/semmle/code/java/dataflow/internal/rangeanalysis/ModulusAnalysisSpecific.qll

@@ -133,5 +133,5 @@ module Private {
 
   predicate ssaUpdateStep = RU::ssaUpdateStep/3;
 
-  Expr getABasicBlockExpr(BasicBlock bb) { result = bb.getANode() }
+  Expr getABasicBlockExpr(BasicBlock bb) { result = bb.getANode().asExpr() }
 }

java/ql/lib/semmle/code/java/dataflow/internal/rangeanalysis/SsaReadPositionSpecific.qll

@@ -15,9 +15,11 @@ class BasicBlock = BB::BasicBlock;
 /** Gets a basic block in which SSA variable `v` is read. */
 BasicBlock getAReadBasicBlock(SsaVariable v) { result = v.getAUse().getBasicBlock() }
 
-private predicate id(BasicBlock x, BasicBlock y) { x = y }
+private predicate id(BB::ExprParent x, BB::ExprParent y) { x = y }
 
-private predicate idOf(BasicBlock x, int y) = equivalenceRelation(id/2)(x, y)
+private predicate idOfAst(BB::ExprParent x, int y) = equivalenceRelation(id/2)(x, y)
+
+private predicate idOf(BasicBlock x, int y) { idOfAst(x.getAstNode(), y) }
 
 private int getId(BasicBlock bb) { idOf(bb, result) }