Merge pull request scala#7803 from retronym/topic/find-classloader-access

Fix access of extension point for macro classloaders

Author: retronym

src/compiler/scala/tools/nsc/plugins/Plugins.scala

@@ -175,7 +175,7 @@ trait Plugins { global: Global =>
     *
     *  Mirrors with runtime definitions (e.g. Repl) need to adjust this method.
     */
-  protected[scala] def findMacroClassLoader(): ClassLoader = {
+  def findMacroClassLoader(): ClassLoader = {
     val classpath: Seq[URL] = if (settings.YmacroClasspath.isSetByUser) {
       for {
         file <- scala.tools.nsc.util.ClassPath.expandPath(settings.YmacroClasspath.value, true)

src/compiler/scala/tools/reflect/ReflectGlobal.scala

@@ -30,7 +30,7 @@ class ReflectGlobal(currentSettings: Settings, reporter: Reporter, override val
     *  Macro expansion can use everything available in `global.classPath` or `rootClassLoader`.
     *  The `rootClassLoader` is used to obtain runtime defined macros.
     */
-  override protected[scala] def findMacroClassLoader(): ClassLoader = {
+  override def findMacroClassLoader(): ClassLoader = {
     val classpath = classPath.asURLs
     perRunCaches.recordClassloader(ScalaClassLoader.fromURLs(classpath, rootClassLoader))
   }

src/repl/scala/tools/nsc/interpreter/ReplGlobal.scala

@@ -25,7 +25,7 @@ trait ReplGlobal extends Global {
     super.abort(msg)
   }
 
-  override protected[scala] def findMacroClassLoader(): ClassLoader = {
+  override def findMacroClassLoader(): ClassLoader = {
     val loader = super.findMacroClassLoader
     analyzer.macroLogVerbose("macro classloader: initializing from a REPL classloader: %s".format(classPath.asURLs))
     val virtualDirectory = analyzer.globalSettings.outputDirs.getSingleOutput.get

test/junit/scala/tools/nsc/GlobalCustomizeClassloaderTest.scala

@@ -26,7 +26,7 @@ class GlobalCustomizeClassloaderTest {
     }
 
     val g = new Global(new Settings) {
-      override protected[scala] def findMacroClassLoader(): ClassLoader = new URLClassLoader(Nil, getClass.getClassLoader){
+      override def findMacroClassLoader(): ClassLoader = new URLClassLoader(Nil, getClass.getClassLoader){
         override def close(): Unit = closeUnexpected()
       }
       override protected def findPluginClassLoader(classpath: Seq[Path]): ClassLoader = {