Refactor GlobalTypeInfo into a data class and a separate pass.

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

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

@@ -267,9 +267,9 @@ static enum MostRecentTypechecker {
   abstract Iterable<TypeMismatch> getImplicitInterfaceUses();
 
   /**
-   * Used only by the new type inference
+   * Global type registry used by NTI.
    */
-  abstract CompilerPass getSymbolTable();
+  abstract <T extends TypeIRegistry> T getGlobalTypeInfo();
 
   /**
    * Used by three passes that run in sequence (optimize-returns,

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

@@ -240,8 +240,8 @@ public SourceFile loadSource(String filename) {
   // Types that have been forward declared
   private Set<String> forwardDeclaredTypes = new HashSet<>();
 
-  // For use by the new type inference
-  private GlobalTypeInfo symbolTable;
+  // Type registry used by new type inference.
+  private GlobalTypeInfo globalTypeInfo;
 
   private MostRecentTypechecker mostRecentTypechecker = MostRecentTypechecker.NONE;
 
@@ -1500,11 +1500,11 @@ public TypeIRegistry getTypeIRegistry() {
         // the constructor asks for a type registry, and this may happen before type checking
         // runs. So, in the NONE case, if NTI is enabled, return a new registry, since NTI is
         // the relevant type checker. If NTI is not enabled, return an old registry.
-        return options.getNewTypeInference() ? getSymbolTable() : getTypeRegistry();
+        return options.getNewTypeInference() ? getGlobalTypeInfo() : getTypeRegistry();
       case OTI:
         return getTypeRegistry();
       case NTI:
-        return getSymbolTable();
+        return getGlobalTypeInfo();
       default:
         throw new RuntimeException("Unhandled typechecker " + mostRecentTypechecker);
     }
@@ -1517,7 +1517,7 @@ public void clearTypeIRegistry() {
         typeRegistry = null;
         return;
       case NTI:
-        symbolTable = null;
+        globalTypeInfo = null;
         return;
       case NONE:
         return;
@@ -1646,7 +1646,7 @@ Iterable<TypeMismatch> getTypeMismatches() {
       case OTI:
         return getTypeValidator().getMismatches();
       case NTI:
-        return getSymbolTable().getMismatches();
+        return getGlobalTypeInfo().getMismatches();
       default:
         throw new RuntimeException("Can't ask for type mismatches before type checking.");
     }
@@ -1658,18 +1658,18 @@ Iterable<TypeMismatch> getImplicitInterfaceUses() {
       case OTI:
         return getTypeValidator().getImplicitInterfaceUses();
       case NTI:
-        return getSymbolTable().getImplicitInterfaceUses();
+        return getGlobalTypeInfo().getImplicitInterfaceUses();
       default:
         throw new RuntimeException("Can't ask for type mismatches before type checking.");
     }
   }
 
   @Override
-  GlobalTypeInfo getSymbolTable() {
-    if (this.symbolTable == null) {
-      this.symbolTable = new GlobalTypeInfo(this, forwardDeclaredTypes);
+  GlobalTypeInfo getGlobalTypeInfo() {
+    if (this.globalTypeInfo == null) {
+      this.globalTypeInfo = new GlobalTypeInfo(this, forwardDeclaredTypes);
     }
-    return this.symbolTable;
+    return this.globalTypeInfo;
   }
 
   @Override
@@ -3464,7 +3464,7 @@ private static class CompilerState implements Serializable {
     private final Map<String, Node> injectedLibraries;
     private final Node lastInjectedLibrary;
     private final GlobalVarReferenceMap globalRefMap;
-    private final GlobalTypeInfo symbolTable;
+    private final GlobalTypeInfo globalTypeInfo;
     private final boolean hasRegExpGlobalReferences;
     private final LifeCycleStage lifeCycleStage;
     private final Set<String> externProperties;
@@ -3498,7 +3498,7 @@ private static class CompilerState implements Serializable {
       this.injectedLibraries = compiler.injectedLibraries;
       this.globalRefMap = compiler.globalRefMap;
       this.lastInjectedLibrary = compiler.lastInjectedLibrary;
-      this.symbolTable = compiler.symbolTable;
+      this.globalTypeInfo = compiler.globalTypeInfo;
       this.hasRegExpGlobalReferences = compiler.hasRegExpGlobalReferences;
       this.typeValidator = compiler.typeValidator;
       this.lifeCycleStage = compiler.getLifeCycleStage();
@@ -3571,7 +3571,7 @@ public CompilerState call() throws Exception {
     injectedLibraries.putAll(compilerState.injectedLibraries);
     lastInjectedLibrary = compilerState.lastInjectedLibrary;
     globalRefMap = compilerState.globalRefMap;
-    symbolTable = compilerState.symbolTable;
+    globalTypeInfo = compilerState.globalTypeInfo;
     hasRegExpGlobalReferences = compilerState.hasRegExpGlobalReferences;
     typeValidator = compilerState.typeValidator;
     setLifeCycleStage(compilerState.lifeCycleStage);

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

@@ -1872,7 +1872,7 @@ public void hotSwapScript(Node scriptRoot, Node originalRoot) {
       new PassFactory("GlobalTypeInfo", true) {
         @Override
         protected CompilerPass create(final AbstractCompiler compiler) {
-          return compiler.getSymbolTable();
+          return new GlobalTypeInfoCollector(compiler);
         }
       };
 

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

@@ -290,13 +290,13 @@ public DiagnosticGroup forName(String name) {
   public static final DiagnosticGroup NEW_CHECK_TYPES_COMPATIBILITY_MODE =
       DiagnosticGroups.registerGroup("newCheckTypesCompatibility",  // undocumented
           JSTypeCreatorFromJSDoc.COMPATIBLE_DIAGNOSTICS,
-          GlobalTypeInfo.COMPATIBLE_DIAGNOSTICS,
+          GlobalTypeInfoCollector.COMPATIBLE_DIAGNOSTICS,
           NewTypeInference.COMPATIBLE_DIAGNOSTICS);
 
   public static final DiagnosticGroup NEW_CHECK_TYPES_EXTRA_CHECKS =
       DiagnosticGroups.registerGroup("newCheckTypesExtraChecks",  // undocumented
           JSTypeCreatorFromJSDoc.NEW_DIAGNOSTICS,
-          GlobalTypeInfo.NEW_DIAGNOSTICS,
+          GlobalTypeInfoCollector.NEW_DIAGNOSTICS,
           NewTypeInference.NEW_DIAGNOSTICS);
 
   // Part of the new type inference
@@ -325,30 +325,30 @@ public DiagnosticGroup forName(String name) {
           JSTypeCreatorFromJSDoc.IMPLEMENTS_WITHOUT_CONSTRUCTOR,
           JSTypeCreatorFromJSDoc.INHERITANCE_CYCLE,
           JSTypeCreatorFromJSDoc.UNION_IS_UNINHABITABLE,
-          GlobalTypeInfo.ABSTRACT_METHOD_IN_CONCRETE_CLASS,
-          GlobalTypeInfo.ANONYMOUS_NOMINAL_TYPE,
-          GlobalTypeInfo.CANNOT_INIT_TYPEDEF,
-          GlobalTypeInfo.CANNOT_OVERRIDE_FINAL_METHOD,
-          GlobalTypeInfo.CONST_WITHOUT_INITIALIZER,
+          GlobalTypeInfoCollector.ABSTRACT_METHOD_IN_CONCRETE_CLASS,
+          GlobalTypeInfoCollector.ANONYMOUS_NOMINAL_TYPE,
+          GlobalTypeInfoCollector.CANNOT_INIT_TYPEDEF,
+          GlobalTypeInfoCollector.CANNOT_OVERRIDE_FINAL_METHOD,
+          GlobalTypeInfoCollector.CONST_WITHOUT_INITIALIZER,
 //           GlobalTypeInfo.COULD_NOT_INFER_CONST_TYPE,
-          GlobalTypeInfo.CTOR_IN_DIFFERENT_SCOPE,
-          GlobalTypeInfo.DICT_WITHOUT_CTOR,
-          GlobalTypeInfo.DUPLICATE_JSDOC,
-          GlobalTypeInfo.DUPLICATE_PROP_IN_ENUM,
-          GlobalTypeInfo.EXPECTED_CONSTRUCTOR,
-          GlobalTypeInfo.EXPECTED_INTERFACE,
-          GlobalTypeInfo.INEXISTENT_PARAM,
-          GlobalTypeInfo.INTERFACE_METHOD_NOT_IMPLEMENTED,
+          GlobalTypeInfoCollector.CTOR_IN_DIFFERENT_SCOPE,
+          GlobalTypeInfoCollector.DICT_WITHOUT_CTOR,
+          GlobalTypeInfoCollector.DUPLICATE_JSDOC,
+          GlobalTypeInfoCollector.DUPLICATE_PROP_IN_ENUM,
+          GlobalTypeInfoCollector.EXPECTED_CONSTRUCTOR,
+          GlobalTypeInfoCollector.EXPECTED_INTERFACE,
+          GlobalTypeInfoCollector.INEXISTENT_PARAM,
+          GlobalTypeInfoCollector.INTERFACE_METHOD_NOT_IMPLEMENTED,
 //           GlobalTypeInfo.INVALID_PROP_OVERRIDE,
-          GlobalTypeInfo.LENDS_ON_BAD_TYPE,
-          GlobalTypeInfo.MALFORMED_ENUM,
-          GlobalTypeInfo.MISPLACED_CONST_ANNOTATION,
-          GlobalTypeInfo.ONE_TYPE_FOR_MANY_VARS,
+          GlobalTypeInfoCollector.LENDS_ON_BAD_TYPE,
+          GlobalTypeInfoCollector.MALFORMED_ENUM,
+          GlobalTypeInfoCollector.MISPLACED_CONST_ANNOTATION,
+          GlobalTypeInfoCollector.ONE_TYPE_FOR_MANY_VARS,
 //           GlobalTypeInfo.REDECLARED_PROPERTY,
-          GlobalTypeInfo.STRUCT_WITHOUT_CTOR_OR_INTERF,
-          GlobalTypeInfo.SUPER_INTERFACES_HAVE_INCOMPATIBLE_PROPERTIES,
-          GlobalTypeInfo.UNKNOWN_OVERRIDE,
-          GlobalTypeInfo.UNRECOGNIZED_TYPE_NAME,
+          GlobalTypeInfoCollector.STRUCT_WITHOUT_CTOR_OR_INTERF,
+          GlobalTypeInfoCollector.SUPER_INTERFACES_HAVE_INCOMPATIBLE_PROPERTIES,
+          GlobalTypeInfoCollector.UNKNOWN_OVERRIDE,
+          GlobalTypeInfoCollector.UNRECOGNIZED_TYPE_NAME,
           NewTypeInference.ABSTRACT_SUPER_METHOD_NOT_CALLABLE,
           NewTypeInference.ASSERT_FALSE,
           NewTypeInference.CANNOT_BIND_CTOR,
@@ -449,7 +449,7 @@ public DiagnosticGroup forName(String name) {
           TypeValidator.DUP_VAR_DECLARATION,
           TypeValidator.DUP_VAR_DECLARATION_TYPE_MISMATCH,
           VariableReferenceCheck.REDECLARED_VARIABLE,
-          GlobalTypeInfo.REDECLARED_PROPERTY);
+          GlobalTypeInfoCollector.REDECLARED_PROPERTY);
 
   public static final DiagnosticGroup ES3 =
       DiagnosticGroups.registerGroup("es3",