Revert "Separate instance of HostClassLoader per project"

This reverts commit c98bdaf.

Author: Akirathan

engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/interop/java/AddToClassPathNode.java

@@ -27,12 +27,7 @@ static AddToClassPathNode build() {
   Object doExecute(Object path, @Cached ExpectStringNode expectStringNode) {
     var ctx = EnsoContext.get(this);
     var file = ctx.getTruffleFile(new File(expectStringNode.execute(path)));
-    var pkg = ctx.getPackageOf(file);
-    if (pkg.isEmpty()) {
-      throw ctx.raiseAssertionPanic(this, "File " + file + "should be in a package", null);
-    } else {
-      ctx.addToClassPath(file, pkg.get());
-      return ctx.getBuiltins().nothing();
-    }
+    ctx.addToClassPath(file);
+    return ctx.getBuiltins().nothing();
   }
 }

engine/runtime/src/main/java/org/enso/interpreter/runtime/EnsoContext.java

@@ -30,9 +30,7 @@
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
@@ -84,7 +82,7 @@ public final class EnsoContext {
 
   private final EnsoLanguage language;
   private final Env environment;
-  private final Map<LibraryName, HostClassLoader> hostClassLoaders = new HashMap<>();
+  private final HostClassLoader hostClassLoader = new HostClassLoader();
   private final boolean assertionsEnabled;
   private final boolean isPrivateCheckDisabled;
   private final boolean isStaticTypeAnalysisEnabled;
@@ -299,7 +297,7 @@ public void shutdown() {
     packageRepository.shutdown();
     guestJava = null;
     topScope = null;
-    hostClassLoaders.values().forEach(HostClassLoader::close);
+    hostClassLoader.close();
     EnsoParser.freeAll();
   }
 
@@ -468,16 +466,10 @@ public Optional<Module> findModuleByExpressionId(UUID expressionId) {
    * Modifies the classpath to use to lookup {@code polyglot java} imports.
    *
    * @param file the file to register
-   * @param pkg Package the file belongs to
    */
   @TruffleBoundary
-  public void addToClassPath(TruffleFile file, Package<TruffleFile> pkg) {
+  public void addToClassPath(TruffleFile file) {
     if (findGuestJava() == null) {
-      var hostClassLoader = hostClassLoaders.get(pkg.libraryName());
-      if (hostClassLoader == null) {
-        hostClassLoader = new HostClassLoader(pkg);
-        hostClassLoaders.put(pkg.libraryName(), hostClassLoader);
-      }
       try {
         var url = file.toUri().toURL();
         hostClassLoader.add(url);
@@ -597,32 +589,16 @@ public TruffleObject lookupJavaClass(String className) {
     return getBuiltins().error().makeMissingPolyglotImportError(className);
   }
 
-  /**
-   * Tries to find a Java class by its fully qualified name in all the {@link HostClassLoader host
-   * class loaders}.
-   */
   private Object lookupHostSymbol(String fqn)
       throws ClassNotFoundException, UnknownIdentifierException, UnsupportedMessageException {
-    if (findGuestJava() == null) {
-      Class<?> clazz = null;
-      ClassNotFoundException lastEx = null;
-      for (var hostClassLoader : hostClassLoaders.values()) {
-        try {
-          clazz = hostClassLoader.loadClass(fqn);
-          if (clazz != null) {
-            break;
-          }
-        } catch (ClassNotFoundException e) {
-          lastEx = e;
-          continue;
-        }
-      }
-      if (clazz == null) {
-        throw new ClassNotFoundException("Error loading host symbol " + fqn, lastEx);
+    try {
+      if (findGuestJava() == null) {
+        return environment.asHostSymbol(hostClassLoader.loadClass(fqn));
+      } else {
+        return InteropLibrary.getUncached().readMember(findGuestJava(), fqn);
       }
-      return environment.asHostSymbol(clazz);
-    } else {
-      return InteropLibrary.getUncached().readMember(findGuestJava(), fqn);
+    } catch (Error e) {
+      throw new ClassNotFoundException("Error loading " + fqn, e);
     }
   }
 

engine/runtime/src/main/java/org/enso/interpreter/runtime/HostClassLoader.java

@@ -1,12 +1,9 @@
 package org.enso.interpreter.runtime;
 
-import com.oracle.truffle.api.TruffleFile;
 import java.net.URL;
 import java.net.URLClassLoader;
-import java.util.Locale;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-import org.enso.pkg.Package;
 import org.graalvm.polyglot.Context;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -28,16 +25,12 @@ final class HostClassLoader extends URLClassLoader implements AutoCloseable {
   // module layer's class loader.
   private static final ClassLoader polyglotClassLoader = Context.class.getClassLoader();
 
-  private final Package<TruffleFile> pkg;
-
   // polyglotClassLoader will be used only iff `org.enso.runtime` module is not in the
   // boot module layer.
   private static final boolean isRuntimeModInBootLayer;
 
-  public HostClassLoader(Package<TruffleFile> pkg) {
+  public HostClassLoader() {
     super(new URL[0]);
-    this.pkg = pkg;
-    assert pkg.polyglotDir().exists();
   }
 
   static {
@@ -92,9 +85,4 @@ protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundE
   public void close() {
     loadedClasses.clear();
   }
-
-  @Override
-  public String toString() {
-    return "HostClassLoader(" + pkg.libraryName() + ")";
-  }
 }

engine/runtime/src/main/scala/org/enso/interpreter/runtime/DefaultPackageRepository.scala

@@ -197,7 +197,7 @@ private class DefaultPackageRepository(
     isLibrary: Boolean
   ): Unit = {
     val extensions = pkg.listPolyglotExtensions("java")
-    extensions.foreach(ext => context.addToClassPath(ext, pkg))
+    extensions.foreach(context.addToClassPath)
 
     val (regularModules, syntheticModulesMetadata) = pkg
       .listSources()