Call extend only once

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

@@ -1944,12 +1944,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;
@@ -1958,9 +1960,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);
@@ -2157,6 +2159,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);
             }
@@ -2165,6 +2168,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);
             }
@@ -3109,7 +3113,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);
@@ -3144,7 +3148,7 @@ public Node visitEnhancedForLoop(EnhancedForLoopTree tree, Void p) {
       extendWithNode(arrayAccessNode);
       AssignmentNode arrayAccessAssignNode =
           translateAssignment(variable, new LocalVariableNode(variable), arrayAccessNode);
-      extendWithNodeWithException(arrayAccessNode, nullPointerExceptionType);
+      extendWithNode(arrayAccessNode);
       // translateAssignment() scans variable and creates new nodes, so set the expression
       // there, too.
       Node arrayAccessAssignNodeExpr = arrayAccessAssignNode.getExpression();