Move state out of DefaultPassConfig and into Compiler.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=160201722

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

@@ -92,16 +92,46 @@ public abstract class AbstractCompiler implements SourceExcerptProvider {
    */
   abstract List<CompilerInput> getInputsInOrder();
 
-  /**
-   * Adds exported names to keep track.
-   */
+  //
+  // Intermediate state and results produced and needed by particular passes.
+  // TODO(rluble): move these into the general structure for keeping state between pass runs.
+  //
+  /** Adds exported names to keep track. */
   public abstract void addExportedNames(Set<String> exportedVariableNames);
 
-  /**
-   * Gets the names that have been exported so far.
-   */
+  /** Gets the names that have been exported. */
   public abstract Set<String> getExportedNames();
-
+
+  /** Sets the variable renaming map */
+  public abstract void setVariableMap(VariableMap variableMap);
+
+  /** Sets the property renaming map */
+  public abstract void setPropertyMap(VariableMap propertyMap);
+
+  /** Sets the string replacement map */
+  public abstract void setStringMap(VariableMap stringMap);
+
+  /** Sets the fully qualified function name and globally unique id mapping. */
+  public abstract void setFunctionNames(FunctionNames functionNames);
+
+  /** Gets the fully qualified function name and globally unique id mapping. */
+  public abstract FunctionNames getFunctionNames();
+
+  /** Sets the css names found during compilation. */
+  public abstract void setCssNames(Map<String, Integer> newCssNames);
+
+  /** Sets the id generator for cross-module motion. */
+  public abstract void setIdGeneratorMap(String serializedIdMappings);
+
+  /** Gets the id generator for cross-module motion. */
+  public abstract IdGenerator getCrossModuleIdGenerator();
+
+  /** Sets the naming map for anonymous functions */
+  public abstract void setAnonymousFunctionNameMap(VariableMap functionMap);
+  //
+  // End of intermediate state needed by passes.
+  //
+
   static enum MostRecentTypechecker {
     NONE,
     OTI,

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

@@ -33,8 +33,6 @@
  */
 class CleanupPasses extends PassConfig {
 
-  private State state;
-
   public CleanupPasses(CompilerOptions options) {
     super(options);
   }
@@ -48,11 +46,6 @@ protected List<PassFactory> getChecks() {
     return checks;
   }
 
-  @Override
-  protected State getIntermediateState() {
-    return state;
-  }
-
   @Override
   protected List<PassFactory> getOptimizations() {
     return ImmutableList.of();

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

@@ -1234,7 +1234,6 @@ void stopTracer(Tracer t, String passName) {
    * Returns the result of the compilation.
    */
   public Result getResult() {
-    PassConfig.State state = getPassConfig().getIntermediateState();
     Set<SourceFile> transpiledFiles = new HashSet<>();
     if (jsRoot != null) {
       for (Node scriptNode : jsRoot.children()) {
@@ -1244,9 +1243,9 @@ public Result getResult() {
       }
     }
     return new Result(getErrors(), getWarnings(), debugLog.toString(),
-        state.variableMap, state.propertyMap,
-        state.anonymousFunctionNameMap, state.stringMap, functionInformationMap,
-        sourceMap, externExports, state.cssNames, state.idGeneratorMap, transpiledFiles);
+        this.variableMap, this.propertyMap,
+        this.anonymousFunctionNameMap, this.stringMap, this.functionInformationMap,
+        this.sourceMap, this.externExports, this.cssNames, this.idGeneratorMap, transpiledFiles);
   }
 
   /**
@@ -2491,8 +2490,7 @@ void recordFunctionInformation() {
     logger.fine("Recording function information");
     startPass("recordFunctionInformation");
     RecordFunctionInformation recordFunctionInfoPass =
-        new RecordFunctionInformation(
-            this, getPassConfig().getIntermediateState().functionNames);
+        new RecordFunctionInformation(this, this.functionNames);
     process(recordFunctionInfoPass);
     functionInformationMap = recordFunctionInfoPass.getMap();
     endPass("recordFunctionInformation");
@@ -2970,18 +2968,111 @@ public SourceMap getSourceMap() {
     return sourceMap;
   }
 
+  /**
+   * Ids for cross-module method stubbing, so that each method has
+   * a unique id.
+   */
+  private IdGenerator crossModuleIdGenerator =
+      new IdGenerator();
+
+  /**
+   * Keys are arguments passed to getCssName() found during compilation; values
+   * are the number of times the key appeared as an argument to getCssName().
+   */
+  private Map<String, Integer> cssNames = null;
+
+  /** The variable renaming map */
+  private VariableMap variableMap = null;
+
+  /** The property renaming map */
+  private VariableMap propertyMap = null;
+
+  /** The naming map for anonymous functions */
+  private VariableMap anonymousFunctionNameMap = null;
+
+  /** Fully qualified function names and globally unique ids */
+  private FunctionNames functionNames = null;
+
+  /** String replacement map */
+  private VariableMap stringMap = null;
+
+  /** Id generator map */
+  private String idGeneratorMap = null;
+
+  /** Names exported by goog.exportSymbol. */
+  private final Set<String> exportedNames = new LinkedHashSet<>();
+
+  @Override
+  public void setVariableMap(VariableMap variableMap) {
+    this.variableMap = variableMap;
+  }
+
   VariableMap getVariableMap() {
-    return getPassConfig().getIntermediateState().variableMap;
+    return variableMap;
+  }
+
+  @Override
+  public void setPropertyMap(VariableMap propertyMap) {
+    this.propertyMap = propertyMap;
   }
 
   VariableMap getPropertyMap() {
-    return getPassConfig().getIntermediateState().propertyMap;
+    return this.propertyMap;
+  }
+
+  @Override
+  public void setStringMap(VariableMap stringMap) {
+    this.stringMap = stringMap;
+  }
+
+  @Override
+  public void setFunctionNames(FunctionNames functionNames) {
+    this.functionNames = functionNames;
+  }
+
+  @Override
+  public void setCssNames(Map<String, Integer> cssNames) {
+    this.cssNames = cssNames;
+  }
+
+  Map<String, Integer> getCssNames() {
+    return cssNames;
+  }
+
+  @Override
+  public void setIdGeneratorMap(String serializedIdMappings) {
+    this.idGeneratorMap = serializedIdMappings;
+  }
+
+  @Override
+  public IdGenerator getCrossModuleIdGenerator() {
+    return crossModuleIdGenerator;
+  }
+
+  @Override
+  public void setAnonymousFunctionNameMap(VariableMap functionMap) {
+    this.anonymousFunctionNameMap = functionMap;
+  }
+
+  @Override
+  public FunctionNames getFunctionNames() {
+    return functionNames;
   }
 
   VariableMap getStringMap() {
-    return getPassConfig().getIntermediateState().stringMap;
+    return this.stringMap;
   }
 
+
+  @Override
+  public void addExportedNames(Set<String> exportedNames) {
+    this.exportedNames.addAll(exportedNames);
+  }
+
+  @Override
+  public Set<String> getExportedNames() {
+    return exportedNames;
+  }
   @Override
   CompilerOptions getOptions() {
     return options;
@@ -3022,20 +3113,6 @@ List<CompilerInput> getInputsInOrder() {
     return Collections.unmodifiableList(inputs);
   }
 
-  /** Names exported by goog.exportSymbol. */
-  private final Set<String> exportedNames = new LinkedHashSet<>();
-
-  @Override
-  public void addExportedNames(Set<String> exportedNames) {
-    this.exportedNames.addAll(exportedNames);
-
-  }
-
-  @Override
-  public Set<String> getExportedNames() {
-    return exportedNames;
-  }
-
   /**
    * Returns an unmodifiable view of the compiler inputs indexed by id.
    */
@@ -3393,6 +3470,14 @@ private static class CompilerState implements Serializable {
     private final List<JSModule> modules;
     private final int uniqueNameId;
     private final Set<String> exportedNames;
+    private final Map<String, Integer> cssNames;
+    private final VariableMap variableMap;
+    private final VariableMap propertyMap;
+    private final VariableMap anonymousFunctionaMap;
+    private final FunctionNames functioNames;
+    private final VariableMap stringMap;
+    private final String idGeneratorMap;
+    private final IdGenerator crossModuleIdGenerator;
 
     CompilerState(Compiler compiler) {
       this.externsRoot = checkNotNull(compiler.externsRoot);
@@ -3420,6 +3505,15 @@ private static class CompilerState implements Serializable {
       this.modules = compiler.modules;
       this.uniqueNameId = compiler.uniqueNameId;
       this.exportedNames = compiler.exportedNames;
+      this.cssNames = compiler.cssNames;
+      this.variableMap = compiler.variableMap;
+      this.propertyMap = compiler.propertyMap;
+      this.anonymousFunctionaMap = compiler.anonymousFunctionNameMap;
+      this.functioNames = compiler.functionNames;
+      this.stringMap = compiler.stringMap;
+      this.idGeneratorMap = compiler.idGeneratorMap;
+      this.crossModuleIdGenerator = compiler.crossModuleIdGenerator;
+
     }
   }
 
@@ -3483,6 +3577,14 @@ public CompilerState call() throws Exception {
     uniqueNameId = compilerState.uniqueNameId;
     exportedNames.clear();
     exportedNames.addAll(compilerState.exportedNames);
+    cssNames = compilerState.cssNames;
+    variableMap = compilerState.variableMap;
+    propertyMap = compilerState.propertyMap;
+    stringMap = compilerState.stringMap;
+    anonymousFunctionNameMap = compilerState.anonymousFunctionaMap;
+    idGeneratorMap = compilerState.idGeneratorMap;
+    crossModuleIdGenerator = compilerState.crossModuleIdGenerator;
+    functionNames = compilerState.functioNames;
 
     // Reapply module names to deserialized modules
     renameModules(newModules, modules);

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

@@ -21,7 +21,6 @@
 import com.google.javascript.jscomp.AnalyzePrototypeProperties.Symbol;
 import com.google.javascript.rhino.IR;
 import com.google.javascript.rhino.Node;
-import java.io.Serializable;
 import java.util.Collection;
 import java.util.Iterator;
 
@@ -255,28 +254,4 @@ static boolean hasUnmovableRedeclaration(NameInfo nameInfo, Property prop) {
     }
     return false;
   }
-
-  static class IdGenerator implements Serializable {
-    private static final long serialVersionUID = 0L;
-
-    /**
-     * Ids for cross-module method stubbing, so that each method has
-     * a unique id.
-     */
-    private int currentId = 0;
-
-    /**
-     * Returns whether we've generated any new ids.
-     */
-    boolean hasGeneratedAnyIds() {
-      return currentId != 0;
-    }
-
-    /**
-     * Creates a new id for stubbing a method.
-     */
-    int newId() {
-      return currentId++;
-    }
-  }
 }