jit: call javac in DiskCompilerAdvisor

Author: ice1000

Diff for: cli-impl/src/main/java/module-info.java

@@ -9,6 +9,7 @@
   requires aya.compiler;
   requires org.jetbrains.annotations;
   requires org.commonmark;
+  requires java.compiler;
 
   exports org.aya.cli.interactive;
   exports org.aya.cli.library.incremental;

Diff for: cli-impl/src/main/java/org/aya/cli/library/LibraryModuleLoader.java

@@ -90,7 +90,7 @@ public boolean existsFileLevelModule(@NotNull ModulePath path) {
     @NotNull ModulePath mod, @Nullable Path sourcePath,
     @Nullable Path corePath, @NotNull ModuleLoader recurseLoader
   ) {
-    return advisor.loadCompiledCore(reporter, mod, sourcePath, corePath, recurseLoader);
+    return advisor.loadCompiledCore(reporter, owner, mod, sourcePath, corePath, recurseLoader);
   }
 
   private void saveCompiledCore(

Diff for: cli-impl/src/main/java/org/aya/cli/library/incremental/CompilerAdvisor.java

@@ -63,7 +63,7 @@ default void notifyIncrementalJob(
    */
   @Nullable ResolveInfo doLoadCompiledCore(
     @NotNull Reporter reporter,
-    @NotNull ModulePath mod,
+    @NotNull LibraryOwner owner, @NotNull ModulePath mod,
     @Nullable Path sourcePath,
     @Nullable Path corePath,
     @NotNull ModuleLoader recurseLoader
@@ -78,14 +78,14 @@ void doSaveCompiledCore(
   @ApiStatus.NonExtendable
   default @Nullable ResolveInfo loadCompiledCore(
     @NotNull Reporter reporter,
-    @NotNull ModulePath mod,
+    @NotNull LibraryOwner owner, @NotNull ModulePath mod,
     @Nullable Path sourcePath,
     @Nullable Path corePath,
     @NotNull ModuleLoader recurseLoader
   ) {
     assert recurseLoader instanceof CachedModuleLoader<?>;
     try {
-      return doLoadCompiledCore(reporter, mod, sourcePath, corePath, recurseLoader);
+      return doLoadCompiledCore(reporter, owner, mod, sourcePath, corePath, recurseLoader);
     } catch (IOException | ClassNotFoundException e) {
       throw new Panic("Compiled aya found but cannot be loaded", e);
     }

Diff for: cli-impl/src/main/java/org/aya/cli/library/incremental/DelegateCompilerAdvisor.java

@@ -52,8 +52,8 @@ public void notifyIncrementalJob(@NotNull ImmutableSeq<LibrarySource> modified,
   }
 
   @Override public @Nullable ResolveInfo
-  doLoadCompiledCore(@NotNull Reporter reporter, @NotNull ModulePath mod, @Nullable Path sourcePath, @Nullable Path corePath, @NotNull ModuleLoader recurseLoader) throws IOException, ClassNotFoundException {
-    return delegate.doLoadCompiledCore(reporter, mod, sourcePath, corePath, recurseLoader);
+  doLoadCompiledCore(@NotNull Reporter reporter, @NotNull LibraryOwner owner, @NotNull ModulePath mod, @Nullable Path sourcePath, @Nullable Path corePath, @NotNull ModuleLoader recurseLoader) throws IOException, ClassNotFoundException {
+    return delegate.doLoadCompiledCore(reporter, owner, mod, sourcePath, corePath, recurseLoader);
   }
 
   @Override public void

Diff for: cli-impl/src/main/java/org/aya/cli/library/incremental/DiskCompilerAdvisor.java

@@ -6,9 +6,7 @@
 import org.aya.cli.library.source.LibraryOwner;
 import org.aya.cli.library.source.LibrarySource;
 import org.aya.cli.utils.CompilerUtil;
-import org.aya.compiler.CompiledModule;
-import org.aya.compiler.FileSerializer;
-import org.aya.compiler.ModuleSerializer;
+import org.aya.compiler.*;
 import org.aya.resolve.ResolveInfo;
 import org.aya.resolve.context.EmptyContext;
 import org.aya.resolve.module.ModuleLoader;
@@ -20,7 +18,10 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import javax.tools.ToolProvider;
 import java.io.IOException;
+import java.net.URL;
+import java.net.URLClassLoader;
 import java.nio.file.Files;
 import java.nio.file.Path;
 
@@ -57,7 +58,7 @@ public class DiskCompilerAdvisor implements CompilerAdvisor {
   }
   @Override public @Nullable ResolveInfo doLoadCompiledCore(
     @NotNull Reporter reporter,
-    @NotNull ModulePath mod,
+    @NotNull LibraryOwner owner, @NotNull ModulePath mod,
     @Nullable Path sourcePath,
     @Nullable Path corePath,
     @NotNull ModuleLoader recurseLoader
@@ -66,10 +67,13 @@ public class DiskCompilerAdvisor implements CompilerAdvisor {
     if (!Files.exists(corePath)) return null;
 
     var context = new EmptyContext(reporter, sourcePath).derive(mod);
-    // TODO: load defs
     try (var inputStream = FileUtil.ois(corePath)) {
       var compiledAya = (CompiledModule) inputStream.readObject();
-      return compiledAya.toResolveInfo(recurseLoader, context);
+      var baseDir = computeBaseDir(owner);
+      try (var cl = new URLClassLoader(new URL[]{baseDir.toUri().toURL()})) {
+        cl.loadClass(AbstractSerializer.getModuleReference(mod));
+        return compiledAya.toResolveInfo(recurseLoader, context, cl);
+      }
     }
   }
 
@@ -83,13 +87,19 @@ public class DiskCompilerAdvisor implements CompilerAdvisor {
       .serialize(new FileSerializer.FileResult(file.moduleName().dropLast(1), new ModuleSerializer.ModuleResult(
         name, defs.filterIsInstance(TopLevelDef.class), ImmutableSeq.empty())))
       .result();
+    var javaSrcPath = FileUtil.resolveFile(computeBaseDir(file.owner()).resolve(AyaSerializer.PACKAGE_BASE),
+      file.moduleName().module(), ".java");
+    FileUtil.writeString(javaSrcPath, javaCode);
+    var compiler = ToolProvider.getSystemJavaCompiler();
+    var fileManager = compiler.getStandardFileManager(null, null, null);
+    var compilationUnits = fileManager.getJavaFileObjects(javaSrcPath);
+    var task = compiler.getTask(null, fileManager, null, null, null, compilationUnits);
+    task.call();
     var coreFile = file.compiledCorePath();
-    // try {
-    //   var compiled = Compiler.java().from(STR."\{AyaSerializer.PACKAGE_BASE}.\{name}", javaCode).compile();
-    //   compiled.saveTo(coreFile.resolveSibling(STR."\{name}.compiled"));
-    // } catch (Compiler.CompileException e) {
-    //   throw new Panic(e);
-    // }
     CompilerUtil.saveCompiledCore(coreFile, resolveInfo);
   }
+
+  private static @NotNull Path computeBaseDir(@NotNull LibraryOwner owner) {
+    return owner.outDir().resolve("compiled");
+  }
 }

Diff for: cli-impl/src/main/java/org/aya/cli/library/incremental/InMemoryCompilerAdvisor.java

@@ -63,7 +63,7 @@ public class InMemoryCompilerAdvisor implements CompilerAdvisor {
   @Override
   public @Nullable ResolveInfo doLoadCompiledCore(
     @NotNull Reporter reporter,
-    @NotNull ModulePath mod,
+    @NotNull LibraryOwner owner, @NotNull ModulePath mod,
     @Nullable Path sourcePath,
     @Nullable Path corePath,
     @NotNull ModuleLoader recurseLoader

Diff for: jit-compiler/src/main/java/org/aya/compiler/CompiledModule.java

@@ -166,9 +166,9 @@ private void serOp(@NotNull TyckDef def) {
   }
 
   public @NotNull ResolveInfo toResolveInfo(
-    @NotNull ModuleLoader loader, @NotNull PhysicalModuleContext context
+    @NotNull ModuleLoader loader, @NotNull PhysicalModuleContext context, ClassLoader classLoader
   ) {
-    var state = new DeState(getClass().getClassLoader());
+    var state = new DeState(classLoader);
     return toResolveInfo(loader, context, state, new PrimFactory(), new ShapeFactory());
   }
   public @NotNull ResolveInfo toResolveInfo(

Diff for: jit-compiler/src/test/java/CompileTester.java

@@ -5,14 +5,14 @@
 import org.aya.compiler.AyaSerializer;
 import org.aya.resolve.module.DumbModuleLoader;
 import org.aya.syntax.compile.JitDef;
+import org.aya.util.FileUtil;
 import org.jetbrains.annotations.NotNull;
 
 import javax.tools.ToolProvider;
 import java.io.IOException;
 import java.lang.reflect.Field;
 import java.net.URL;
 import java.net.URLClassLoader;
-import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
@@ -23,8 +23,7 @@ public class CompileTester {
   public CompileTester(@NotNull String code) throws IOException {
     var root = Paths.get("build/tmp/testGenerated");
     var genDir = root.resolve(AyaSerializer.PACKAGE_BASE);
-    Files.createDirectories(genDir);
-    Files.writeString(baka = genDir.resolve("baka.java"), code);
+    FileUtil.writeString(baka = genDir.resolve("baka.java"), code);
     cl = new URLClassLoader(new URL[]{root.toUri().toURL()});
   }