Reduce code size

Author: mernst

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

@@ -1947,7 +1947,6 @@ public Node visitCompoundAssignment(CompoundAssignmentTree tree, Void p) {
           } 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);
@@ -1956,7 +1955,6 @@ public Node visitCompoundAssignment(CompoundAssignmentTree tree, Void p) {
             assert kind == Tree.Kind.REMAINDER_ASSIGNMENT;
             if (TypesUtils.isIntegralPrimitive(exprType)) {
               operNode = new IntegerRemainderNode(operTree, targetRHS, value);
-
               extendWithNodeWithException(operNode, arithmeticExceptionType);
             } else {
               operNode = new FloatingRemainderNode(operTree, targetRHS, value);
@@ -2133,7 +2131,7 @@ public Node visitBinary(BinaryTree tree, Void p) {
     // Note that for binary operations it is important to perform any required promotion on the
     // left operand before generating any Nodes for the right operand, because labels must be
     // inserted AFTER ALL preceding Nodes and BEFORE ALL following Nodes.
-    Node r = null;
+    Node r;
     Tree leftTree = tree.getLeftOperand();
     Tree rightTree = tree.getRightOperand();
 
@@ -2158,7 +2156,6 @@ public Node visitBinary(BinaryTree tree, Void p) {
           } else if (kind == Tree.Kind.DIVIDE) {
             if (TypesUtils.isIntegralPrimitive(exprType)) {
               r = new IntegerDivisionNode(tree, left, right);
-
               extendWithNodeWithException(r, arithmeticExceptionType);
             } else {
               r = new FloatingDivisionNode(tree, left, right);
@@ -2167,7 +2164,6 @@ public Node visitBinary(BinaryTree tree, Void p) {
             assert kind == Tree.Kind.REMAINDER;
             if (TypesUtils.isIntegralPrimitive(exprType)) {
               r = new IntegerRemainderNode(tree, left, right);
-
               extendWithNodeWithException(r, arithmeticExceptionType);
             } else {
               r = new FloatingRemainderNode(tree, left, right);
@@ -2247,21 +2243,17 @@ public Node visitBinary(BinaryTree tree, Void p) {
           Node left = binaryNumericPromotion(scan(leftTree, p), promotedType);
           Node right = binaryNumericPromotion(scan(rightTree, p), promotedType);
 
-          Node node;
           if (kind == Tree.Kind.GREATER_THAN) {
-            node = new GreaterThanNode(tree, left, right);
+            r = new GreaterThanNode(tree, left, right);
           } else if (kind == Tree.Kind.GREATER_THAN_EQUAL) {
-            node = new GreaterThanOrEqualNode(tree, left, right);
+            r = new GreaterThanOrEqualNode(tree, left, right);
           } else if (kind == Tree.Kind.LESS_THAN) {
-            node = new LessThanNode(tree, left, right);
+            r = new LessThanNode(tree, left, right);
           } else {
             assert kind == Tree.Kind.LESS_THAN_EQUAL;
-            node = new LessThanOrEqualNode(tree, left, right);
+            r = new LessThanOrEqualNode(tree, left, right);
           }
-
-          extendWithNode(node);
-
-          return node;
+          break;
         }
 
       case EQUAL_TO:
@@ -2289,16 +2281,13 @@ public Node visitBinary(BinaryTree tree, Void p) {
             right = unboxAsNeeded(right, rightInfo.isBoxed());
           }
 
-          Node node;
           if (kind == Tree.Kind.EQUAL_TO) {
-            node = new EqualToNode(tree, left, right);
+            r = new EqualToNode(tree, left, right);
           } else {
             assert kind == Tree.Kind.NOT_EQUAL_TO;
-            node = new NotEqualNode(tree, left, right);
+            r = new NotEqualNode(tree, left, right);
           }
-          extendWithNode(node);
-
-          return node;
+          break;
         }
 
       case AND:
@@ -2326,19 +2315,15 @@ public Node visitBinary(BinaryTree tree, Void p) {
             right = unbox(scan(rightTree, p));
           }
 
-          Node node;
           if (kind == Tree.Kind.AND) {
-            node = new BitwiseAndNode(tree, left, right);
+            r = new BitwiseAndNode(tree, left, right);
           } else if (kind == Tree.Kind.OR) {
-            node = new BitwiseOrNode(tree, left, right);
+            r = new BitwiseOrNode(tree, left, right);
           } else {
             assert kind == Tree.Kind.XOR;
-            node = new BitwiseXorNode(tree, left, right);
+            r = new BitwiseXorNode(tree, left, right);
           }
-
-          extendWithNode(node);
-
-          return node;
+          break;
         }
 
       case CONDITIONAL_AND:
@@ -2369,14 +2354,12 @@ public Node visitBinary(BinaryTree tree, Void p) {
 
           // conditional expression itself
           addLabelForNextNode(shortCircuitLabel);
-          Node node;
           if (kind == Tree.Kind.CONDITIONAL_AND) {
-            node = new ConditionalAndNode(tree, left, right);
+            r = new ConditionalAndNode(tree, left, right);
           } else {
-            node = new ConditionalOrNode(tree, left, right);
+            r = new ConditionalOrNode(tree, left, right);
           }
-          extendWithNode(node);
-          return node;
+          break;
         }
       default:
         throw new BugInCF("unexpected binary tree: " + kind);
@@ -2864,16 +2847,16 @@ private IPair<IdentifierTree, LocalVariableNode> buildVarUseNode(VariableTree va
   @Override
   public Node visitContinue(ContinueTree tree, Void p) {
     Name label = tree.getLabel();
+    UnconditionalJump uj;
     if (label == null) {
       assert continueTargetLC != null : "no target for continue statement";
-
-      extendWithExtendedNode(new UnconditionalJump(continueTargetLC.accessLabel()));
+      uj = new UnconditionalJump(continueTargetLC.accessLabel());
     } else {
       assert continueLabels.containsKey(label);
-
-      extendWithExtendedNode(new UnconditionalJump(continueLabels.get(label)));
+      uj = new UnconditionalJump(continueLabels.get(label));
     }
 
+    extendWithExtendedNode(uj);
     return null;
   }
 
@@ -3421,7 +3404,7 @@ public Node visitLabeledStatement(LabeledStatementTree tree, Void p) {
 
   @Override
   public Node visitLiteral(LiteralTree tree, Void p) {
-    Node r = null;
+    Node r;
     switch (tree.getKind()) {
       case BOOLEAN_LITERAL:
         r = new BooleanLiteralNode(tree);
@@ -3450,7 +3433,6 @@ public Node visitLiteral(LiteralTree tree, Void p) {
       default:
         throw new BugInCF("unexpected literal tree: " + tree);
     }
-    assert r != null : "unexpected literal tree";
     extendWithNode(r);
     return r;
   }
@@ -4169,7 +4151,7 @@ public Node visitInstanceOf(InstanceOfTree tree, Void p) {
 
   @Override
   public Node visitUnary(UnaryTree tree, Void p) {
-    Node result = null;
+    Node result;
     Tree.Kind kind = tree.getKind();
     switch (kind) {
       case BITWISE_COMPLEMENT:
@@ -4196,7 +4178,7 @@ public Node visitUnary(UnaryTree tree, Void p) {
               throw new BugInCF("Unexpected unary tree kind: " + kind);
           }
           extendWithNode(result);
-          break;
+          return result;
         }
 
       case LOGICAL_COMPLEMENT:
@@ -4205,7 +4187,7 @@ public Node visitUnary(UnaryTree tree, Void p) {
           Node expr = scan(tree.getExpression(), p);
           result = new ConditionalNotNode(tree, unbox(expr));
           extendWithNode(result);
-          break;
+          return result;
         }
 
       case POSTFIX_DECREMENT:
@@ -4249,13 +4231,12 @@ public Node visitUnary(UnaryTree tree, Void p) {
             result = new LocalVariableNode(resultExpr);
             result.setInSource(false);
             extendWithNode(result);
+            createIncrementOrDecrementAssign(tree, expr, isIncrement, isPostfix);
+          } else {
+            result = createIncrementOrDecrementAssign(tree, expr, isIncrement, isPostfix);
+            extendWithNode(result);
           }
-          AssignmentNode unaryAssign =
-              createIncrementOrDecrementAssign(tree, expr, isIncrement, isPostfix);
-          if (!isPostfix) {
-            result = unaryAssign;
-          }
-          break;
+          return result;
         }
 
       case OTHER:
@@ -4265,13 +4246,11 @@ public Node visitUnary(UnaryTree tree, Void p) {
           Node expr = scan(tree.getExpression(), p);
           result = new NullChkNode(tree, expr);
           extendWithNode(result);
-          break;
+          return result;
         }
 
         throw new BugInCF("Unknown kind (" + kind + ") of unary expression: " + tree);
     }
-
-    return result;
   }
 
   /**