Make CompilerOptions.customPasses private instead of protected

PiperOrigin-RevId: 853481799

Author: lauraharker

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

@@ -1418,15 +1418,14 @@ private void runValidityCheck() {
 
   /** Runs custom passes that are designated to run at a particular time. */
   private void runCustomPasses(CustomPassExecutionTime executionTime) {
-    if (options.customPasses != null) {
-      Tracer t = newTracer("runCustomPasses");
-      try {
-        for (CompilerPass p : options.customPasses.get(executionTime)) {
-          process(p);
-        }
-      } finally {
-        stopTracer(t, "runCustomPasses");
+    ImmutableList<CompilerPass> customPasses = options.getCustomPassesAt(executionTime);
+    Tracer t = newTracer("runCustomPasses");
+    try {
+      for (CompilerPass p : customPasses) {
+        process(p);
       }
+    } finally {
+      stopTracer(t, "runCustomPasses");
     }
   }
 

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

@@ -29,7 +29,7 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.LinkedHashMultimap;
-import com.google.common.collect.Multimap;
+import com.google.common.collect.SetMultimap;
 import com.google.common.primitives.Chars;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import com.google.errorprone.annotations.RestrictedApi;
@@ -802,7 +802,7 @@ public boolean shouldRunReplaceMessagesForChrome() {
   ImmutableSet<String> stripNamePrefixes;
 
   /** Custom passes */
-  protected transient @Nullable Multimap<CustomPassExecutionTime, CompilerPass> customPasses;
+  private transient @Nullable SetMultimap<CustomPassExecutionTime, CompilerPass> customPasses;
 
   /** Replacements for @defines. Will be Boolean, Numbers, or Strings */
   private final LinkedHashMap<String, Object> defineReplacements;
@@ -2844,6 +2844,12 @@ public void addCustomPass(CustomPassExecutionTime time, CompilerPass customPass)
     customPasses.put(time, customPass);
   }
 
+  ImmutableList<CompilerPass> getCustomPassesAt(CustomPassExecutionTime executionTime) {
+    return this.customPasses == null
+        ? ImmutableList.of()
+        : ImmutableList.copyOf(this.customPasses.get(executionTime));
+  }
+
   public void setDefineReplacements(Map<String, Object> defineReplacements) {
     this.defineReplacements.clear();
     this.defineReplacements.putAll(defineReplacements);

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

@@ -1059,9 +1059,7 @@ private PassListBuilder getLateOptimizationPasses() {
       passes.maybeAdd(devirtualizeMethods);
     }
 
-    if (options.customPasses != null) {
-      passes.maybeAdd(getCustomPasses(CustomPassExecutionTime.BEFORE_OPTIMIZATION_LOOP));
-    }
+    passes.maybeAdd(getCustomPasses(CustomPassExecutionTime.BEFORE_OPTIMIZATION_LOOP));
 
     passes.maybeAdd(createEmptyPass(PassNames.BEFORE_MAIN_OPTIMIZATIONS));
 
@@ -1077,9 +1075,7 @@ private PassListBuilder getLateOptimizationPasses() {
 
     // Some optimizations belong outside the loop because running them more
     // than once would either have no benefit or be incorrect.
-    if (options.customPasses != null) {
-      passes.maybeAdd(getCustomPasses(CustomPassExecutionTime.AFTER_OPTIMIZATION_LOOP));
-    }
+    passes.maybeAdd(getCustomPasses(CustomPassExecutionTime.AFTER_OPTIMIZATION_LOOP));
 
     assertValidOrderForOptimizations(passes);
     return passes;
@@ -2709,7 +2705,7 @@ private final PassFactory createGatherExternProperties(GatherExternProperties.Mo
   private PassFactory getCustomPasses(final CustomPassExecutionTime executionTime) {
     return PassFactory.builder()
         .setName("runCustomPasses")
-        .setInternalFactory((compiler) -> runInSerial(options.customPasses.get(executionTime)))
+        .setInternalFactory((compiler) -> runInSerial(options.getCustomPassesAt(executionTime)))
         .build();
   }