Refactored ClassLoaderCache to use key locked cache to pave the way for caching classloaders hierarchically without deadlocks

1 files changed, 3 insertions, 2 deletions

diff --git a/stage1/Stage1Lib.scala b/stage1/Stage1Lib.scala
index d24ba52..6a8a0ba 100644
--- a/stage1/Stage1Lib.scala
+++ b/stage1/Stage1Lib.scala
@@ -30,7 +30,7 @@ object TrappedExitCode{
     }
 }
 
-case class Context( cwd: File, args: Seq[String], logger: Logger )
+case class Context( cwd: File, args: Seq[String], logger: Logger, classLoaderCache: ClassLoaderCache )
 
 class BaseLib{
   def realpath(name: File) = new File(Paths.get(name.getAbsolutePath).normalize.toString)
@@ -130,6 +130,7 @@ class Stage1Lib( val logger: Logger ) extends BaseLib{
     files: Seq[File],
     compileTarget: File,
     classpath: ClassPath,
+    classLoaderCache: ClassLoaderCache,
     extraArgs: Seq[String] = Seq()
   )( zincVersion: String, scalaVersion: String ): Unit = {
 
@@ -176,7 +177,7 @@ class Stage1Lib( val logger: Logger ) extends BaseLib{
             "-cp", cp,
             "-d", compileTarget.toString
           ) ++ extraArgs.map("-S"++_) ++ files.map(_.toString),
-          zinc.classLoader
+          zinc.classLoader(classLoaderCache)
         )
       }