Layered class loading of library and compiler

sbt · Mar 2, 2018 · 2b07b4b · 2b07b4b
1 parent a17567c
commit 2b07b4b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/launcher-implementation/src/main/scala/xsbt/boot/Launch.scala b/launcher-implementation/src/main/scala/xsbt/boot/Launch.scala
@@ -322,11 +322,18 @@ class Launch private[xsbt] (val bootDirectory: File, val lockBoot: Boolean, val
     }
   def componentProvider(appHome: File) = new ComponentProvider(appHome, lockBoot)
 
-  def scalaProvider(scalaVersion: String, module: RetrievedModule, parentLoader: ClassLoader, scalaLibDir: File): xsbti.ScalaProvider = new xsbti.ScalaProvider {
+  def scalaProvider(scalaVersion: String, module: RetrievedModule, parentLoader: ClassLoader, scalaLibDir: File): xsbti.ScalaProvider = new xsbti.ExtendedScalaProvider {
     def launcher = Launch.this
     def version = scalaVersion
-    lazy val loader = module.createLoader(parentLoader)
 
+    private object LoaderInit {
+      val (library, other) = module.fullClasspath.partition(_.getName.startsWith("scala-library"))
+      val libraryLoader = new URLClassLoader(toURLs(library), parentLoader)
+      val fullLoader = new URLClassLoader(toURLs(other), libraryLoader)
+    }
+
+    override def loaderLibraryOnly(): ClassLoader = LoaderInit.libraryLoader
+    override def loader(): ClassLoader = LoaderInit.fullLoader
     def compilerJar = new File(scalaLibDir, CompilerModuleName + ".jar")
     def libraryJar = new File(scalaLibDir, LibraryModuleName + ".jar")
     def jars = module.fullClasspath

diff --git a/launcher-interface/src/main/java/xsbti/ExtendedScalaProvider.java b/launcher-interface/src/main/java/xsbti/ExtendedScalaProvider.java
@@ -0,0 +1,7 @@
+package xsbti;
+
+public interface ExtendedScalaProvider extends ScalaProvider
+{
+	/** A ClassLoader that loads the classes from scala-library.jar. It will be the parent of `loader` .*/
+	public ClassLoader loaderLibraryOnly();
+}