Make CompilerOptions#setRemoveUnusedPrototypePropertiesInExterns a noop in preparation for removing the associated functionality.

PiperOrigin-RevId: 322445084

Author: concavelenz

src/com/google/javascript/jscomp/CompilationLevel.java

@@ -174,7 +174,6 @@ private static void applyFullCompilationOptions(CompilerOptions options) {
     options.setReserveRawExports(true);
     options.setRenamingPolicy(VariableRenamingPolicy.ALL, PropertyRenamingPolicy.ALL_UNQUOTED);
     options.setRemoveUnusedPrototypeProperties(true);
-    options.setRemoveUnusedPrototypePropertiesInExterns(false);
     options.setRemoveUnusedClassProperties(true);
     options.setCollapseAnonymousFunctions(true);
     options.setCollapsePropertiesLevel(PropertyCollapseLevel.ALL);

src/com/google/javascript/jscomp/CompilerOptions.java

@@ -504,9 +504,6 @@ public enum ExtractPrototypeMemberDeclarationsMode {
   /** Removes unused member prototypes */
   public boolean removeUnusedPrototypeProperties;
 
-  /** Tells AnalyzePrototypeProperties it can remove externed props. */
-  public boolean removeUnusedPrototypePropertiesInExterns;
-
   /** Removes unused member properties */
   public boolean removeUnusedClassProperties;
 
@@ -1373,7 +1370,6 @@ public CompilerOptions() {
     extractPrototypeMemberDeclarations =
         ExtractPrototypeMemberDeclarationsMode.OFF;
     removeUnusedPrototypeProperties = false;
-    removeUnusedPrototypePropertiesInExterns = false;
     removeUnusedClassProperties = false;
     removeUnusedVars = false;
     removeUnusedLocalVars = false;
@@ -2301,9 +2297,8 @@ public void setRemoveUnusedPrototypeProperties(boolean enabled) {
     this.inlineGetters = enabled;
   }
 
-  public void setRemoveUnusedPrototypePropertiesInExterns(boolean enabled) {
-    this.removeUnusedPrototypePropertiesInExterns = enabled;
-  }
+  @Deprecated
+  public void setRemoveUnusedPrototypePropertiesInExterns(boolean enabled) {}
 
   public void setCollapseVariableDeclarations(boolean enabled) {
     this.collapseVariableDeclarations = enabled;
@@ -3085,9 +3080,6 @@ public String toString() {
             .add("removeUnusedConstructorProperties", removeUnusedConstructorProperties)
             .add("removeUnusedLocalVars", removeUnusedLocalVars)
             .add("removeUnusedPrototypeProperties", removeUnusedPrototypeProperties)
-            .add(
-                "removeUnusedPrototypePropertiesInExterns",
-                removeUnusedPrototypePropertiesInExterns)
             .add("removeUnusedVars", removeUnusedVars)
             .add(
                 "renamePrefixNamespaceAssumeCrossChunkNames",

src/com/google/javascript/jscomp/CompilerOptionsPreprocessor.java

@@ -38,13 +38,6 @@ static void preprocess(CompilerOptions options) {
           "Cannot check use of goog.getCssName because of empty blacklist.");
     }
 
-    if (options.removeUnusedPrototypePropertiesInExterns
-        && !options.removeUnusedPrototypeProperties) {
-      throw new InvalidOptionsException(
-          "remove_unused_prototype_props_in_externs requires "
-          + "remove_unused_prototype_props to be turned on.");
-    }
-
     if (options.getInlineFunctionsLevel() == CompilerOptions.Reach.NONE
         && options.maxFunctionSizeAfterInlining
             != CompilerOptions.UNLIMITED_FUN_SIZE_AFTER_INLINING) {
@@ -60,13 +53,6 @@ static void preprocess(CompilerOptions options) {
       options.setAmbiguateProperties(false);
       options.setDisambiguateProperties(false);
     }
-
-    if (options.removeUnusedPrototypePropertiesInExterns
-        && options.exportLocalPropertyDefinitions) {
-      throw new InvalidOptionsException(
-          "remove_unused_prototype_props_in_externs "
-          + "and export_local_property_definitions cannot be used together.");
-    }
   }
 
   /** Exception to indicate incompatible options in the CompilerOptions. */

src/com/google/javascript/jscomp/DefaultPassConfig.java

@@ -2420,8 +2420,7 @@ public void process(Node externs, Node root) {
                     .removeGlobals(options.removeUnusedVars)
                     .preserveFunctionExpressionNames(preserveAnonymousFunctionNames)
                     .removeUnusedPrototypeProperties(options.removeUnusedPrototypeProperties)
-                    .allowRemovalOfExternProperties(
-                        options.removeUnusedPrototypePropertiesInExterns)
+                    .allowRemovalOfExternProperties(false)
                     .removeUnusedThisProperties(options.isRemoveUnusedClassProperties())
                     .removeUnusedObjectDefinePropertiesDefinitions(
                         options.isRemoveUnusedClassProperties())
@@ -2462,9 +2461,7 @@ public void process(Node externs, Node root) {
                   new CrossChunkMethodMotion(
                       compiler,
                       compiler.getCrossModuleIdGenerator(),
-                      // Only move properties in externs if we're not treating
-                      // them as exports.
-                      options.removeUnusedPrototypePropertiesInExterns,
+                      /* canModifyExterns= */ false, // remove this
                       options.crossChunkCodeMotionNoStubMethods))
           .setFeatureSetForOptimizations()
           .build();

src/com/google/javascript/jscomp/debugger/common/CompilationParam.java

@@ -708,19 +708,6 @@ public boolean isApplied(CompilerOptions options) {
     }
   },
 
-  /** Tells AnalyzePrototypeProperties it can remove externed props. */
-  REMOVE_UNUSED_PROTOTYPE_PROPERTIES_IN_EXTERNS(ParamGroup.OPTIMIZATION) {
-    @Override
-    public void apply(CompilerOptions options, boolean value) {
-      options.setRemoveUnusedPrototypePropertiesInExterns(value);
-    }
-
-    @Override
-    public boolean isApplied(CompilerOptions options) {
-      return options.removeUnusedPrototypePropertiesInExterns;
-    }
-  },
-
   /** Removes unused variables */
   REMOVE_UNUSED_VARIABLES(ParamGroup.OPTIMIZATION) {
     @Override

test/com/google/javascript/jscomp/integration/AdvancedOptimizationsIntegrationTest.java

@@ -1275,8 +1275,6 @@ public void testExports() {
     WarningLevel warnings = WarningLevel.DEFAULT;
     warnings.setOptionsForWarningLevel(options);
 
-    options.setRemoveUnusedPrototypePropertiesInExterns(true);
-
     String code =
         ""
         + "/** @constructor */ var X = function() {"
@@ -1285,11 +1283,6 @@ public void testExports() {
         + "/** @export */ this.abc = 1;};\n"
         + "alert(new X().abc + new Y().abc);";
 
-    // no export enabled, property name not preserved
-    test(options, code,
-        "alert((new function(){this.a = 1}).a + " +
-            "(new function(){this.a = 1}).a);");
-
     options.setGenerateExports(true);
 
     // exports enabled, but not local exports
@@ -1298,7 +1291,6 @@ public void testExports() {
     assertThat(lastCompiler.getErrors()).hasSize(1);
 
     options.setExportLocalPropertyDefinitions(true);
-    options.setRemoveUnusedPrototypePropertiesInExterns(false);
 
     // property name preserved due to export
     test(options, code,

test/com/google/javascript/jscomp/integration/IntegrationTest.java

@@ -3437,15 +3437,6 @@ public void testIssue787() {
     test(options, code, result);
   }
 
-  @Test
-  public void testRmUnusedProtoPropsInExternsUsage() {
-    CompilerOptions options = new CompilerOptions();
-    options.setRemoveUnusedPrototypePropertiesInExterns(true);
-    options.setRemoveUnusedPrototypeProperties(false);
-    assertThrows(
-        CompilerOptionsPreprocessor.InvalidOptionsException.class, () -> test(options, "", ""));
-  }
-
   @Test
   public void testMaxFunSizeAfterInliningUsage() {
     CompilerOptions options = new CompilerOptions();