Delete some dead code

Follow-up to 242adde PiperOrigin-RevId: 644511493 Change-Id: I7e3b9de3780c8819b53f072b72b8d2624ce59b06
bazelbuild · Jun 18, 2024 · 08575f4 · 08575f4
1 parent b63ad3f
commit 08575f4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 26 deletions.
diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/BlazeJavacMain.java b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/BlazeJavacMain.java
@@ -36,7 +36,6 @@
 import com.sun.tools.javac.api.JavacTool;
 import com.sun.tools.javac.file.CacheFSInfo;
 import com.sun.tools.javac.file.JavacFileManager;
-import com.sun.tools.javac.main.JavaCompiler;
 import com.sun.tools.javac.main.Main.Result;
 import com.sun.tools.javac.util.Context;
 import com.sun.tools.javac.util.Log;
@@ -120,7 +119,6 @@ public static BlazeJavacResult compile(BlazeJavacArguments arguments) {
     // it and handling exceptions directly in callers.
     PrintWriter errWriter = new PrintWriter(errOutput);
     Listener diagnosticsBuilder = new Listener(arguments.failFast(), maybeWerrorCustom, context);
-    BlazeJavaCompiler compiler;
 
     // Initialize parts of context that the filemanager depends on
     context.put(DiagnosticListener.class, diagnosticsBuilder);
@@ -170,8 +168,6 @@ public static BlazeJavacResult compile(BlazeJavacArguments arguments) {
       }
       t.printStackTrace(errWriter);
       status = Status.CRASH;
-    } finally {
-      compiler = (BlazeJavaCompiler) JavaCompiler.instance(context);
     }
     errWriter.flush();
     ImmutableList<FormattedDiagnostic> diagnostics = diagnosticsBuilder.build();
@@ -191,11 +187,7 @@ public static BlazeJavacResult compile(BlazeJavacArguments arguments) {
     }
 
     return BlazeJavacResult.createFullResult(
-        status,
-        filterDiagnostics(werror, diagnostics),
-        errOutput.toString(),
-        compiler,
-        builder.build());
+        status, filterDiagnostics(werror, diagnostics), errOutput.toString(), builder.build());
   }
 
   private static Status fromResult(Result result) {

diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/BlazeJavacResult.java b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/BlazeJavacResult.java
@@ -14,10 +14,8 @@
 
 package com.google.devtools.build.buildjar.javac;
 
-import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
 import com.google.devtools.build.buildjar.javac.statistics.BlazeJavacStatistics;
-import javax.annotation.Nullable;
 
 /** The result of a single compilation performed by {@link BlazeJavacMain}. */
 public class BlazeJavacResult {
@@ -33,52 +31,48 @@ public enum Status {
   private final Status status;
   private final ImmutableList<FormattedDiagnostic> diagnostics;
   private final String output;
-  private final BlazeJavaCompiler compiler;
   private final BlazeJavacStatistics statistics;
 
   public static BlazeJavacResult ok() {
-    return createFullResult(Status.OK, ImmutableList.of(), "", null, BlazeJavacStatistics.empty());
+    return createFullResult(Status.OK, ImmutableList.of(), "", BlazeJavacStatistics.empty());
   }
 
   public static BlazeJavacResult error(String message) {
     return createFullResult(
-        Status.ERROR, ImmutableList.of(), message, null, BlazeJavacStatistics.empty());
+        Status.ERROR, ImmutableList.of(), message, BlazeJavacStatistics.empty());
   }
 
   public static BlazeJavacResult cancelled(String message) {
     return createFullResult(
-        Status.CANCELLED, ImmutableList.of(), message, null, BlazeJavacStatistics.empty());
+        Status.CANCELLED, ImmutableList.of(), message, BlazeJavacStatistics.empty());
   }
 
   public static BlazeJavacResult fallback() {
     return createFullResult(
-        Status.REQUIRES_FALLBACK, ImmutableList.of(), "", null, BlazeJavacStatistics.empty());
+        Status.REQUIRES_FALLBACK, ImmutableList.of(), "", BlazeJavacStatistics.empty());
   }
 
   public BlazeJavacResult withStatistics(BlazeJavacStatistics statistics) {
-    return new BlazeJavacResult(status, diagnostics, output, compiler, statistics);
+    return new BlazeJavacResult(status, diagnostics, output, statistics);
   }
 
   private BlazeJavacResult(
       Status status,
       ImmutableList<FormattedDiagnostic> diagnostics,
       String output,
-      @Nullable BlazeJavaCompiler compiler,
       BlazeJavacStatistics statistics) {
     this.status = status;
     this.diagnostics = diagnostics;
     this.output = output;
-    this.compiler = compiler;
     this.statistics = statistics;
   }
 
   public static BlazeJavacResult createFullResult(
       Status status,
       ImmutableList<FormattedDiagnostic> diagnostics,
       String output,
-      BlazeJavaCompiler compiler,
       BlazeJavacStatistics statistics) {
-    return new BlazeJavacResult(status, diagnostics, output, compiler, statistics);
+    return new BlazeJavacResult(status, diagnostics, output, statistics);
   }
 
   public boolean isOk() {
@@ -100,9 +94,4 @@ public String output() {
   public BlazeJavacStatistics statistics() {
     return statistics;
   }
-
-  @VisibleForTesting
-  public BlazeJavaCompiler compiler() {
-    return compiler;
-  }
 }