Java: Fix RangeAnalysis/ModulusAnalysis.

Author: aschackmull

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

@@ -220,6 +220,8 @@ module Sem implements Semantic<Location> {
 
   int getBlockId1(BasicBlock bb) { idOf(bb, result) }
 
+  string getBlockId2(BasicBlock bb) { bb.getFirstNode().getIdTag() = result }
+
   class Guard extends G::Guards_v2::Guard {
     Expr asExpr() { result = this }
   }

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

@@ -23,7 +23,9 @@ private predicate idOfAst(BB::ExprParent x, int y) = equivalenceRelation(id/2)(x
 
 private predicate idOf(BasicBlock x, int y) { idOfAst(x.getFirstNode().getAstNode(), y) }
 
-private int getId(BasicBlock bb) { idOf(bb, result) }
+private int getId1(BasicBlock bb) { idOf(bb, result) }
+
+private string getId2(BasicBlock bb) { bb.getFirstNode().getIdTag() = result }
 
 /**
  * Declarations to be exposed to users of SsaReadPositionCommon
@@ -39,7 +41,7 @@ module Public {
       rank[r](SsaReadPositionPhiInputEdge e |
         e.phiInput(phi, _)
       |
-        e order by getId(e.getOrigBlock())
+        e order by getId1(e.getOrigBlock()), getId2(e.getOrigBlock())
       )
   }
 }

shared/controlflow/codeql/controlflow/ControlFlowGraph.qll

@@ -689,6 +689,14 @@ module Make0<LocationSig Location, AstSig<Location> Ast> {
        */
       abstract AstNode getAstNode();
 
+      /**
+       * INTERNAL: Do not use.
+       *
+       * Gets a tag such that the pair `(getAstNode(), getIdTag())` uniquely
+       * identifies this node.
+       */
+      abstract string getIdTag();
+
       /** Gets a textual representation of this node. */
       abstract string toString();
 
@@ -710,6 +718,8 @@ module Make0<LocationSig Location, AstSig<Location> Ast> {
 
       override AstNode getAstNode() { result = n }
 
+      override string getIdTag() { result = "before" }
+
       override string toString() {
         if postOrInOrder(n) then result = "Before " + n.toString() else result = n.toString()
       }
@@ -722,6 +732,8 @@ module Make0<LocationSig Location, AstSig<Location> Ast> {
 
       override AstNode getAstNode() { result = n }
 
+      override string getIdTag() { result = "ast" }
+
       override string toString() { result = n.toString() }
     }
 
@@ -733,6 +745,12 @@ module Make0<LocationSig Location, AstSig<Location> Ast> {
 
       override AstNode getAstNode() { result = n }
 
+      override string getIdTag() {
+        t.getValue() = true and result = "after-true"
+        or
+        t.getValue() = false and result = "after-false"
+      }
+
       override string toString() { result = "After " + n.toString() + " [" + t.toString() + "]" }
     }
 
@@ -743,6 +761,8 @@ module Make0<LocationSig Location, AstSig<Location> Ast> {
 
       override AstNode getAstNode() { result = n }
 
+      override string getIdTag() { result = "after" }
+
       override string toString() { result = "After " + n.toString() }
     }
 
@@ -756,6 +776,8 @@ module Make0<LocationSig Location, AstSig<Location> Ast> {
 
       NormalSuccessor getSuccessorType() { additionalNode(n, tag, result) }
 
+      override string getIdTag() { result = "add. " + tag }
+
       override string toString() { result = tag + " " + n.toString() }
     }
 
@@ -768,6 +790,8 @@ module Make0<LocationSig Location, AstSig<Location> Ast> {
 
       override AstNode getAstNode() { result = c }
 
+      override string getIdTag() { result = "entry" }
+
       override string toString() { result = "Entry" }
     }
 
@@ -782,6 +806,12 @@ module Make0<LocationSig Location, AstSig<Location> Ast> {
 
       override AstNode getAstNode() { result = c }
 
+      override string getIdTag() {
+        normal = true and result = "exit-normal"
+        or
+        normal = false and result = "exit-exc"
+      }
+
       override string toString() {
         normal = true and result = "Normal Exit"
         or
@@ -809,6 +839,8 @@ module Make0<LocationSig Location, AstSig<Location> Ast> {
 
       override AstNode getAstNode() { result = c }
 
+      override string getIdTag() { result = "exit" }
+
       override string toString() { result = "Exit" }
     }