src/jdk.compiler/share/classes/com/sun/tools/javac/file/BaseFileManager.java

@@ -53,10 +53,12 @@
  import javax.tools.JavaFileObject;
  import javax.tools.JavaFileObject.Kind;
  
  import com.sun.tools.javac.code.Lint;
  import com.sun.tools.javac.code.Lint.LintCategory;
+ import com.sun.tools.javac.main.JavaCompiler;
+ import com.sun.tools.javac.main.JavaCompiler.CodeReflectionSupport;
  import com.sun.tools.javac.main.Option;
  import com.sun.tools.javac.main.OptionHelper;
  import com.sun.tools.javac.main.OptionHelper.GrumpyHelper;
  import com.sun.tools.javac.resources.CompilerProperties.Errors;
  import com.sun.tools.javac.resources.CompilerProperties.LintWarnings;

@@ -189,11 +191,13 @@
      public void clear() {
          new HashSet<>(options.keySet()).forEach(k -> options.remove(k));
      }
  
      protected ClassLoader getClassLoader(URL[] urls) {
-         ClassLoader thisClassLoader = getClass().getClassLoader();
+         ClassLoader thisClassLoader = CodeReflectionSupport.CODE_LAYER != null ?
+                 CodeReflectionSupport.CODE_LAYER.findLoader("jdk.incubator.code") :
+                 getClass().getClassLoader();
  
          // Allow the following to specify a closeable classloader
          // other than URLClassLoader.
  
          // 1: Allow client to specify the class to use via hidden option