Java: Don't use BooleanSuccessor label for successors of boolean literals.

Author: aschackmull

java/ql/lib/semmle/code/java/controlflow/BasicBlocks.qll

@@ -19,8 +19,14 @@ private module Input implements BB::InputSig<Location> {
   /** Gets the CFG scope in which this node occurs. */
   CfgScope nodeGetCfgScope(Node node) { node.getEnclosingCallable() = result }
 
+  private Node getATrivialBooleanSuccessor(Node node) {
+    result = unique(Node n | n = node.(ConditionNode).getABranchSuccessor(_)) and
+    node.asExpr() instanceof BooleanLiteral
+  }
+
   private Node getASpecificSuccessor(Node node, SuccessorType t) {
-    node.(ConditionNode).getABranchSuccessor(t.(BooleanSuccessor).getValue()) = result
+    node.(ConditionNode).getABranchSuccessor(t.(BooleanSuccessor).getValue()) = result and
+    not result = getATrivialBooleanSuccessor(node)
     or
     node.getAnExceptionSuccessor() = result and t instanceof ExceptionSuccessor
   }