Java/Cfg: Introduce new shared CFG library and replace the Java CFG.

java/ql/lib/semmle/code/java/dataflow/internal/BaseSSA.qll

@@ -93,8 +93,7 @@ private module BaseSsaImpl {
   /** Holds if `n` updates the local variable `v`. */
   predicate variableUpdate(BaseSsaSourceVariable v, ControlFlowNode n, BasicBlock b, int i) {
     exists(VariableUpdate a | a.getControlFlowNode() = n | getDestVar(a) = v) and
-    b.getNode(i) = n and
-    hasDominanceInformation(b)
+    b.getNode(i) = n
   }
 
   /** Gets the definition point of a nested class in the parent scope. */
@@ -178,15 +177,12 @@ private module SsaImplInput implements SsaImplCommon::InputSig<Location, BasicBl
    * Holds if the `i`th of basic block `bb` reads source variable `v`.
    */
   predicate variableRead(BasicBlock bb, int i, SourceVariable v, boolean certain) {
-    hasDominanceInformation(bb) and
-    (
-      exists(VarRead use |
-        v.getAnAccess() = use and bb.getNode(i) = use.getControlFlowNode() and certain = true
-      )
-      or
-      variableCapture(v, _, bb, i) and
-      certain = false
+    exists(VarRead use |
+      v.getAnAccess() = use and bb.getNode(i) = use.getControlFlowNode() and certain = true
     )
+    or
+    variableCapture(v, _, bb, i) and
+    certain = false
   }
 }
 

java/ql/lib/semmle/code/java/dataflow/internal/SsaImpl.qll

@@ -130,8 +130,7 @@ private predicate variableCapture(TrackedVar capturedvar, TrackedVar closurevar,
 pragma[nomagic]
 private predicate certainVariableUpdate(TrackedVar v, ControlFlowNode n, BasicBlock b, int i) {
   exists(VariableUpdate a | a.getControlFlowNode() = n | getDestVar(a) = v) and
-  b.getNode(i) = n and
-  hasDominanceInformation(b)
+  b.getNode(i) = n
   or
   certainVariableUpdate(v.getQualifier(), n, b, i)
 }
@@ -154,8 +153,7 @@ overlay[global]
 pragma[nomagic]
 private predicate uncertainVariableUpdateImpl(TrackedVar v, ControlFlowNode n, BasicBlock b, int i) {
   exists(Call c | c.getControlFlowNode() = n | updatesNamedField(c, v, _)) and
-  b.getNode(i) = n and
-  hasDominanceInformation(b)
+  b.getNode(i) = n
   or
   uncertainVariableUpdateImpl(v.getQualifier(), n, b, i)
 }
@@ -191,18 +189,15 @@ private module SsaImplInput implements SsaImplCommon::InputSig<Location, BasicBl
    * This includes implicit reads via calls.
    */
   predicate variableRead(BasicBlock bb, int i, SourceVariable v, boolean certain) {
-    hasDominanceInformation(bb) and
-    (
-      exists(VarRead use |
-        v instanceof TrackedVar and
-        v.getAnAccess() = use and
-        bb.getNode(i) = use.getControlFlowNode() and
-        certain = true
-      )
-      or
-      variableCapture(v, _, bb, i) and
-      certain = false
+    exists(VarRead use |
+      v instanceof TrackedVar and
+      v.getAnAccess() = use and
+      bb.getNode(i) = use.getControlFlowNode() and
+      certain = true
     )
+    or
+    variableCapture(v, _, bb, i) and
+    certain = false
   }
 }