Factor out completeCompilation()

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

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

@@ -1131,30 +1131,32 @@ private Result performFullCompilationWithModules(
       B options, List<SourceFile> externs, List<JSModule> modules) {
     try {
       compiler.initModules(externs, modules, options);
-      if (compiler.hasErrors()) {
-        return compiler.getResult();
+      if (!compiler.hasErrors()) {
+        compiler.checkAndTranspileAndOptimize();
+        compiler.completeCompilation();
       }
-      return compiler.checkAndTranspileAndOptimize();
     } finally {
       // Make sure we generate a report of errors and warnings even if the compiler throws an
       // exception somewhere.
       compiler.generateReport();
     }
+    return compiler.getResult();
   }
 
   private Result performFullCompilation(
       B options, List<SourceFile> externs, List<SourceFile> inputs) {
     try {
       compiler.init(externs, inputs, options);
-      if (compiler.hasErrors()) {
-        return compiler.getResult();
+      if (!compiler.hasErrors()) {
+        compiler.checkAndTranspileAndOptimize();
+        compiler.completeCompilation();
       }
-      return compiler.checkAndTranspileAndOptimize();
     } finally {
       // Make sure we generate a report of errors and warnings even if the compiler throws an
       // exception somewhere.
       compiler.generateReport();
     }
+    return compiler.getResult();
   }
 
   /**

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

@@ -760,13 +760,14 @@ public <T1 extends SourceFile, T2 extends SourceFile> Result initAndCheckAndTran
 
     try {
       init(externs, inputs, options);
-      if (hasErrors()) {
-        return getResult();
+      if (!hasErrors()) {
+        checkAndTranspileAndOptimize();
+        completeCompilation();
       }
-      return checkAndTranspileAndOptimize();
     } finally {
       generateReport();
     }
+    return getResult();
   }
 
   /**
@@ -796,20 +797,23 @@ public <T extends SourceFile> Result initModulesAndCheckAndTranspileAndOptimize(
 
     try {
       initModules(externs, modules, options);
-      if (hasErrors()) {
-        return getResult();
+      if (!hasErrors()) {
+        checkAndTranspileAndOptimize();
+        completeCompilation();
       }
-      return checkAndTranspileAndOptimize();
     } finally {
       generateReport();
     }
+    return getResult();
   }
 
   /**
    * Generates a report of all warnings and errors found during compilation to stderr.
    *
    * <p>Client code must call this method explicitly if it doesn't use one of the convenience
    * methods that do so automatically.
+   * <p>Always call this method, even if the compiler throws an exception. The report will include
+   * information about the exception.
    */
   public void generateReport() {
     Tracer t = newTracer("generateReport");
@@ -836,15 +840,14 @@ public <T extends SourceFile> Result compileModules(
    * report of warnings and errors to stderr.  See the invocation in
    * {@link #initAndCheckAndTranspileAndOptimize} for a good example.
    * <p> TODO(bradfordcsmith): Break this up into checkAndTranspile() and optimize().
-   * @return compilation results.
    */
-  public Result checkAndTranspileAndOptimize() {
+  public void checkAndTranspileAndOptimize() {
     checkState(
         inputs != null && !inputs.isEmpty(), "No inputs. Did you call init() or initModules()?");
-    return runInCompilerThread(
-        new Callable<Result>() {
+    runInCompilerThread(
+        new Callable<Void>() {
           @Override
-          public Result call() throws Exception {
+          public Void call() throws Exception {
             parseForCompilation();
             if (!hasErrors()) {
               if (options.getInstrumentForCoverageOnly()) {
@@ -856,8 +859,7 @@ public Result call() throws Exception {
                 }
               }
             }
-            completeCompilation();
-            return getResult();
+            return null;
           }
         });
   }
@@ -899,10 +901,29 @@ private void performChecksAndTranspilation() {
     }
   }
 
+  /**
+   * Performs all the bookkeeping required at the end of a compilation.
+   *
+   * <p>This method must be called if the compilation makes it as far as doing checks.
+   * <p> DON'T call it if the compiler threw an exception.
+   * <p> DO call it even when {@code hasErrors()} returns true.
+   */
+  public void completeCompilation() {
+    runInCompilerThread(new Callable<Void>() {
+
+      @Override
+      public Void call() throws Exception {
+        completeCompilationInternal();
+        return null;
+      }
+
+    });
+  }
+
   /**
    * Performs all the bookkeeping required at the end of a compilation.
    */
-  private void completeCompilation() {
+  private void completeCompilationInternal() {
     if (options.recordFunctionInformation) {
       recordFunctionInformation();
     }