[NTI] Rearrange the order of some pre-typechecking transpilation passes.

This allows removing TranspilationPasses#addEs6LatePasses and replacing it with the two calls, addEs6LatePassesBeforeNti and addEs6LatePassesAfterNti.  We will be further rearranging the passes as NTI becomes capable of handling more ES6 features.

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

Author: shicks

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

@@ -183,7 +183,8 @@ protected List<PassFactory> getTranspileOnlyPasses() {
     // can be removed.
     if (options.needsTranspilationFrom(ES6) || options.needsTranspilationFrom(ES7)) {
       TranspilationPasses.addEs6EarlyPasses(passes);
-      TranspilationPasses.addEs6LatePasses(passes);
+      TranspilationPasses.addEs6LatePassesBeforeNti(passes);
+      TranspilationPasses.addEs6LatePassesAfterNti(passes);
       TranspilationPasses.addPostCheckPasses(passes);
       if (options.rewritePolyfills) {
         TranspilationPasses.addRewritePolyfillPass(passes);
@@ -381,10 +382,9 @@ protected List<PassFactory> getChecks() {
     }
 
     if (options.needsTranspilationFrom(ES6)) {
-      if (options.getTypeCheckEs6Natively()) {
-        TranspilationPasses.addEs6PassesBeforeNTI(checks);
-      } else {
-        TranspilationPasses.addEs6LatePasses(checks);
+      TranspilationPasses.addEs6LatePassesBeforeNti(checks);
+      if (!options.getTypeCheckEs6Natively()) {
+        TranspilationPasses.addEs6LatePassesAfterNti(checks);
       }
     }
 
@@ -424,7 +424,7 @@ protected List<PassFactory> getChecks() {
       }
 
       if (options.needsTranspilationFrom(ES6)) {
-        TranspilationPasses.addEs6PassesAfterNTI(checks);
+        TranspilationPasses.addEs6LatePassesAfterNti(checks);
         checks.add(setFeatureSet(options.getLanguageOut().toFeatureSet()));
       }
     }

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

@@ -59,17 +59,6 @@ public static void addEs6EarlyPasses(List<PassFactory> passes) {
     passes.add(es6RewriteArrowFunction);
   }
 
-  /** Adds all the late ES6 transpilation passes, which go after the Dart pass */
-  public static void addEs6LatePasses(List<PassFactory> passes) {
-    // TODO(b/64811685): Delete this method and use addEs6PassesBeforeNTI and addEs6PassesAfterNTI.
-    passes.add(es6ExtractClasses);
-    passes.add(es6RewriteClass);
-    passes.add(earlyConvertEs6ToEs3);
-    passes.add(lateConvertEs6ToEs3);
-    passes.add(rewriteBlockScopedDeclaration);
-    passes.add(rewriteGenerators);
-  }
-
   /**
    * Adds all the late ES6 transpilation passes, which go after the Dart pass
    * and go before TypeChecking
@@ -79,15 +68,15 @@ public static void addEs6LatePasses(List<PassFactory> passes) {
    * transpilation later in the compilation, and eventually only transpiling
    * when the output is lower than ES6.
    */
-  public static void addEs6PassesBeforeNTI(List<PassFactory> passes) {
+  public static void addEs6LatePassesBeforeNti(List<PassFactory> passes) {
     passes.add(es6ExtractClasses);
     passes.add(es6RewriteClass);
     passes.add(earlyConvertEs6ToEs3);
     passes.add(rewriteBlockScopedDeclaration);
   }
 
   /** Adds all transpilation passes that runs after NTI */
-  public static void addEs6PassesAfterNTI(List<PassFactory> passes) {
+  public static void addEs6LatePassesAfterNti(List<PassFactory> passes) {
     passes.add(lateConvertEs6ToEs3);
     passes.add(rewriteGenerators);
   }

test/com/google/javascript/jscomp/CompilerTestCase.java

@@ -1681,7 +1681,8 @@ private static void transpileToEs5(AbstractCompiler compiler, Node externsRoot,
     TranspilationPasses.addEs2017Passes(factories);
     TranspilationPasses.addEs2016Passes(factories);
     TranspilationPasses.addEs6EarlyPasses(factories);
-    TranspilationPasses.addEs6LatePasses(factories);
+    TranspilationPasses.addEs6LatePassesBeforeNti(factories);
+    TranspilationPasses.addEs6LatePassesAfterNti(factories);
     TranspilationPasses.addRewritePolyfillPass(factories);
     for (PassFactory factory : factories) {
       factory.create(compiler).process(externsRoot, codeRoot);

test/com/google/javascript/jscomp/NewTypeInferenceTestBase.java

@@ -260,7 +260,8 @@ private final void parseAndTypeCheck(String externs, String js) {
       TranspilationPasses.addEs2017Passes(passes);
       TranspilationPasses.addEs2016Passes(passes);
       TranspilationPasses.addEs6EarlyPasses(passes);
-      TranspilationPasses.addEs6LatePasses(passes);
+      TranspilationPasses.addEs6LatePassesBeforeNti(passes);
+      TranspilationPasses.addEs6LatePassesAfterNti(passes);
       TranspilationPasses.addRewritePolyfillPass(passes);
     }
     passes.add(makePassFactory("GlobalTypeInfo", new GlobalTypeInfoCollector(compiler)));

test/com/google/javascript/jscomp/TypeCheckTest.java

@@ -17953,7 +17953,8 @@ private TypeCheckResult parseAndTypeCheckWithScope(String externs, String js) {
       TranspilationPasses.addEs2017Passes(passes);
       TranspilationPasses.addEs2016Passes(passes);
       TranspilationPasses.addEs6EarlyPasses(passes);
-      TranspilationPasses.addEs6LatePasses(passes);
+      TranspilationPasses.addEs6LatePassesBeforeNti(passes);
+      TranspilationPasses.addEs6LatePassesAfterNti(passes);
       TranspilationPasses.addRewritePolyfillPass(passes);
       PhaseOptimizer phaseopt = new PhaseOptimizer(compiler, null);
       phaseopt.consume(passes);