Fixes change tracking in ProcessTweaks.

------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=153004831
google · Apr 13, 2017 · 9ec6262 · 9ec6262
1 parent eac8c5b
commit 9ec6262
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git a/src/com/google/javascript/jscomp/ProcessTweaks.java b/src/com/google/javascript/jscomp/ProcessTweaks.java
@@ -206,37 +206,32 @@ public void process(Node externs, Node root) {
     CollectTweaksResult result = collectTweaks(root);
     applyCompilerDefaultValueOverrides(result.tweakInfos);
 
-    boolean changed = false;
-
     if (stripTweaks) {
-      changed = stripAllCalls(result.tweakInfos);
+      stripAllCalls(result.tweakInfos);
     } else if (!compilerDefaultValueOverrides.isEmpty()) {
-      changed = replaceGetCompilerOverridesCalls(result.getOverridesCalls);
+      replaceGetCompilerOverridesCalls(result.getOverridesCalls);
-    }
-    if (changed) {
-      compiler.reportCodeChange();
     }
   }
 
   /**
    * Passes the compiler default value overrides to the JS by replacing calls
    * to goog.tweak.getCompilerOverrids_ with a map of tweak ID->default value;
    */
-  private boolean replaceGetCompilerOverridesCalls(
+  private void replaceGetCompilerOverridesCalls(
       List<TweakFunctionCall> calls) {
     for (TweakFunctionCall call : calls) {
       Node callNode = call.callNode;
       Node objNode = createCompilerDefaultValueOverridesVarNode(callNode);
       callNode.replaceWith(objNode);
+      compiler.reportChangeToEnclosingScope(objNode);
     }
-    return !calls.isEmpty();
   }
 
   /**
    * Removes all CALL nodes in the given TweakInfos, replacing calls to getter
    * functions with the tweak's default value.
    */
-  private boolean stripAllCalls(Map<String, TweakInfo> tweakInfos) {
+  private void stripAllCalls(Map<String, TweakInfo> tweakInfos) {
     for (TweakInfo tweakInfo : tweakInfos.values()) {
       boolean isRegistered = tweakInfo.isRegistered();
       for (TweakFunctionCall functionCall : tweakInfo.functionCalls) {
@@ -255,14 +250,15 @@ private boolean stripAllCalls(Map<String, TweakInfo> tweakInfos) {
             newValue = registerFunction.createDefaultValueNode();
           }
           parent.replaceChild(callNode, newValue);
+          compiler.reportChangeToEnclosingScope(parent);
         } else {
           Node voidZeroNode = IR.voidNode(IR.number(0).srcref(callNode))
               .srcref(callNode);
           parent.replaceChild(callNode, voidZeroNode);
+          compiler.reportChangeToEnclosingScope(parent);
         }
       }
     }
-    return !tweakInfos.isEmpty();
   }
 
   /**

diff --git a/test/com/google/javascript/jscomp/ProcessTweaksTest.java b/test/com/google/javascript/jscomp/ProcessTweaksTest.java
@@ -38,7 +38,6 @@ public ProcessTweaksTest() {
   @Override
   protected void setUp() throws Exception {
     super.setUp();
-    validateAstChangeMarking(false);
     defaultValueOverrides = new HashMap<>();
     stripTweaks = false;
   }