Update script nodes' FEATURE_SET prop each time the compiler's featureset is updated

rishipal · copybara-github · commit eff812b86061 · 2023-07-31T18:21:55.000-07:00
Proposal - go/accurately-maintain-script-node-featureSet

PiperOrigin-RevId: 552647304
diff --git a/src/com/google/javascript/jscomp/ConvertChunksToESModules.java b/src/com/google/javascript/jscomp/ConvertChunksToESModules.java
@@ -123,7 +123,7 @@ public void process(Node externs, Node root) {
     addImportStatements();
     rewriteDynamicImportCallbacks();
 
-    compiler.setAllowableFeatures(compiler.getAllowableFeatures().with(FeatureSet.Feature.MODULES));
+    NodeUtil.addFeatureToAllScripts(root, FeatureSet.Feature.MODULES, compiler);
   }
 
   /**
diff --git a/src/com/google/javascript/jscomp/Es6ForOfConverter.java b/src/com/google/javascript/jscomp/Es6ForOfConverter.java
@@ -49,7 +49,7 @@ public Es6ForOfConverter(AbstractCompiler compiler) {
   @Override
   public void process(Node externs, Node root) {
     TranspilationPasses.processTranspile(compiler, root, transpiledFeatures, this);
-    TranspilationPasses.maybeMarkFeaturesAsTranspiledAway(compiler, transpiledFeatures);
+    TranspilationPasses.maybeMarkFeaturesAsTranspiledAway(compiler, root, transpiledFeatures);
   }
 
   @Override
diff --git a/src/com/google/javascript/jscomp/Es6NormalizeShorthandProperties.java b/src/com/google/javascript/jscomp/Es6NormalizeShorthandProperties.java
@@ -38,7 +38,7 @@ public Es6NormalizeShorthandProperties(AbstractCompiler compiler) {
   @Override
   public void process(Node externs, Node root) {
     TranspilationPasses.processTranspile(compiler, root, transpiledFeatures, this);
-    TranspilationPasses.maybeMarkFeaturesAsTranspiledAway(compiler, transpiledFeatures);
+    TranspilationPasses.maybeMarkFeaturesAsTranspiledAway(compiler, root, transpiledFeatures);
   }
 
   @Override
diff --git a/src/com/google/javascript/jscomp/Es6RewriteArrowFunction.java b/src/com/google/javascript/jscomp/Es6RewriteArrowFunction.java
@@ -49,7 +49,7 @@ public Es6RewriteArrowFunction(AbstractCompiler compiler) {
   @Override
   public void process(Node externs, Node root) {
     TranspilationPasses.processTranspile(compiler, root, transpiledFeatures, this);
-    TranspilationPasses.maybeMarkFeaturesAsTranspiledAway(compiler, transpiledFeatures);
+    TranspilationPasses.maybeMarkFeaturesAsTranspiledAway(compiler, root, transpiledFeatures);
   }
 
   @Override
diff --git a/src/com/google/javascript/jscomp/Es6RewriteBlockScopedDeclaration.java b/src/com/google/javascript/jscomp/Es6RewriteBlockScopedDeclaration.java
@@ -95,7 +95,7 @@ public void process(Node externs, Node root) {
     NodeTraversal.traverse(compiler, root, transformer);
     transformer.transformLoopClosure();
     rewriteDeclsToVars();
-    TranspilationPasses.maybeMarkFeaturesAsTranspiledAway(compiler, transpiledFeatures);
+    TranspilationPasses.maybeMarkFeaturesAsTranspiledAway(compiler, root, transpiledFeatures);
   }
 
   /**
diff --git a/src/com/google/javascript/jscomp/Es6RewriteBlockScopedFunctionDeclaration.java b/src/com/google/javascript/jscomp/Es6RewriteBlockScopedFunctionDeclaration.java
@@ -41,7 +41,7 @@ public Es6RewriteBlockScopedFunctionDeclaration(AbstractCompiler compiler) {
   @Override
   public void process(Node externs, Node root) {
     TranspilationPasses.processTranspile(compiler, root, transpiledFeatures, this);
-    TranspilationPasses.maybeMarkFeaturesAsTranspiledAway(compiler, transpiledFeatures);
+    TranspilationPasses.maybeMarkFeaturesAsTranspiledAway(compiler, root, transpiledFeatures);
   }
 
   @Override
diff --git a/src/com/google/javascript/jscomp/Es6RewriteClass.java b/src/com/google/javascript/jscomp/Es6RewriteClass.java
@@ -63,7 +63,7 @@ public Es6RewriteClass(AbstractCompiler compiler) {
 
   @Override
   public void process(Node externs, Node root) {
-    // TODO(b/171853310): This tranpilation should be turned off in externs
+    // TODO(b/171853310): This transpilation should be turned off in externs
     TranspilationPasses.processTranspile(compiler, externs, features, this);
     TranspilationPasses.processTranspile(compiler, root, features, this);
     // Super constructor calls are done all at once as a separate step largely for historical
@@ -73,7 +73,7 @@ public void process(Node externs, Node root) {
     //     constructor rewriting logic into this class.
     convertSuperConstructorCalls.setGlobalNamespace(new GlobalNamespace(compiler, externs, root));
     TranspilationPasses.processTranspile(compiler, root, features, convertSuperConstructorCalls);
-    TranspilationPasses.maybeMarkFeaturesAsTranspiledAway(compiler, features);
+    TranspilationPasses.maybeMarkFeaturesAsTranspiledAway(compiler, root, features);
   }
 
   @Override
diff --git a/src/com/google/javascript/jscomp/Es6RewriteDestructuring.java b/src/com/google/javascript/jscomp/Es6RewriteDestructuring.java
@@ -148,7 +148,7 @@ public PatternNestingLevel(Node pattern, boolean hasNestedRest) {
   public void process(Node externs, Node root) {
     checkState(patternNestingStack.isEmpty());
     NodeTraversal.traverse(compiler, root, this);
-    TranspilationPasses.maybeMarkFeaturesAsTranspiledAway(compiler, featuresToMarkAsRemoved);
+    TranspilationPasses.maybeMarkFeaturesAsTranspiledAway(compiler, root, featuresToMarkAsRemoved);
     checkState(patternNestingStack.isEmpty());
   }
 
diff --git a/src/com/google/javascript/jscomp/Es6RewriteGenerators.java b/src/com/google/javascript/jscomp/Es6RewriteGenerators.java
@@ -128,7 +128,7 @@ public void process(Node externs, Node root) {
     checkState(compiler.getLifeCycleStage().isNormalized());
     TranspilationPasses.processTranspile(
         compiler, root, transpiledFeatures, new GeneratorFunctionsTranspiler());
-    TranspilationPasses.maybeMarkFeaturesAsTranspiledAway(compiler, transpiledFeatures);
+    TranspilationPasses.maybeMarkFeaturesAsTranspiledAway(compiler, root, transpiledFeatures);
   }
 
   /**
diff --git a/src/com/google/javascript/jscomp/Es6RewriteModules.java b/src/com/google/javascript/jscomp/Es6RewriteModules.java
@@ -26,7 +26,6 @@
 import static com.google.javascript.jscomp.ClosurePrimitiveErrors.MISSING_MODULE_OR_PROVIDE;
 import static com.google.javascript.jscomp.ClosurePrimitiveErrors.MODULE_USES_GOOG_MODULE_GET;
 import static com.google.javascript.jscomp.ClosureRewriteModule.ILLEGAL_MODULE_RENAMING_CONFLICT;
-import static com.google.javascript.jscomp.parsing.parser.FeatureSet.Feature.MODULES;
 
 import com.google.common.base.Splitter;
 import com.google.common.collect.HashBasedTable;
@@ -188,7 +187,12 @@ public void process(Node externs, Node root) {
     checkArgument(externs.isRoot(), externs);
     checkArgument(root.isRoot(), root);
     NodeTraversal.traverseRoots(compiler, this, externs, root);
-    compiler.markFeatureNotAllowed(MODULES);
+    // It is unusual to call this NodeUtil method instead of the TranspilationPasses one. This
+    // pass is included in the {@code dependency_resolution} BUILD target and does not have access
+    // to {@code TranspilationPasses}. Adding that dep produces a cycle in the BUILD dep graph.
+    // Regular transpiler passes must use the {@code
+    // TranspilationPasses.maybeMarkFeaturesAsTranspiledAway}
+    NodeUtil.removeFeatureFromAllScripts(root, Feature.MODULES, compiler);
     // This pass may add getters properties on module objects.
     GatherGetterAndSetterProperties.update(compiler, externs, root);
   }
diff --git a/src/com/google/javascript/jscomp/Es6RewriteModulesToCommonJsModules.java b/src/com/google/javascript/jscomp/Es6RewriteModulesToCommonJsModules.java
@@ -56,7 +56,12 @@ public void process(Node externs, Node root) {
         NodeTraversal.traverse(compiler, script, new Rewriter(compiler, script));
       }
     }
-    compiler.markFeatureNotAllowed(Feature.MODULES);
+    // It is unusual to call this NodeUtil method instead of the TranspilationPasses one. This
+    // pass is included in the {@code dependency_resolution} BUILD target and does not have access
+    // to {@code TranspilationPasses}. Adding that dep produces a cycle in the BUILD dep graph.
+    // Regular transpiler passes must use the {@code
+    // TranspilationPasses.maybeMarkFeaturesAsTranspiledAway}
+    NodeUtil.removeFeatureFromAllScripts(root, Feature.MODULES, compiler);
     GatherGetterAndSetterProperties.update(this.compiler, externs, root);
   }
 
diff --git a/src/com/google/javascript/jscomp/Es6RewriteRestAndSpread.java b/src/com/google/javascript/jscomp/Es6RewriteRestAndSpread.java
@@ -52,7 +52,7 @@ public Es6RewriteRestAndSpread(AbstractCompiler compiler) {
   @Override
   public void process(Node externs, Node root) {
     TranspilationPasses.processTranspile(compiler, root, transpiledFeatures, this);
-    TranspilationPasses.maybeMarkFeaturesAsTranspiledAway(compiler, transpiledFeatures);
+    TranspilationPasses.maybeMarkFeaturesAsTranspiledAway(compiler, root, transpiledFeatures);
   }
 
   @Override
diff --git a/src/com/google/javascript/jscomp/Es7RewriteExponentialOperator.java b/src/com/google/javascript/jscomp/Es7RewriteExponentialOperator.java
@@ -52,7 +52,7 @@ public Es7RewriteExponentialOperator(AbstractCompiler compiler) {
   @Override
   public void process(Node externs, Node root) {
     NodeTraversal.traverse(compiler, root, this);
-    TranspilationPasses.maybeMarkFeaturesAsTranspiledAway(compiler, Feature.EXPONENT_OP);
+    TranspilationPasses.maybeMarkFeatureAsTranspiledAway(compiler, root, Feature.EXPONENT_OP);
   }
 
   @Override
diff --git a/src/com/google/javascript/jscomp/LateEs6ToEs3Converter.java b/src/com/google/javascript/jscomp/LateEs6ToEs3Converter.java
@@ -70,7 +70,7 @@ public LateEs6ToEs3Converter(AbstractCompiler compiler) {
   @Override
   public void process(Node externs, Node root) {
     TranspilationPasses.processTranspile(compiler, root, transpiledFeatures, this);
-    TranspilationPasses.maybeMarkFeaturesAsTranspiledAway(compiler, transpiledFeatures);
+    TranspilationPasses.maybeMarkFeaturesAsTranspiledAway(compiler, root, transpiledFeatures);
   }
 
   @Override
diff --git a/src/com/google/javascript/jscomp/NodeUtil.java b/src/com/google/javascript/jscomp/NodeUtil.java
@@ -6005,6 +6005,48 @@ static void addFeatureToScript(Node scriptNode, Feature feature, AbstractCompile
     compiler.setAllowableFeatures(compiler.getAllowableFeatures().with(feature));
   }
 
+  /**
+   * Removes the given feature from the SCRIPT node's FeatureSet property.
+   *
+   * <p>Removing a feature from a single script does not mean that it's removed from all scripts.
+   * Hence this method does not remove it from the compiler's featureSet. The caller must remove it
+   * from the compiler's featureSet if it's calling this method for each script.
+   */
+  private static void removeFeatureFromScript(Node scriptNode, Feature feature) {
+    FeatureSet currentFeatures = getFeatureSetOfScript(scriptNode);
+    if (currentFeatures != null) {
+      currentFeatures = currentFeatures.without(feature);
+    }
+    scriptNode.putProp(Node.FEATURE_SET, currentFeatures);
+  }
+
+  /**
+   * Removes the given feature from the FEATURE_SET prop of all SCRIPT nodes under root.
+   *
+   * <p>Also updates the compiler's FeatureSet.
+   */
+  static void removeFeatureFromAllScripts(Node root, Feature feature, AbstractCompiler compiler) {
+    checkArgument(root.isRoot(), root);
+    for (Node childNode = root.getFirstChild();
+        childNode != null;
+        childNode = childNode.getNext()) {
+      checkState(childNode.isScript());
+      NodeUtil.removeFeatureFromScript(childNode, feature);
+    }
+    compiler.markFeatureNotAllowed(feature);
+  }
+
+  /** Adds the given feature to the FEATURE_SET prop of all scripts under externs and root. */
+  static void addFeatureToAllScripts(Node root, Feature feature, AbstractCompiler compiler) {
+    checkArgument(root.isRoot(), root);
+    for (Node childNode = root.getFirstChild();
+        childNode != null;
+        childNode = childNode.getNext()) {
+      checkState(childNode.isScript());
+      NodeUtil.addFeatureToScript(childNode, feature, compiler);
+    }
+  }
+
   /**
    * Adds the given features to a SCRIPT node's FeatureSet property.
    *
diff --git a/src/com/google/javascript/jscomp/ReportUntranspilableFeatures.java b/src/com/google/javascript/jscomp/ReportUntranspilableFeatures.java
@@ -95,7 +95,8 @@ public void process(Node externs, Node root) {
   private void checkForUntranspilable(Node root) {
     // Non-flag RegExp features are not attached to nodes, so we must force traversal.
     NodeTraversal.traverse(compiler, root, this);
-    TranspilationPasses.maybeMarkFeaturesAsTranspiledAway(compiler, untranspilableFeaturesToRemove);
+    TranspilationPasses.maybeMarkFeaturesAsTranspiledAway(
+        compiler, root, untranspilableFeaturesToRemove);
   }
 
   private void reportUntranspilable(Feature feature, Node node) {
diff --git a/src/com/google/javascript/jscomp/RewriteAsyncFunctions.java b/src/com/google/javascript/jscomp/RewriteAsyncFunctions.java
@@ -439,7 +439,7 @@ static RewriteAsyncFunctions create(AbstractCompiler compiler) {
   @Override
   public void process(Node externs, Node root) {
     TranspilationPasses.processTranspile(compiler, root, transpiledFeatures, this);
-    TranspilationPasses.maybeMarkFeaturesAsTranspiledAway(compiler, transpiledFeatures);
+    TranspilationPasses.maybeMarkFeaturesAsTranspiledAway(compiler, root, transpiledFeatures);
   }
 
   @Override
diff --git a/src/com/google/javascript/jscomp/RewriteAsyncIteration.java b/src/com/google/javascript/jscomp/RewriteAsyncIteration.java
@@ -204,7 +204,7 @@ public void process(Node externs, Node root) {
     checkState(contextStack.isEmpty());
     contextStack.push(LexicalContext.newGlobalContext(root));
     TranspilationPasses.processTranspile(compiler, root, transpiledFeatures, this);
-    TranspilationPasses.maybeMarkFeaturesAsTranspiledAway(compiler, transpiledFeatures);
+    TranspilationPasses.maybeMarkFeaturesAsTranspiledAway(compiler, root, transpiledFeatures);
     checkState(contextStack.element().function == null);
     contextStack.remove();
     checkState(contextStack.isEmpty());
diff --git a/src/com/google/javascript/jscomp/RewriteCatchWithNoBinding.java b/src/com/google/javascript/jscomp/RewriteCatchWithNoBinding.java
@@ -74,6 +74,6 @@ public void visit(NodeTraversal t, Node n, Node parent) {
   @Override
   public void process(Node externs, Node root) {
     TranspilationPasses.processTranspile(compiler, root, TRANSPILED_FEATURES, new AddBindings());
-    TranspilationPasses.maybeMarkFeaturesAsTranspiledAway(compiler, TRANSPILED_FEATURES);
+    TranspilationPasses.maybeMarkFeaturesAsTranspiledAway(compiler, root, TRANSPILED_FEATURES);
   }
 }
diff --git a/src/com/google/javascript/jscomp/RewriteClassMembers.java b/src/com/google/javascript/jscomp/RewriteClassMembers.java
@@ -48,7 +48,7 @@ public RewriteClassMembers(AbstractCompiler compiler) {
   public void process(Node externs, Node root) {
     NodeTraversal.traverse(compiler, root, this);
     TranspilationPasses.maybeMarkFeaturesAsTranspiledAway(
-        compiler, Feature.PUBLIC_CLASS_FIELDS, Feature.CLASS_STATIC_BLOCK);
+        compiler, root, Feature.PUBLIC_CLASS_FIELDS, Feature.CLASS_STATIC_BLOCK);
   }
 
   @Override
diff --git a/src/com/google/javascript/jscomp/RewriteDynamicImports.java b/src/com/google/javascript/jscomp/RewriteDynamicImports.java
@@ -135,6 +135,12 @@ public void process(Node externs, Node root) {
       compiler.markFeatureNotAllowed(Feature.DYNAMIC_IMPORT);
 
       // This pass removes dynamic import, but adds arrow functions.
+      // It is unusual to call this NodeUtil method instead of the TranspilationPasses one. This
+      // pass runs as a stage1 checks pass and does not have access to {@code TranspilationPasses}.
+      // Adding that dep produces a cycle in the BUILD dep graph.
+      // Regular transpiler passes must use the {@code
+      // TranspilationPassses.maybeMarkFeaturesAsTranspiledAway}.
+      NodeUtil.removeFeatureFromAllScripts(root, Feature.DYNAMIC_IMPORT, compiler);
       if (this.requiresAliasing && aliasIsValid()) {
         NodeTraversal.traverse(compiler, externs, new AliasInjectingTraversal());
       }
diff --git a/src/com/google/javascript/jscomp/RewriteLogicalAssignmentOperatorsPass.java b/src/com/google/javascript/jscomp/RewriteLogicalAssignmentOperatorsPass.java
@@ -36,7 +36,8 @@ public RewriteLogicalAssignmentOperatorsPass(AbstractCompiler compiler) {
   @Override
   public void process(Node externs, Node root) {
     NodeTraversal.traverse(compiler, root, this);
-    TranspilationPasses.maybeMarkFeaturesAsTranspiledAway(compiler, Feature.LOGICAL_ASSIGNMENT);
+    TranspilationPasses.maybeMarkFeatureAsTranspiledAway(
+        compiler, root, Feature.LOGICAL_ASSIGNMENT);
   }
 
   @Override
diff --git a/src/com/google/javascript/jscomp/RewriteNewDotTarget.java b/src/com/google/javascript/jscomp/RewriteNewDotTarget.java
@@ -68,6 +68,6 @@ public void visit(NodeTraversal t, Node n, Node parent) {
   public void process(Node externs, Node root) {
     TranspilationPasses.processTranspile(
         compiler, root, TRANSPILED_FEATURES, new RewriteNewDotTargetCallback());
-    TranspilationPasses.maybeMarkFeaturesAsTranspiledAway(compiler, TRANSPILED_FEATURES);
+    TranspilationPasses.maybeMarkFeaturesAsTranspiledAway(compiler, root, TRANSPILED_FEATURES);
   }
 }
diff --git a/src/com/google/javascript/jscomp/RewriteNullishCoalesceOperator.java b/src/com/google/javascript/jscomp/RewriteNullishCoalesceOperator.java
@@ -42,7 +42,7 @@ public RewriteNullishCoalesceOperator(AbstractCompiler compiler) {
   public void process(Node externs, Node root) {
     NodeTraversal.traverseRoots(compiler, new ArrowRewriteCallBack(), externs, root);
     NodeTraversal.traverse(compiler, root, this);
-    TranspilationPasses.maybeMarkFeaturesAsTranspiledAway(compiler, Feature.NULL_COALESCE_OP);
+    TranspilationPasses.maybeMarkFeatureAsTranspiledAway(compiler, root, Feature.NULL_COALESCE_OP);
   }
 
   @Override
diff --git a/src/com/google/javascript/jscomp/RewriteObjectSpread.java b/src/com/google/javascript/jscomp/RewriteObjectSpread.java
@@ -50,7 +50,7 @@ public RewriteObjectSpread(AbstractCompiler compiler) {
   @Override
   public void process(Node externs, Node root) {
     TranspilationPasses.processTranspile(compiler, root, transpiledFeatures, this);
-    TranspilationPasses.maybeMarkFeaturesAsTranspiledAway(compiler, transpiledFeatures);
+    TranspilationPasses.maybeMarkFeaturesAsTranspiledAway(compiler, root, transpiledFeatures);
   }
 
   @Override
diff --git a/src/com/google/javascript/jscomp/RewriteOptionalChainingOperator.java b/src/com/google/javascript/jscomp/RewriteOptionalChainingOperator.java
@@ -56,7 +56,7 @@ final class RewriteOptionalChainingOperator implements CompilerPass {
   public void process(Node externs, Node root) {
     NodeTraversal.traverseRoots(compiler, new ArrowRewriteCallBack(), externs, root);
     NodeTraversal.traverseRoots(compiler, new TranspilationCallback(), externs, root);
-    TranspilationPasses.maybeMarkFeaturesAsTranspiledAway(compiler, Feature.OPTIONAL_CHAINING);
+    TranspilationPasses.maybeMarkFeatureAsTranspiledAway(compiler, root, Feature.OPTIONAL_CHAINING);
   }
 
   /** Locates and transpiles all optional chains. */
diff --git a/src/com/google/javascript/jscomp/TranspilationPasses.java b/src/com/google/javascript/jscomp/TranspilationPasses.java
@@ -16,6 +16,7 @@
 
 package com.google.javascript.jscomp;
 
+
 import com.google.javascript.jscomp.CompilerOptions.ChunkOutputType;
 import com.google.javascript.jscomp.Es6RewriteDestructuring.ObjectDestructuringRewriteMode;
 import com.google.javascript.jscomp.parsing.parser.FeatureSet;
@@ -485,20 +486,50 @@ static void processTranspile(
     }
   }
 
-  static void maybeMarkFeaturesAsTranspiledAway(
-      AbstractCompiler compiler, FeatureSet transpiledFeatures) {
+  /**
+   * Removes the given features from the FEATURE_SET prop of all scripts under root. Also removes
+   * from the compiler's featureset.
+   */
+  static void maybeMarkFeatureAsTranspiledAway(
+      AbstractCompiler compiler, Node root, Feature feature) {
     // We don't bother to do this if the compiler has halting errors, which avoids unnecessary
     // warnings from AstValidator warning that the features are still there.
     if (!compiler.hasHaltingErrors()) {
-      compiler.markFeatureSetNotAllowed(transpiledFeatures);
+      compiler.markFeatureNotAllowed(feature);
+      NodeUtil.removeFeatureFromAllScripts(root, feature, compiler);
     }
   }
 
+  /**
+   * Removes the given features from the FEATURE_SET prop of all scripts under root. Also removes
+   * from the compiler's featureset.
+   */
   static void maybeMarkFeaturesAsTranspiledAway(
-      AbstractCompiler compiler, Feature transpiledFeature, Feature... moreTranspiledFeatures) {
+      AbstractCompiler compiler,
+      Node root,
+      Feature transpiledFeature,
+      Feature... moreTranspiledFeatures) {
     if (!compiler.hasHaltingErrors()) {
-      compiler.markFeatureSetNotAllowed(
-          FeatureSet.BARE_MINIMUM.with(transpiledFeature).with(moreTranspiledFeatures));
+      maybeMarkFeatureAsTranspiledAway(compiler, root, transpiledFeature);
+      for (Feature feature : moreTranspiledFeatures) {
+        maybeMarkFeatureAsTranspiledAway(compiler, root, feature);
+      }
+    }
+  }
+
+  /**
+   * Removes the given features from the FEATURE_SET prop of all scripts under root. Also removes
+   * from the compiler's featureset.
+   */
+  // TODO: b/293467820 - Potentially have a single method that accepts a Collection<Feature>
+  static void maybeMarkFeaturesAsTranspiledAway(
+      AbstractCompiler compiler, Node root, FeatureSet transpiledFeatures) {
+    // We don't bother to do this if the compiler has halting errors, which avoids unnecessary
+    // warnings from AstValidator warning that the features are still there.
+    if (!compiler.hasHaltingErrors()) {
+      for (Feature feature : transpiledFeatures.getFeatures()) {
+        maybeMarkFeatureAsTranspiledAway(compiler, root, feature);
+      }
     }
   }
 
@@ -530,7 +561,8 @@ static void postTranspileCheckUnsupportedFeaturesRemoved(AbstractCompiler compil
   }
 
   /**
-   * Returns a pass that just removes features from the AST FeatureSet.
+   * Returns a pass that just removes features from the source scripts' FeatureSet and the
+   * compiler's featureset.
    *
    * <p>Doing this indicates that the AST no longer contains uses of the features, or that they are
    * no longer of concern for some other reason.
@@ -541,9 +573,10 @@ private static PassFactory createFeatureRemovalPass(
         .setName(passName)
         .setInternalFactory(
             (compiler) ->
-                ((Node externs, Node root) ->
-                    maybeMarkFeaturesAsTranspiledAway(
-                        compiler, featureToRemove, moreFeaturesToRemove)))
+                ((Node externs, Node root) -> {
+                  maybeMarkFeaturesAsTranspiledAway(
+                      compiler, root, featureToRemove, moreFeaturesToRemove);
+                }))
         .build();
   }
 
diff --git a/test/com/google/javascript/jscomp/NodeUtilTest.java b/test/com/google/javascript/jscomp/NodeUtilTest.java

Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ public void process(Node externs, Node root) {`
`123`	`123`	`addImportStatements();`
`124`	`124`	`rewriteDynamicImportCallbacks();`
`125`	`125`
`126`		`- compiler.setAllowableFeatures(compiler.getAllowableFeatures().with(FeatureSet.Feature.MODULES));`
	`126`	`+ NodeUtil.addFeatureToAllScripts(root, FeatureSet.Feature.MODULES, compiler);`
`127`	`127`	`}`
`128`	`128`
`129`	`129`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public Es6ForOfConverter(AbstractCompiler compiler) {`
`49`	`49`	`@Override`
`50`	`50`	`public void process(Node externs, Node root) {`
`51`	`51`	`TranspilationPasses.processTranspile(compiler, root, transpiledFeatures, this);`
`52`		`- TranspilationPasses.maybeMarkFeaturesAsTranspiledAway(compiler, transpiledFeatures);`
	`52`	`+ TranspilationPasses.maybeMarkFeaturesAsTranspiledAway(compiler, root, transpiledFeatures);`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public Es6NormalizeShorthandProperties(AbstractCompiler compiler) {`
`38`	`38`	`@Override`
`39`	`39`	`public void process(Node externs, Node root) {`
`40`	`40`	`TranspilationPasses.processTranspile(compiler, root, transpiledFeatures, this);`
`41`		`- TranspilationPasses.maybeMarkFeaturesAsTranspiledAway(compiler, transpiledFeatures);`
	`41`	`+ TranspilationPasses.maybeMarkFeaturesAsTranspiledAway(compiler, root, transpiledFeatures);`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public Es6RewriteArrowFunction(AbstractCompiler compiler) {`
`49`	`49`	`@Override`
`50`	`50`	`public void process(Node externs, Node root) {`
`51`	`51`	`TranspilationPasses.processTranspile(compiler, root, transpiledFeatures, this);`
`52`		`- TranspilationPasses.maybeMarkFeaturesAsTranspiledAway(compiler, transpiledFeatures);`
	`52`	`+ TranspilationPasses.maybeMarkFeaturesAsTranspiledAway(compiler, root, transpiledFeatures);`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ public void process(Node externs, Node root) {`
`95`	`95`	`NodeTraversal.traverse(compiler, root, transformer);`
`96`	`96`	`transformer.transformLoopClosure();`
`97`	`97`	`rewriteDeclsToVars();`
`98`		`- TranspilationPasses.maybeMarkFeaturesAsTranspiledAway(compiler, transpiledFeatures);`
	`98`	`+ TranspilationPasses.maybeMarkFeaturesAsTranspiledAway(compiler, root, transpiledFeatures);`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public Es6RewriteBlockScopedFunctionDeclaration(AbstractCompiler compiler) {`
`41`	`41`	`@Override`
`42`	`42`	`public void process(Node externs, Node root) {`
`43`	`43`	`TranspilationPasses.processTranspile(compiler, root, transpiledFeatures, this);`
`44`		`- TranspilationPasses.maybeMarkFeaturesAsTranspiledAway(compiler, transpiledFeatures);`
	`44`	`+ TranspilationPasses.maybeMarkFeaturesAsTranspiledAway(compiler, root, transpiledFeatures);`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ public PatternNestingLevel(Node pattern, boolean hasNestedRest) {`
`148`	`148`	`public void process(Node externs, Node root) {`
`149`	`149`	`checkState(patternNestingStack.isEmpty());`
`150`	`150`	`NodeTraversal.traverse(compiler, root, this);`
`151`		`- TranspilationPasses.maybeMarkFeaturesAsTranspiledAway(compiler, featuresToMarkAsRemoved);`
	`151`	`+ TranspilationPasses.maybeMarkFeaturesAsTranspiledAway(compiler, root, featuresToMarkAsRemoved);`
`152`	`152`	`checkState(patternNestingStack.isEmpty());`
`153`	`153`	`}`
`154`	`154`
Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ public void process(Node externs, Node root) {`
`128`	`128`	`checkState(compiler.getLifeCycleStage().isNormalized());`
`129`	`129`	`TranspilationPasses.processTranspile(`
`130`	`130`	`compiler, root, transpiledFeatures, new GeneratorFunctionsTranspiler());`
`131`		`- TranspilationPasses.maybeMarkFeaturesAsTranspiledAway(compiler, transpiledFeatures);`
	`131`	`+ TranspilationPasses.maybeMarkFeaturesAsTranspiledAway(compiler, root, transpiledFeatures);`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`/**`