Call extend only once

.gitignore

@@ -170,6 +170,9 @@ dataflow/tests/busy-expression/Out.txt
 dataflow/tests/busy-expression/*.class
 dataflow/tests/busyexpr/Out.txt
 dataflow/tests/busyexpr/*.class
+dataflow/tests/busyexpr/Test-test-int.dot
+dataflow/tests/busyexpr/Test-test-int.dot.pdf
+dataflow/tests/busyexpr/methods.txt
 dataflow/tests/cfgconstruction/*.class
 dataflow/tests/constant-propagation/Out.txt
 dataflow/tests/constant-propagation/*.class

dataflow/src/main/java/org/checkerframework/dataflow/cfg/builder/CFGTranslationPhaseOne.java

@@ -1954,12 +1954,14 @@ public Node visitCompoundAssignment(CompoundAssignmentTree tree, Void p) {
           Node operNode;
           if (kind == Tree.Kind.MULTIPLY_ASSIGNMENT) {
             operNode = new NumericalMultiplicationNode(operTree, targetRHS, value);
+            extendWithNode(operNode);
           } else if (kind == Tree.Kind.DIVIDE_ASSIGNMENT) {
             if (TypesUtils.isIntegralPrimitive(exprType)) {
               operNode = new IntegerDivisionNode(operTree, targetRHS, value);
               extendWithNodeWithException(operNode, arithmeticExceptionType);
             } else {
               operNode = new FloatingDivisionNode(operTree, targetRHS, value);
+              extendWithNode(operNode);
             }
           } else {
             assert kind == Tree.Kind.REMAINDER_ASSIGNMENT;
@@ -1968,9 +1970,9 @@ public Node visitCompoundAssignment(CompoundAssignmentTree tree, Void p) {
               extendWithNodeWithException(operNode, arithmeticExceptionType);
             } else {
               operNode = new FloatingRemainderNode(operTree, targetRHS, value);
+              extendWithNode(operNode);
             }
           }
-          extendWithNode(operNode);
 
           TypeMirror castType = TypeAnnotationUtils.unannotatedType(leftType);
           TypeCastTree castTree = treeBuilder.buildTypeCast(castType, operTree);
@@ -2167,6 +2169,7 @@ public Node visitBinary(BinaryTree tree, Void p) {
             if (TypesUtils.isIntegralPrimitive(exprType)) {
               r = new IntegerDivisionNode(tree, left, right);
               extendWithNodeWithException(r, arithmeticExceptionType);
+              return r;
             } else {
               r = new FloatingDivisionNode(tree, left, right);
             }
@@ -2175,6 +2178,7 @@ public Node visitBinary(BinaryTree tree, Void p) {
             if (TypesUtils.isIntegralPrimitive(exprType)) {
               r = new IntegerRemainderNode(tree, left, right);
               extendWithNodeWithException(r, arithmeticExceptionType);
+              return r;
             } else {
               r = new FloatingRemainderNode(tree, left, right);
             }
@@ -3119,7 +3123,7 @@ public Node visitEnhancedForLoop(EnhancedForLoopTree tree, Void p) {
       handleArtificialTree(lengthSelect);
       FieldAccessNode lengthAccessNode = new FieldAccessNode(lengthSelect, arrayNode1);
       lengthAccessNode.setInSource(false);
-      extendWithNode(lengthAccessNode);
+      extendWithNodeWithException(lengthAccessNode, nullPointerExceptionType);
 
       BinaryTree lessThan = treeBuilder.buildLessThan(indexUse1, lengthSelect);
       handleArtificialTree(lessThan);
@@ -3154,7 +3158,6 @@ public Node visitEnhancedForLoop(EnhancedForLoopTree tree, Void p) {
       extendWithNode(arrayAccessNode);
       AssignmentNode arrayAccessAssignNode =
           translateAssignment(variable, new LocalVariableNode(variable), arrayAccessNode);
-      extendWithNodeWithException(arrayAccessNode, nullPointerExceptionType);
       // translateAssignment() scans variable and creates new nodes, so set the expression
       // there, too.
       Node arrayAccessAssignNodeExpr = arrayAccessAssignNode.getExpression();

dataflow/src/test/java/busyexpr/BusyExpression.java

@@ -5,25 +5,34 @@
 import org.checkerframework.dataflow.analysis.UnusedAbstractValue;
 import org.checkerframework.dataflow.busyexpr.BusyExprStore;
 import org.checkerframework.dataflow.busyexpr.BusyExprTransfer;
+import org.checkerframework.dataflow.cfg.ControlFlowGraph;
 import org.checkerframework.dataflow.cfg.visualize.CFGVisualizeLauncher;
 
-/** Used in busyExpressionTest Gradle task to test the BusyExpression analysis. */
+/**
+ * Run busy expression analysis create a text file of the CFG.
+ *
+ * <p>Used in busyExpressionTest Gradle task to test the BusyExpression analysis.
+ */
 public class BusyExpression {
   /**
-   * The main method expects to be run in dataflow/tests/busy-expression directory.
+   * The main method expects to be run in the {@code dataflow/tests/busy-expression/} directory.
    *
-   * @param args not used
+   * @param args command-line arguments, not used
    */
   public static void main(String[] args) {
 
-    String inputFile = "Test.java"; // input file name;
+    String inputFile = "Test.java";
     String method = "test";
     String clazz = "Test";
     String outputFile = "Out.txt";
 
     BusyExprTransfer transfer = new BusyExprTransfer();
     BackwardAnalysis<UnusedAbstractValue, BusyExprStore, BusyExprTransfer> backwardAnalysis =
         new BackwardAnalysisImpl<>(transfer);
-    CFGVisualizeLauncher.writeStringOfCFG(inputFile, method, clazz, outputFile, backwardAnalysis);
+    ControlFlowGraph cfg =
+        CFGVisualizeLauncher.generateMethodCFG(inputFile, method, clazz, backwardAnalysis);
+    CFGVisualizeLauncher.writeStringOfCFG(cfg, outputFile, backwardAnalysis);
+    // The .dot and .pdf files are not tested, only created for debugging convenience.
+    CFGVisualizeLauncher.generateDOTofCFG(cfg, ".", true, true, backwardAnalysis);
   }
 }