Use CacheFSInfo

PiperOrigin-RevId: 175709097

2 files changed, 16 insertions, 2 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
index 1843db400c..1be5335f59 100644
--- 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
@@ -25,6 +25,7 @@ import com.google.devtools.build.buildjar.javac.plugins.BlazeJavaCompilerPlugin;
 import com.sun.source.util.JavacTask;
 import com.sun.tools.javac.api.ClientCodeWrapper.Trusted;
 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.util.Context;
@@ -75,6 +76,7 @@ public class BlazeJavacMain {
     }
 
     Context context = new Context();
+    CacheFSInfo.preRegister(context);
     setupBlazeJavaCompiler(arguments.plugins(), context);
 
     boolean ok = false;
@@ -196,8 +198,14 @@ public class BlazeJavacMain {
   @Trusted
   private static class ClassloaderMaskingFileManager extends JavacFileManager {
 
+    private static Context getContext() {
+      Context context = new Context();
+      CacheFSInfo.preRegister(context);
+      return context;
+    }
+
     public ClassloaderMaskingFileManager() {
-      super(new Context(), false, UTF_8);
+      super(getContext(), false, UTF_8);
     }
 
     @Override
diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/java/turbine/javac/JavacTurbineCompiler.java b/src/java_tools/buildjar/java/com/google/devtools/build/java/turbine/javac/JavacTurbineCompiler.java
index 609149a94b..6db9b88426 100644
--- a/src/java_tools/buildjar/java/com/google/devtools/build/java/turbine/javac/JavacTurbineCompiler.java
+++ b/src/java_tools/buildjar/java/com/google/devtools/build/java/turbine/javac/JavacTurbineCompiler.java
@@ -114,8 +114,14 @@ public class JavacTurbineCompiler {
   @Trusted
   private static class ClassloaderMaskingFileManager extends JavacFileManager {
 
+    private static Context getContext() {
+      Context context = new Context();
+      CacheFSInfo.preRegister(context);
+      return context;
+    }
+
     public ClassloaderMaskingFileManager() {
-      super(new Context(), false, UTF_8);
+      super(getContext(), false, UTF_8);
     }
 
     @Override