Make splicer only valid for this run

Author: nicolasstucki

compiler/src/dotty/tools/dotc/transform/ReifyQuotes.scala

@@ -88,6 +88,8 @@ import dotty.tools.dotc.core.quoted._
 class ReifyQuotes extends MacroTransformWithImplicits with InfoTransformer {
   import ast.tpd._
 
+  private lazy val splicer: Splicer = new Splicer
+
   override def phaseName: String = "reifyQuotes"
 
   override def run(implicit ctx: Context): Unit =
@@ -542,7 +544,7 @@ class ReifyQuotes extends MacroTransformWithImplicits with InfoTransformer {
                 // Simplification of the call done in PostTyper for non-macros can also be performed now
                 // see PostTyper `case Inlined(...) =>` for description of the simplification
                 val call2 = Ident(call.symbol.topLevelClass.typeRef).withPos(call.pos)
-                val spliced = Splicer.splice(body, call, bindings, tree.pos).withPos(tree.pos)
+                val spliced = splicer.splice(body, call, bindings, tree.pos).withPos(tree.pos)
                 transform(cpy.Inlined(tree)(call2, bindings, spliced))
               }
               else super.transform(tree)

compiler/src/dotty/tools/dotc/transform/Splicer.scala

@@ -21,9 +21,11 @@ import dotty.tools.dotc.util.Positions.Position
 import scala.reflect.ClassTag
 
 /** Utility class to splice quoted expressions */
-object Splicer {
+class Splicer {
   import tpd._
 
+  private var classLoader: URLClassLoader = _
+
   /** Splice the Tree for a Quoted expression. `~'(xyz)` becomes `xyz`
    *  and for `~xyz` the tree of `xyz` is interpreted for which the
    *  resulting expression is returned as a `Tree`
@@ -93,22 +95,16 @@ object Splicer {
     }
   }
 
-  private val classLoaders = scala.collection.mutable.HashMap.empty[String, URLClassLoader]
-
   /** Tree interpreter that can interpret calls to static methods with it's default arguments
    *
    *  The interpreter assumes that all calls in the trees are to code that was
    *  previously compiled and is present in the classpath of the current context.
    */
   private class Interpreter(pos: Position)(implicit ctx: Context) {
 
-    private[this] val classLoader = {
-      val cp = ctx.settings.classpath.value
-      def newClassLoader = {
-        val urls = cp.split(':').map(cp => java.nio.file.Paths.get(cp).toUri.toURL)
-        new URLClassLoader(urls, getClass.getClassLoader)
-      }
-      classLoaders.getOrElseUpdate(cp, newClassLoader)
+    if (classLoader == null) {
+      val urls = ctx.settings.classpath.value.split(':').map(cp => java.nio.file.Paths.get(cp).toUri.toURL)
+      classLoader = new URLClassLoader(urls, getClass.getClassLoader)
     }
 
     /** Returns the interpreted result of interpreting the code a call to the symbol with default arguments.