Automated g4 rollback of changelist 260078354.

*** Reason for rollback *** TAP has detected 10 or more targets failed to build at [] TO ROLLFORWARD (without additional approval): Use [] and consider filing a [] To see all broken targets visit []or [] if the former is slow to load. To prevent noise from flakes, TAP double-checked the following target fails to build: [] but used to build fine: [] Questions? Comments? See the URL: [] *** Original change description *** Delete obsolete `Token`s REST and SPREAD. *** ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=260080186
google · Jul 26, 2019 · dc238d1 · dc238d1
1 parent 773f962
commit dc238d1
Show file tree

Hide file tree

Showing 33 changed files with 93 additions and 4 deletions.
diff --git a/src/com/google/javascript/jscomp/AmbiguateProperties.java b/src/com/google/javascript/jscomp/AmbiguateProperties.java
@@ -569,8 +569,10 @@ private void processObjectLitOrPattern(Node objectLit) {
             }
             break;
 
+          case REST:
           case ITER_REST:
           case OBJECT_REST:
+          case SPREAD:
           case ITER_SPREAD:
           case OBJECT_SPREAD:
             break; // Nothing to do.

diff --git a/src/com/google/javascript/jscomp/AnalyzePrototypeProperties.java b/src/com/google/javascript/jscomp/AnalyzePrototypeProperties.java
@@ -292,8 +292,10 @@ public void visit(NodeTraversal t, Node n, Node parent) {
           for (Node propNode = n.getFirstChild(); propNode != null; propNode = propNode.getNext()) {
             switch (propNode.getToken()) {
               case COMPUTED_PROP:
+              case REST:
               case ITER_REST:
               case OBJECT_REST:
+              case SPREAD:
               case ITER_SPREAD:
               case OBJECT_SPREAD:
                 break;

diff --git a/src/com/google/javascript/jscomp/AstAnalyzer.java b/src/com/google/javascript/jscomp/AstAnalyzer.java
@@ -261,8 +261,10 @@ private boolean checkForStateChangeHelper(Node n, boolean checkForNewObjects) {
         }
         break;
 
+      case REST:
       case ITER_REST:
       case OBJECT_REST:
+      case SPREAD:
       case ITER_SPREAD:
       case OBJECT_SPREAD:
         if (parent.isObjectPattern() || parent.isObjectLit()) {
@@ -506,8 +508,10 @@ boolean nodeTypeMayHaveSideEffects(Node n) {
         // A variable definition.
         // TODO(b/129564961): Consider EXPORT declarations.
         return n.hasChildren();
+      case REST:
       case ITER_REST:
       case OBJECT_REST:
+      case SPREAD:
       case ITER_SPREAD:
       case OBJECT_SPREAD:
         if (n.getParent().isObjectPattern() || n.getParent().isObjectLit()) {

diff --git a/src/com/google/javascript/jscomp/AstValidator.java b/src/com/google/javascript/jscomp/AstValidator.java
@@ -982,6 +982,7 @@ private void validateCall(Node n) {
     validateMinimumChildCount(n, 1);
     for (Node c = n.getFirstChild(); c != null; c = c.getNext()) {
       switch (c.getToken()) {
+        case SPREAD:
         case ITER_SPREAD:
           validateSpread(c);
           break;
@@ -1014,6 +1015,7 @@ private void validateObjectPatternRest(Token contextType, Node n) {
    */
   private void validateRest(Token contextType, Node n) {
     switch (n.getToken()) {
+      case REST:
       case ITER_REST:
       case OBJECT_REST:
         break;
@@ -1030,6 +1032,7 @@ private void validateRest(Token contextType, Node n) {
 
   private void validateSpread(Node n) {
     switch (n.getToken()) {
+      case SPREAD:
       case ITER_SPREAD:
       case OBJECT_SPREAD:
         break;
@@ -1064,6 +1067,7 @@ private void validateNew(Node n) {
     validateMinimumChildCount(n, 1);
     for (Node c = n.getFirstChild(); c != null; c = c.getNext()) {
       switch (c.getToken()) {
+        case SPREAD:
         case ITER_SPREAD:
           validateSpread(c);
           break;
@@ -1175,6 +1179,7 @@ private void validateArrayPattern(Token type, Node n) {
         case DEFAULT_VALUE:
           validateDefaultValue(type, c);
           break;
+        case REST:
         case ITER_REST:
           validateArrayPatternRest(type, c);
           break;
@@ -1195,6 +1200,7 @@ private void validateObjectPattern(Token type, Node n) {
         case STRING_KEY:
           validateObjectPatternStringKey(type, c);
           break;
+        case REST:
         case OBJECT_REST:
           validateObjectPatternRest(type, c);
           break;
@@ -1499,6 +1505,7 @@ private void validateArrayLit(Node n) {
     validateNodeType(Token.ARRAYLIT, n);
     for (Node c = n.getFirstChild(); c != null; c = c.getNext()) {
       switch (c.getToken()) {
+        case SPREAD:
         case ITER_SPREAD:
           validateSpread(c);
           break;
@@ -1537,6 +1544,7 @@ private void validateObjectLitKey(Node n) {
       case COMPUTED_PROP:
         validateObjectLitComputedPropKey(n);
         return;
+      case SPREAD:
       case OBJECT_SPREAD:
         validateSpread(n);
         return;

diff --git a/src/com/google/javascript/jscomp/CodeGenerator.java b/src/com/google/javascript/jscomp/CodeGenerator.java
@@ -404,13 +404,15 @@ protected void add(Node n, Context context) {
           }
           break;
         }
+      case REST:
       case ITER_REST:
       case OBJECT_REST:
         add("...");
         add(first);
         maybeAddTypeDecl(n);
         break;
 
+      case SPREAD:
       case ITER_SPREAD:
       case OBJECT_SPREAD:
         add("...");

diff --git a/src/com/google/javascript/jscomp/CollapseProperties.java b/src/com/google/javascript/jscomp/CollapseProperties.java
@@ -806,6 +806,7 @@ private void declareVariablesForObjLitValues(
         case GETTER_DEF:
         case SETTER_DEF:
         case COMPUTED_PROP:
+        case SPREAD:
         case OBJECT_SPREAD:
           continue;
         case STRING_KEY:

diff --git a/src/com/google/javascript/jscomp/CrossChunkReferenceCollector.java b/src/com/google/javascript/jscomp/CrossChunkReferenceCollector.java
@@ -384,6 +384,7 @@ private boolean canMoveValue(Scope scope, Node valueNode) {
               break;
 
             case STRING_KEY:
+            case SPREAD:
             case OBJECT_SPREAD:
               if (!canMoveValue(scope, child.getOnlyChild())) {
                 return false;

diff --git a/src/com/google/javascript/jscomp/DestructuredTarget.java b/src/com/google/javascript/jscomp/DestructuredTarget.java
@@ -210,6 +210,7 @@ static DestructuredTarget createTarget(
         builder.setDefaultValue(destructuringChild.getSecondChild());
         break;
 
+      case REST:
       case ITER_REST:
       case OBJECT_REST:
         // const [...x] = ...

diff --git a/src/com/google/javascript/jscomp/DisambiguateProperties.java b/src/com/google/javascript/jscomp/DisambiguateProperties.java
@@ -553,6 +553,7 @@ private void handleObjectLit(Node n) {
         switch (child.getToken()) {
           case COMPUTED_PROP:
             // These won't be renamed due to our assumptions. Ignore them.
+          case SPREAD:
           case OBJECT_SPREAD:
             // Ignore properties added via spread. All properties accessed from object literals are
             // invalidated regardless, so we don't have to explicitly do that here. Additionally,

diff --git a/src/com/google/javascript/jscomp/Es6RewriteRestAndSpread.java b/src/com/google/javascript/jscomp/Es6RewriteRestAndSpread.java
@@ -100,6 +100,7 @@ public void hotSwapScript(Node scriptRoot, Node originalRoot) {
   @Override
   public void visit(NodeTraversal traversal, Node current, Node parent) {
     switch (current.getToken()) {
+      case REST:
       case ITER_REST:
         visitRestParam(traversal, current, parent);
         break;

diff --git a/src/com/google/javascript/jscomp/Es6TypedToEs6Converter.java b/src/com/google/javascript/jscomp/Es6TypedToEs6Converter.java
@@ -159,6 +159,7 @@ public void visit(NodeTraversal t, Node n, Node parent) {
       case NAME:
         maybeVisitColonType(t, n, n);
         break;
+      case REST:
       case ITER_REST:
       case OBJECT_REST:
         maybeVisitColonType(t, n, n.getOnlyChild());

diff --git a/src/com/google/javascript/jscomp/GlobalNamespace.java b/src/com/google/javascript/jscomp/GlobalNamespace.java
@@ -405,6 +405,7 @@ private void collect(JSModule module, Scope scope, Node n) {
             case ARRAY_PATTERN:
             case DEFAULT_VALUE:
             case COMPUTED_PROP:
+            case REST:
             case ITER_REST:
             case OBJECT_REST:
               // This may be a set.
@@ -413,6 +414,7 @@ private void collect(JSModule module, Scope scope, Node n) {
                 type = Name.Type.OTHER;
               }
               break;
+            case SPREAD:
             case ITER_SPREAD:
             case OBJECT_SPREAD:
               break; // isSet = false, type = OTHER.
@@ -443,6 +445,7 @@ private void collect(JSModule module, Scope scope, Node n) {
                 return;
               case INC:
               case DEC:
+              case SPREAD:
               case ITER_SPREAD:
               case OBJECT_SPREAD:
                 break; // isSet = false, type = OTHER.
@@ -784,6 +787,7 @@ void handleGet(JSModule module, Scope scope, Node n, Node parent, String name) {
 
           break;
         case OBJECT_PATTERN: // Handle STRING_KEYS in object patterns.
+        case SPREAD:
         case ITER_SPREAD:
         case OBJECT_SPREAD:
         default:

diff --git a/src/com/google/javascript/jscomp/InlineObjectLiterals.java b/src/com/google/javascript/jscomp/InlineObjectLiterals.java
@@ -237,6 +237,7 @@ private boolean isInlinableObject(List<Reference> refs) {
             case COMPUTED_PROP:
               // Spread can overwrite any preceding prop if there are matching keys.
               // TODO(b/126567617): Allow inlining props declared after the SPREAD.
+            case SPREAD:
             case OBJECT_SPREAD:
               return false;
 

diff --git a/src/com/google/javascript/jscomp/MethodCompilerPass.java b/src/com/google/javascript/jscomp/MethodCompilerPass.java
@@ -212,6 +212,7 @@ public void visit(NodeTraversal t, Node n, Node parent) {
                 nonMethodProperties.add(key.getString());
                 break;
               case COMPUTED_PROP: // complicated
+              case SPREAD:
               case OBJECT_SPREAD:
                 break;
               default:

diff --git a/src/com/google/javascript/jscomp/NodeUtil.java b/src/com/google/javascript/jscomp/NodeUtil.java
@@ -704,6 +704,7 @@ public static boolean isLiteralValue(Node n, boolean includeFunctions) {
               }
               break;
 
+            case SPREAD:
             case OBJECT_SPREAD:
               if (!isLiteralValue(child.getOnlyChild(), includeFunctions)) {
                 return false;
@@ -1044,6 +1045,7 @@ static boolean iteratesImpureIterable(Node node) {
 
     final Node iterable;
     switch (node.getToken()) {
+      case SPREAD:
       case ITER_SPREAD:
       case OBJECT_SPREAD:
         switch (parent.getToken()) {
@@ -1072,6 +1074,7 @@ static boolean iteratesImpureIterable(Node node) {
         iterable = node.getSecondChild();
         break;
 
+      case REST:
       case ITER_REST:
       case OBJECT_REST:
         switch (parent.getToken()) {
@@ -1275,8 +1278,10 @@ public static int precedence(Token type) {
       case OBJECTLIT:
       case OBJECT_PATTERN:
       case REGEXP:
+      case REST:
       case ITER_REST:
       case OBJECT_REST:
+      case SPREAD:
       case ITER_SPREAD:
       case OBJECT_SPREAD:
       case STRING:
@@ -2910,6 +2915,7 @@ public static boolean isLValue(Node n) {
       case VAR:
       case LET:
       case CONST:
+      case REST:
       case ITER_REST:
       case OBJECT_REST:
       case PARAM_LIST:
@@ -3198,6 +3204,7 @@ private static boolean isLhsByDestructuringHelper(Node n) {
 
     switch (parent.getToken()) {
       case ARRAY_PATTERN: // `b` in `var [b] = ...`
+      case REST:
       case ITER_REST:
       case OBJECT_REST: // `b` in `var [...b] = ...`
         return true;
@@ -3850,6 +3857,7 @@ private static void getLhsNodesHelper(Node n, List<Node> lhsNodes) {
       case DESTRUCTURING_LHS:
       case DEFAULT_VALUE:
       case CATCH:
+      case REST:
       case ITER_REST:
       case OBJECT_REST:
       case CAST:
@@ -4748,6 +4756,7 @@ static boolean evaluatesToLocalValue(Node value) {
         return true;
       case CAST:
         return evaluatesToLocalValue(value.getFirstChild());
+      case SPREAD:
       case ITER_SPREAD:
       case OBJECT_SPREAD:
         // TODO(johnlenz): remove this case.

diff --git a/src/com/google/javascript/jscomp/OptimizeArgumentsArray.java b/src/com/google/javascript/jscomp/OptimizeArgumentsArray.java
@@ -285,6 +285,7 @@ private ImmutableSortedMap<Integer, String> assembleParamNames(Node paramList, i
           builder.put(index, param.getString());
           break;
 
+        case REST:
         case ITER_REST:
           return builder.build();
 

diff --git a/src/com/google/javascript/jscomp/OptimizeCalls.java b/src/com/google/javascript/jscomp/OptimizeCalls.java
@@ -421,7 +421,9 @@ public void visit(NodeTraversal t, Node n, Node unused) {
         case GETELEM:
           // Ignore quoted keys.
           // TODO(johnlenz): support symbols.
+        case REST:
         case OBJECT_REST:
+        case SPREAD:
         case OBJECT_SPREAD:
           // Don't worry about invisible accesses using these. To be invoked there would need to be
           // downstream references that use the actual name. We'd see those.

diff --git a/src/com/google/javascript/jscomp/OptimizeParameters.java b/src/com/google/javascript/jscomp/OptimizeParameters.java
@@ -796,6 +796,7 @@ private static boolean isMovableValue(Node n, Scope globalScope) {
     switch (n.getToken()) {
       case THIS:
       case SUPER:
+      case SPREAD:
       case ITER_SPREAD:
       case OBJECT_SPREAD:
         return false;

diff --git a/src/com/google/javascript/jscomp/PeepholeFoldConstants.java b/src/com/google/javascript/jscomp/PeepholeFoldConstants.java
@@ -1521,6 +1521,7 @@ private Node tryFoldObjectPropAccess(Node n, Node left, Node right) {
     Node value = null;
     for (Node c = left.getFirstChild(); c != null; c = c.getNext()) {
       switch (c.getToken()) {
+        case SPREAD:
         case OBJECT_SPREAD:
           // Reset the search because spread could overwrite any previous result.
           key = null;

diff --git a/src/com/google/javascript/jscomp/PeepholeRemoveDeadCode.java b/src/com/google/javascript/jscomp/PeepholeRemoveDeadCode.java
@@ -450,6 +450,7 @@ private boolean trySimplifyUnusedResultInternal(Node tree, ArrayDeque<Node> side
    */
   private static Node asDetachedExpression(Node expr) {
     switch (expr.getToken()) {
+      case SPREAD:
       case ITER_SPREAD:
       case OBJECT_SPREAD:
         switch (expr.getParent().getToken()) {

diff --git a/src/com/google/javascript/jscomp/PureFunctionIdentifier.java b/src/com/google/javascript/jscomp/PureFunctionIdentifier.java
@@ -804,8 +804,10 @@ private void updateSideEffectsForNode(
           deprecatedSetSideEffectsForControlLoss(encloserSummary);
           break;
 
+        case REST:
         case ITER_REST:
         case OBJECT_REST:
+        case SPREAD:
         case ITER_SPREAD:
         case OBJECT_SPREAD:
           if (node.getParent().isObjectPattern() || node.getParent().isObjectLit()) {

diff --git a/src/com/google/javascript/jscomp/Reference.java b/src/com/google/javascript/jscomp/Reference.java
@@ -216,6 +216,7 @@ public boolean isLvalue() {
       case INC:
       case DEC:
       case CATCH:
+      case REST:
       case ITER_REST:
       case OBJECT_REST:
       case PARAM_LIST:

diff --git a/src/com/google/javascript/jscomp/RemoveUnusedCode.java b/src/com/google/javascript/jscomp/RemoveUnusedCode.java
@@ -1074,6 +1074,7 @@ private void traverseIndirectAssignmentList(Node list, Scope scope) {
           traverseIndirectAssignment(elem, elem, scope);
           break;
 
+        case REST:
         case ITER_REST:
         case OBJECT_REST:
           traverseIndirectAssignment(elem, elem.getOnlyChild(), scope);
@@ -1480,6 +1481,7 @@ private static Node nameOfParam(Node param) {
         return param;
       case DEFAULT_VALUE:
         return nameOfParam(param.getFirstChild());
+      case REST:
       case ITER_REST:
         return nameOfParam(param.getOnlyChild());
       case ARRAY_PATTERN:

diff --git a/src/com/google/javascript/jscomp/RenameProperties.java b/src/com/google/javascript/jscomp/RenameProperties.java
@@ -351,7 +351,9 @@ public void visit(NodeTraversal t, Node n, Node parent) {
           for (Node key = n.getFirstChild(); key != null; key = key.getNext()) {
             switch (key.getToken()) {
               case COMPUTED_PROP: // We don't want to rename computed properties
+              case REST:
               case OBJECT_REST:
+              case SPREAD:
               case OBJECT_SPREAD:
                 break;
 

diff --git a/src/com/google/javascript/jscomp/RuntimeTypeCheck.java b/src/com/google/javascript/jscomp/RuntimeTypeCheck.java
@@ -446,6 +446,7 @@ private static void paramNamesOf(Node node, ImmutableList.Builder<Node> names) {
         names.add(node);
         break;
 
+      case REST:
       case OBJECT_REST:
       case ITER_REST:
       case DEFAULT_VALUE:

diff --git a/src/com/google/javascript/jscomp/TypeCheck.java b/src/com/google/javascript/jscomp/TypeCheck.java
@@ -920,6 +920,7 @@ public void visit(NodeTraversal t, Node n, Node parent) {
       case WHILE:
       case FOR:
       case TEMPLATELIT_SUB:
+      case REST:
       case ITER_REST:
       case OBJECT_REST:
       case DESTRUCTURING_LHS:

diff --git a/src/com/google/javascript/jscomp/TypeInference.java b/src/com/google/javascript/jscomp/TypeInference.java
@@ -725,6 +725,7 @@ private FlowScope traverse(Node n, FlowScope scope) {
         traverseSuper(n);
         break;
 
+      case SPREAD:
       case ITER_SPREAD:
       case OBJECT_SPREAD:
         // The spread itself has no type, but the expression it contains does and may affect