Roll back of "(Take 2) Moves J2CL pass to run before ES6 generator re…

…-writing."

Reason: Interacts badly with the class tranpilation move. The J2CL pass is not compatible with ES6 classes and needs to run after transpilation.

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

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

@@ -462,10 +462,6 @@ protected List<PassFactory> getChecks() {
 
     checks.add(createEmptyPass(PassNames.AFTER_STANDARD_CHECKS));
 
-    if (!options.checksOnly && options.j2clPassMode.shouldAddJ2clPasses()) {
-      checks.add(j2clPass);
-    }
-
     if (!options.checksOnly) {
       // At this point all checks have been done.
       // There's no need to complete transpilation if we're only running checks.
@@ -522,7 +518,10 @@ protected List<PassFactory> getOptimizations() {
     // optimizing passes.
     passes.add(gatherExternProperties);
 
+    // Should be run before runtimeTypeCheck and instrumentForCoverage as they rewrite code that
+    // this pass expects to see.
     if (options.j2clPassMode.shouldAddJ2clPasses()) {
+      passes.add(j2clPass);
       passes.add(j2clUtilGetDefineRewriterPass);
     }
 
@@ -1112,12 +1111,6 @@ private void assertValidOrderForChecks(List<PassFactory> checks) {
         removeSuperMethodsPass,
         "Super-call method removal must run after closure code removal, because "
             + "removing assertions may make more super calls eligible to be stripped.");
-
-    assertPassOrder(
-        checks,
-        j2clPass,
-        TranspilationPasses.rewriteGenerators,
-        "J2CL normalization should be done before generator re-writing.");
   }
 
   /**

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

@@ -272,14 +272,6 @@ public boolean apply(Node input) {
    */
   Node inline(Reference ref, String fnName, Node fnNode) {
     checkState(compiler.getLifeCycleStage().isNormalized());
-    return unsafeInline(ref, fnName, fnNode);
-  }
-
-  /**
-   * Inline a function into the call site. Note that this unsafe version doesn't verify if the AST
-   * is normalized. You should use {@link inline} instead.
-   */
-  Node unsafeInline(Reference ref, String fnName, Node fnNode) {
     Node result;
     if (ref.mode == InliningMode.DIRECT) {
       result = inlineReturnValue(ref, fnNode);

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

@@ -185,7 +185,7 @@ public void visit(NodeTraversal t, Node n, Node parent) {
 
         // Otherwise inline the call.
         Node inlinedCall =
-            injector.unsafeInline(
+            injector.inline(
                 new Reference(n, t.getScope(), t.getModule(), inliningMode), fnName, fnImpl);
         t.getCompiler().reportChangeToEnclosingScope(inlinedCall);
       }