From f0a7cb80dbd2c277e9ce5031b215e52bbf93b245 Mon Sep 17 00:00:00 2001
From: stalcup <stalcup@google.com>
Date: Wed, 19 Apr 2017 12:08:56 -0700
Subject: [PATCH] Fixes change tracking in more passes and reenables tests.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=153616691
---
 .../jscomp/AggressiveInlineAliases.java       |  7 ++-
 .../jscomp/ClosureRewriteClass.java           |  9 ++--
 .../jscomp/ConvertToTypedInterface.java       | 47 ++++++++++---------
 .../jscomp/DevirtualizePrototypeMethods.java  |  1 +
 .../javascript/jscomp/Es6ConvertSuper.java    |  1 +
 .../Es6RewriteBlockScopedDeclaration.java     |  5 +-
 .../jscomp/Es6RewriteGenerators.java          |  2 +-
 .../javascript/jscomp/Es6ToEs3Converter.java  | 20 ++++----
 .../jscomp/JsdocToEs6TypedConverter.java      |  6 ++-
 .../google/javascript/jscomp/Normalize.java   | 10 ++--
 .../jscomp/AggressiveInlineAliasesTest.java   |  1 -
 .../jscomp/ClosureRewriteClassTest.java       |  1 -
 .../jscomp/ConvertToTypedInterfaceTest.java   |  5 --
 .../DevirtualizePrototypeMethodsTest.java     |  1 -
 .../javascript/jscomp/Es6InlineTypesTest.java |  1 -
 .../Es6RewriteBlockScopedDeclarationTest.java |  1 -
 .../jscomp/Es6RewriteGeneratorsTest.java      |  1 -
 .../jscomp/Es6ToEs3ConverterTest.java         |  1 -
 18 files changed, 62 insertions(+), 58 deletions(-)

diff --git a/src/com/google/javascript/jscomp/AggressiveInlineAliases.java b/src/com/google/javascript/jscomp/AggressiveInlineAliases.java
index 848f77ac1c6..18d1fc2b269 100644
--- a/src/com/google/javascript/jscomp/AggressiveInlineAliases.java
+++ b/src/com/google/javascript/jscomp/AggressiveInlineAliases.java
@@ -53,7 +53,8 @@ class AggressiveInlineAliases implements CompilerPass {
    * @param depth The chain depth.
    * @param newNodes Expression nodes that have been updated.
    */
-  private static void rewriteAliasProps(Name name, Node value, int depth, Set<AstChange> newNodes) {
+  private void rewriteAliasProps(
+      Name name, Node value, int depth, Set<AstChange> newNodes) {
     if (name.props == null) {
       return;
     }
@@ -85,7 +86,9 @@ private static void rewriteAliasProps(Name name, Node value, int depth, Set<AstC
           }
         }
         Preconditions.checkState(target.isGetProp() || target.isName());
-        target.replaceWith(value.cloneTree());
+        Node newValue = value.cloneTree();
+        target.replaceWith(newValue);
+        compiler.reportChangeToEnclosingScope(newValue);
         prop.removeRef(ref);
         // Rescan the expression root.
         newNodes.add(new AstChange(ref.module, ref.scope, ref.node));
diff --git a/src/com/google/javascript/jscomp/ClosureRewriteClass.java b/src/com/google/javascript/jscomp/ClosureRewriteClass.java
index f5cfa2bccca..2964acd0a2c 100644
--- a/src/com/google/javascript/jscomp/ClosureRewriteClass.java
+++ b/src/com/google/javascript/jscomp/ClosureRewriteClass.java
@@ -26,7 +26,6 @@
 import com.google.javascript.rhino.JSTypeExpression;
 import com.google.javascript.rhino.Node;
 import com.google.javascript.rhino.Token;
-
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
@@ -501,12 +500,16 @@ private void rewriteGoogDefineClass(Node exprRoot, final ClassDefinition cls) {
       Node argList = cls.classModifier.getSecondChild();
       Node arg = argList.getFirstChild();
       final String argName = arg.getString();
-      NodeTraversal.traverseEs6(compiler, cls.classModifier.getLastChild(),
+      NodeTraversal.traverseEs6(
+          compiler,
+          cls.classModifier.getLastChild(),
           new AbstractPostOrderCallback() {
             @Override
             public void visit(NodeTraversal t, Node n, Node parent) {
               if (n.isName() && n.getString().equals(argName)) {
-                parent.replaceChild(n, cls.name.cloneTree());
+                Node newName = cls.name.cloneTree();
+                parent.replaceChild(n, newName);
+                compiler.reportChangeToEnclosingScope(newName);
               }
             }
           });
diff --git a/src/com/google/javascript/jscomp/ConvertToTypedInterface.java b/src/com/google/javascript/jscomp/ConvertToTypedInterface.java
index 1017acba252..e7754299c1d 100644
--- a/src/com/google/javascript/jscomp/ConvertToTypedInterface.java
+++ b/src/com/google/javascript/jscomp/ConvertToTypedInterface.java
@@ -258,26 +258,27 @@ public boolean shouldTraverse(NodeTraversal t, Node n, Node parent) {
             currentFile.markNameProcessed(n.getFirstChild().getString());
           }
           break;
-        case FUNCTION: {
-          if (parent.isCall()) {
-            Preconditions.checkState(!parent.getFirstChild().matchesQualifiedName("goog.scope"),
-                parent);
-          }
-          if (NodeUtil.isStatementParent(parent)) {
-            currentFile.markNameProcessed(n.getFirstChild().getString());
-          }
-          processFunctionParameters(n.getSecondChild());
-          Node body = n.getLastChild();
-          if (body.isNormalBlock() && body.hasChildren()) {
-            if (isConstructor(n)) {
-              currentFile.markConstructorToProcess(n);
-              return false;
+        case FUNCTION:
+          {
+            if (parent.isCall()) {
+              Preconditions.checkState(
+                  !parent.getFirstChild().matchesQualifiedName("goog.scope"), parent);
             }
-            n.getLastChild().removeChildren();
-            compiler.reportCodeChange();
+            if (NodeUtil.isStatementParent(parent)) {
+              currentFile.markNameProcessed(n.getFirstChild().getString());
+            }
+            processFunctionParameters(n.getSecondChild());
+            Node body = n.getLastChild();
+            if (body.isNormalBlock() && body.hasChildren()) {
+              if (isConstructor(n)) {
+                currentFile.markConstructorToProcess(n);
+                return false;
+              }
+              body.removeChildren();
+              compiler.reportChangeToEnclosingScope(body);
+            }
+            break;
           }
-          break;
-        }
         case EXPR_RESULT:
           Node expr = n.getFirstChild();
           switch (expr.getToken()) {
@@ -384,7 +385,7 @@ public void visit(NodeTraversal t, Node n, Node parent) {
               parent.addChildBefore(initializer.detach(), body);
               processName(initializer.getFirstChild(), initializer);
             }
-            compiler.reportCodeChange();
+            compiler.reportChangeToEnclosingScope(parent);
             break;
           }
         case LABEL:
@@ -418,7 +419,7 @@ private void processFunctionParameters(Node paramList) {
           Node replacement = arg.getFirstChild().detach();
           arg.replaceWith(replacement);
           arg = replacement;
-          compiler.reportCodeChange();
+          compiler.reportChangeToEnclosingScope(replacement);
         }
       }
     }
@@ -457,7 +458,7 @@ public void visit(NodeTraversal t, Node n, Node parent) {
                 newProtoAssignStmt.useSourceInfoIfMissingFromForTree(expr);
                 // TODO(blickly): Preserve the declaration order of the this properties.
                 insertionPoint.getParent().addChildAfter(newProtoAssignStmt, insertionPoint);
-                compiler.reportCodeChange();
+                compiler.reportChangeToEnclosingScope(newProtoAssignStmt);
                 currentFile.markNameProcessed(fullyQualifiedName);
               }
             }
@@ -465,7 +466,7 @@ public void visit(NodeTraversal t, Node n, Node parent) {
       final Node functionBody = function.getLastChild();
       Preconditions.checkState(functionBody.isNormalBlock());
       functionBody.removeChildren();
-      compiler.reportCodeChange();
+      compiler.reportChangeToEnclosingScope(functionBody);
     }
 
     enum RemovalType {
@@ -550,12 +551,12 @@ private void processName(Node nameNode, Node statement) {
     }
 
     private void removeNode(Node n) {
+      compiler.reportChangeToEnclosingScope(n);
       if (NodeUtil.isStatement(n)) {
         n.detach();
       } else {
         n.replaceWith(IR.empty().srcref(n));
       }
-      compiler.reportCodeChange();
     }
 
     private void maybeRemoveRhs(Node nameNode, Node statement, JSDocInfo jsdoc) {
diff --git a/src/com/google/javascript/jscomp/DevirtualizePrototypeMethods.java b/src/com/google/javascript/jscomp/DevirtualizePrototypeMethods.java
index ace54933d63..d76c1fa8353 100644
--- a/src/com/google/javascript/jscomp/DevirtualizePrototypeMethods.java
+++ b/src/com/google/javascript/jscomp/DevirtualizePrototypeMethods.java
@@ -396,6 +396,7 @@ private void rewriteDefinition(Node node, String newMethodName) {
     Node argList = functionNode.getSecondChild();
     argList.addChildToFront(IR.name(self)
         .useSourceInfoIfMissingFrom(functionNode));
+    compiler.reportChangeToEnclosingScope(argList);
 
     // rewrite body
     Node body = functionNode.getLastChild();
diff --git a/src/com/google/javascript/jscomp/Es6ConvertSuper.java b/src/com/google/javascript/jscomp/Es6ConvertSuper.java
index 088553851b0..d6c5ad7f37f 100644
--- a/src/com/google/javascript/jscomp/Es6ConvertSuper.java
+++ b/src/com/google/javascript/jscomp/Es6ConvertSuper.java
@@ -100,6 +100,7 @@ private void addSyntheticConstructor(Node classNode) {
     }
     memberDef.useSourceInfoIfMissingFromForTree(classNode);
     classMembers.addChildToFront(memberDef);
+    compiler.reportChangeToEnclosingScope(memberDef);
   }
 
   private boolean isInterface(Node classNode) {
diff --git a/src/com/google/javascript/jscomp/Es6RewriteBlockScopedDeclaration.java b/src/com/google/javascript/jscomp/Es6RewriteBlockScopedDeclaration.java
index 134d824c284..1485f94e414 100644
--- a/src/com/google/javascript/jscomp/Es6RewriteBlockScopedDeclaration.java
+++ b/src/com/google/javascript/jscomp/Es6RewriteBlockScopedDeclaration.java
@@ -212,8 +212,8 @@ private void varify() {
   private class RewriteBlockScopedFunctionDeclaration extends AbstractPostOrderCallback {
     @Override
     public void visit(NodeTraversal t, Node n, Node parent) {
-      if (n.isFunction() && NormalizeStatements.maybeNormalizeFunctionDeclaration(n)) {
-        compiler.reportCodeChange();
+      if (n.isFunction()) {
+        NormalizeStatements.maybeNormalizeFunctionDeclaration(n, compiler);
       }
     }
   }
@@ -414,6 +414,7 @@ private void transformLoopClosure() {
                 reference.getParent().putBooleanProp(Node.FREE_CALL, false);
               }
               // Change reference to GETPROP.
+              compiler.reportChangeToEnclosingScope(reference);
               reference.replaceWith(
                   IR.getprop(IR.name(object.name), IR.string(var.name))
                       .useSourceInfoIfMissingFromForTree(reference));
diff --git a/src/com/google/javascript/jscomp/Es6RewriteGenerators.java b/src/com/google/javascript/jscomp/Es6RewriteGenerators.java
index 7389c6bc67f..ec90444a94d 100644
--- a/src/com/google/javascript/jscomp/Es6RewriteGenerators.java
+++ b/src/com/google/javascript/jscomp/Es6RewriteGenerators.java
@@ -307,7 +307,7 @@ private void visitGenerator(Node n, Node parent) {
     }
 
     parent.useSourceInfoIfMissingFromForTree(parent);
-    compiler.reportCodeChange();
+    compiler.reportChangeToEnclosingScope(genBlock);
   }
 
   /** Returns {@code true} if a new case node should be added */
diff --git a/src/com/google/javascript/jscomp/Es6ToEs3Converter.java b/src/com/google/javascript/jscomp/Es6ToEs3Converter.java
index 2424afb466c..c7e3855b9a5 100644
--- a/src/com/google/javascript/jscomp/Es6ToEs3Converter.java
+++ b/src/com/google/javascript/jscomp/Es6ToEs3Converter.java
@@ -216,7 +216,7 @@ private void initSymbolBefore(Node n) {
     Node statement = NodeUtil.getEnclosingStatement(n);
     Node initSymbol = IR.exprResult(IR.call(NodeUtil.newQName(compiler, "$jscomp.initSymbol")));
     statement.getParent().addChildBefore(initSymbol.useSourceInfoFromForTree(statement), statement);
-    compiler.reportCodeChange();
+    compiler.reportChangeToEnclosingScope(initSymbol);
   }
 
   private void visitExponentiationExpression(Node n, Node parent) {
@@ -226,7 +226,7 @@ private void visitExponentiationExpression(Node n, Node parent) {
         IR.call(NodeUtil.newQName(compiler, "Math.pow"), left, right)
             .useSourceInfoIfMissingFromForTree(n);
     parent.replaceChild(n, mathDotPowCall);
-    compiler.reportCodeChange();
+    compiler.reportChangeToEnclosingScope(mathDotPowCall);
   }
 
   private void visitExponentiationAssignmentExpression(Node n, Node parent) {
@@ -235,7 +235,7 @@ private void visitExponentiationAssignmentExpression(Node n, Node parent) {
     Node mathDotPowCall = IR.call(NodeUtil.newQName(compiler, "Math.pow"), left.cloneTree(), right);
     Node assign = IR.assign(left, mathDotPowCall).useSourceInfoIfMissingFromForTree(n);
     parent.replaceChild(n, assign);
-    compiler.reportCodeChange();
+    compiler.reportChangeToEnclosingScope(assign);
   }
 
   // TODO(tbreisacher): Do this for all well-known symbols.
@@ -248,7 +248,7 @@ private void visitGetprop(NodeTraversal t, Node n) {
       Node statement = NodeUtil.getEnclosingStatement(n);
       Node init = IR.exprResult(IR.call(NodeUtil.newQName(compiler, "$jscomp.initSymbolIterator")));
       statement.getParent().addChildBefore(init.useSourceInfoFromForTree(statement), statement);
-      compiler.reportCodeChange();
+      compiler.reportChangeToEnclosingScope(init);
     }
   }
 
@@ -261,7 +261,7 @@ private void visitMemberFunctionDefInObjectLit(Node n, Node parent) {
     Node stringKey = IR.stringKey(name, n.getFirstChild().detach());
     stringKey.setJSDocInfo(n.getJSDocInfo());
     parent.replaceChild(n, stringKey);
-    compiler.reportCodeChange();
+    compiler.reportChangeToEnclosingScope(stringKey);
   }
 
   /**
@@ -273,7 +273,7 @@ private void visitStringKey(Node n) {
       Node name = IR.name(n.getString());
       name.useSourceInfoIfMissingFrom(n);
       n.addChildToBack(name);
-      compiler.reportCodeChange();
+      compiler.reportChangeToEnclosingScope(name);
     }
   }
 
@@ -327,7 +327,7 @@ private void visitForOf(Node node, Node parent) {
     Node newFor = IR.forNode(init, cond, incr, newBody);
     newFor.useSourceInfoIfMissingFromForTree(node);
     parent.replaceChild(node, newFor);
-    compiler.reportCodeChange();
+    compiler.reportChangeToEnclosingScope(newFor);
   }
 
   private void checkClassReassignment(Node clazz) {
@@ -410,7 +410,7 @@ private void visitRestParam(Node restParam, Node paramList) {
     functionBody.addChildAfter(IR.forNode(init, cond, incr, body)
         .useSourceInfoIfMissingFromForTree(restParam), newArr);
     functionBody.addChildToBack(newBlock);
-    compiler.reportCodeChange();
+    compiler.reportChangeToEnclosingScope(newBlock);
 
     // For now, we are running transpilation before type-checking, so we'll
     // need to make sure changes don't invalidate the JSDoc annotations.
@@ -487,7 +487,7 @@ private void visitArrayLitOrCallWithSpread(Node node, Node parent) {
     }
     result.useSourceInfoIfMissingFromForTree(node);
     parent.replaceChild(node, result);
-    compiler.reportCodeChange();
+    compiler.reportChangeToEnclosingScope(result);
   }
 
   private void visitObject(Node obj) {
@@ -558,7 +558,7 @@ private void visitObjectWithComputedProperty(Node obj) {
     Node var = IR.var(IR.name(objName), obj);
     var.useSourceInfoIfMissingFromForTree(statement);
     statement.getParent().addChildBefore(var, statement);
-    compiler.reportCodeChange();
+    compiler.reportChangeToEnclosingScope(var);
   }
 
   /**
diff --git a/src/com/google/javascript/jscomp/JsdocToEs6TypedConverter.java b/src/com/google/javascript/jscomp/JsdocToEs6TypedConverter.java
index cb3f8afc9de..93ed510dcc8 100644
--- a/src/com/google/javascript/jscomp/JsdocToEs6TypedConverter.java
+++ b/src/com/google/javascript/jscomp/JsdocToEs6TypedConverter.java
@@ -112,7 +112,11 @@ private void setTypeExpression(Node n, JSTypeExpression type) {
     TypeDeclarationNode node = TypeDeclarationsIRFactory.convert(type);
     if (node != null) {
       n.setDeclaredTypeExpression(node);
-      compiler.reportChangeToEnclosingScope(n);
+      if (n.isFunction()) {
+        compiler.reportChangeToEnclosingScope(n.getFirstChild());
+      } else {
+        compiler.reportChangeToEnclosingScope(n);
+      }
     }
   }
 
diff --git a/src/com/google/javascript/jscomp/Normalize.java b/src/com/google/javascript/jscomp/Normalize.java
index fddd816d6d9..b6acb5ffe82 100644
--- a/src/com/google/javascript/jscomp/Normalize.java
+++ b/src/com/google/javascript/jscomp/Normalize.java
@@ -353,7 +353,7 @@ public void visit(NodeTraversal t, Node n, Node parent) {
           break;
 
         case FUNCTION:
-          if (maybeNormalizeFunctionDeclaration(n)) {
+          if (maybeNormalizeFunctionDeclaration(n, compiler)) {
             reportCodeChange(n, "Function declaration");
           }
           break;
@@ -423,10 +423,10 @@ private void annotateConstantsByConvention(Node n, Node parent) {
      *
      * @see https://github.com/google/closure-compiler/pull/429
      */
-    static boolean maybeNormalizeFunctionDeclaration(Node n) {
+    static boolean maybeNormalizeFunctionDeclaration(Node n, AbstractCompiler compiler) {
       Preconditions.checkState(n.isFunction(), n);
       if (NodeUtil.isFunctionDeclaration(n) && !NodeUtil.isHoistedFunctionDeclaration(n)) {
-        rewriteFunctionDeclaration(n);
+        rewriteFunctionDeclaration(n, compiler);
         return true;
       }
       return false;
@@ -448,7 +448,7 @@ static boolean maybeNormalizeFunctionDeclaration(Node n) {
      *         PARAM_LIST
      *         BLOCK
      */
-    private static void rewriteFunctionDeclaration(Node n) {
+    private static void rewriteFunctionDeclaration(Node n, AbstractCompiler compiler) {
       // Prepare a spot for the function.
       Node oldNameNode = n.getFirstChild();
       Node fnNameNode = oldNameNode.cloneNode();
@@ -456,6 +456,7 @@ private static void rewriteFunctionDeclaration(Node n) {
 
       // Prepare the function
       oldNameNode.setString("");
+      compiler.reportChangeToEnclosingScope(oldNameNode);
 
       // Move the function if it's not the child of a label node
       Node parent = n.getParent();
@@ -465,6 +466,7 @@ private static void rewriteFunctionDeclaration(Node n) {
         parent.removeChild(n);
         parent.addChildToFront(var);
       }
+      compiler.reportChangeToEnclosingScope(var);
       fnNameNode.addChildToFront(n);
     }
 
diff --git a/test/com/google/javascript/jscomp/AggressiveInlineAliasesTest.java b/test/com/google/javascript/jscomp/AggressiveInlineAliasesTest.java
index c61315d81ba..0db369f1bd8 100644
--- a/test/com/google/javascript/jscomp/AggressiveInlineAliasesTest.java
+++ b/test/com/google/javascript/jscomp/AggressiveInlineAliasesTest.java
@@ -43,7 +43,6 @@ public CompilerPass getProcessor(Compiler compiler) {
   @Override
   public void setUp() {
     enableNormalize();
-    validateAstChangeMarking(false);
   }
 
   public void test_b19179602() {
diff --git a/test/com/google/javascript/jscomp/ClosureRewriteClassTest.java b/test/com/google/javascript/jscomp/ClosureRewriteClassTest.java
index 1c837515280..880e4d68a8d 100644
--- a/test/com/google/javascript/jscomp/ClosureRewriteClassTest.java
+++ b/test/com/google/javascript/jscomp/ClosureRewriteClassTest.java
@@ -56,7 +56,6 @@ protected void setUp() throws Exception {
     disableTypeCheck();
     runTypeCheckAfterProcessing = true;
     compareJsDoc = true;
-    validateAstChangeMarking(false);
   }
 
   @Override
diff --git a/test/com/google/javascript/jscomp/ConvertToTypedInterfaceTest.java b/test/com/google/javascript/jscomp/ConvertToTypedInterfaceTest.java
index 5fb8acf5f64..67ee7bddf7a 100644
--- a/test/com/google/javascript/jscomp/ConvertToTypedInterfaceTest.java
+++ b/test/com/google/javascript/jscomp/ConvertToTypedInterfaceTest.java
@@ -24,11 +24,6 @@ protected CompilerPass getProcessor(final Compiler compiler) {
     return new ConvertToTypedInterface(compiler);
   }
 
-  @Override
-  public void setUp() {
-    validateAstChangeMarking(false);
-  }
-
   @Override
   protected int getNumRepetitions() {
     return 1;
diff --git a/test/com/google/javascript/jscomp/DevirtualizePrototypeMethodsTest.java b/test/com/google/javascript/jscomp/DevirtualizePrototypeMethodsTest.java
index fd128ae7e77..bc184438180 100644
--- a/test/com/google/javascript/jscomp/DevirtualizePrototypeMethodsTest.java
+++ b/test/com/google/javascript/jscomp/DevirtualizePrototypeMethodsTest.java
@@ -49,7 +49,6 @@ protected int getNumRepetitions() {
   protected void setUp() throws Exception {
     super.setUp();
     disableTypeCheck();
-    validateAstChangeMarking(false);
   }
 
   /**
diff --git a/test/com/google/javascript/jscomp/Es6InlineTypesTest.java b/test/com/google/javascript/jscomp/Es6InlineTypesTest.java
index ff6c9916f7a..bb0f8ca5ec3 100644
--- a/test/com/google/javascript/jscomp/Es6InlineTypesTest.java
+++ b/test/com/google/javascript/jscomp/Es6InlineTypesTest.java
@@ -29,7 +29,6 @@ public final class Es6InlineTypesTest extends CompilerTestCase {
   public void setUp() {
     setAcceptedLanguage(LanguageMode.ECMASCRIPT6_TYPED);
     compareJsDoc = false;
-    validateAstChangeMarking(false);
   }
 
   @Override
diff --git a/test/com/google/javascript/jscomp/Es6RewriteBlockScopedDeclarationTest.java b/test/com/google/javascript/jscomp/Es6RewriteBlockScopedDeclarationTest.java
index 495af5c6342..b92f70301be 100644
--- a/test/com/google/javascript/jscomp/Es6RewriteBlockScopedDeclarationTest.java
+++ b/test/com/google/javascript/jscomp/Es6RewriteBlockScopedDeclarationTest.java
@@ -32,7 +32,6 @@ public void setUp() {
     setAcceptedLanguage(LanguageMode.ECMASCRIPT_2015);
     runTypeCheckAfterProcessing = true;
     compareJsDoc = true;
-    validateAstChangeMarking(false);
   }
 
   @Override
diff --git a/test/com/google/javascript/jscomp/Es6RewriteGeneratorsTest.java b/test/com/google/javascript/jscomp/Es6RewriteGeneratorsTest.java
index 78fa976eb3b..72dafc9ab11 100644
--- a/test/com/google/javascript/jscomp/Es6RewriteGeneratorsTest.java
+++ b/test/com/google/javascript/jscomp/Es6RewriteGeneratorsTest.java
@@ -29,7 +29,6 @@ public void setUp() {
     setAcceptedLanguage(LanguageMode.ECMASCRIPT_2015);
     runTypeCheckAfterProcessing = true;
     compareJsDoc = true;
-    validateAstChangeMarking(false);
   }
 
   @Override
diff --git a/test/com/google/javascript/jscomp/Es6ToEs3ConverterTest.java b/test/com/google/javascript/jscomp/Es6ToEs3ConverterTest.java
index 1dc3852d142..f851857eb90 100644
--- a/test/com/google/javascript/jscomp/Es6ToEs3ConverterTest.java
+++ b/test/com/google/javascript/jscomp/Es6ToEs3ConverterTest.java
@@ -118,7 +118,6 @@ public void setUp() {
     setAcceptedLanguage(LanguageMode.ECMASCRIPT_2015);
     setLanguageOut(LanguageMode.ECMASCRIPT3);
     runTypeCheckAfterProcessing = true;
-    validateAstChangeMarking(false);
   }
 
   protected final PassFactory makePassFactory(