Update optimizer class path when release is set

Author: som-snytt

src/compiler/scala/tools/nsc/Global.scala

@@ -135,9 +135,22 @@ class Global(var currentSettings: Settings, reporter0: Reporter)
 
   type ThisPlatform = JavaPlatform { val global: Global.this.type }
   lazy val platform: ThisPlatform  = new GlobalPlatform
-  /* A hook for the REPL to add a classpath entry containing products of previous runs to inliner's bytecode repository*/
-  // Fixes scala/bug#8779
-  def optimizerClassPath(base: ClassPath): ClassPath = base
+
+  /* Create a class path for the backend, based on the given class path.
+   * Used to make classes available to the inliner's bytecode repository.
+   *
+   * In particular, if ct.sym is used for compilation, replace it with jrt.
+   *
+   * See ReplGlobal, which appends a classpath entry containing products of previous runs.  (Fixes scala/bug#8779.)
+   */
+  def optimizerClassPath(base: ClassPath): ClassPath =
+    base match {
+      case AggregateClassPath(entries) if entries.head.isInstanceOf[CtSymClassPath] =>
+        JrtClassPath(release = None, closeableRegistry)
+          .map(jrt => AggregateClassPath(entries.drop(1).prepended(jrt)))
+          .getOrElse(base)
+      case _ => base
+    }
 
   def classPath: ClassPath = platform.classPath
 

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

@@ -98,12 +98,13 @@ trait ReplGlobal extends Global {
   }
 
   override def optimizerClassPath(base: ClassPath): ClassPath = {
+    val base1 = super.optimizerClassPath(base)
     settings.outputDirs.getSingleOutput match {
-      case None => base
+      case None => base1
       case Some(out) =>
         // Make bytecode of previous lines available to the inliner
         val replOutClasspath = ClassPathFactory.newClassPath(settings.outputDirs.getSingleOutput.get, settings, closeableRegistry)
-        AggregateClassPath.createAggregate(platform.classPath, replOutClasspath)
+        AggregateClassPath.createAggregate(base1, replOutClasspath)
     }
   }
 

test/files/neg/t3420b.check

@@ -0,0 +1,4 @@
+t3420b.scala:8: error: value translateEscapes is not a member of String
+  def f(s: String) = s.translateEscapes
+                       ^
+1 error

test/files/neg/t3420b.scala

@@ -0,0 +1,9 @@
+
+// scalac: --release 8 -opt:inline:** -Wopt -Werror
+//
+class C {
+  val cv = Map[Int, Int](1 -> 2)
+  lazy val cl = Map[Int, Int](1 -> 2)
+  def cd = Map[Int, Int](1 -> 2)
+  def f(s: String) = s.translateEscapes
+}

test/files/pos/t3420b.scala

@@ -0,0 +1,8 @@
+
+// scalac: --release 8 -opt:inline:** -Wopt -Werror
+//
+class C {
+    val cv = Map[Int, Int](1 -> 2)
+    lazy val cl = Map[Int, Int](1 -> 2)
+    def cd = Map[Int, Int](1 -> 2)
+}

test/files/run/repl-release.check

@@ -0,0 +1,42 @@
+
+scala> def callerOfCaller = Thread.currentThread.getStackTrace.drop(2).head.getMethodName
+def callerOfCaller: String
+
+scala> @noinline def g = callerOfCaller
+def g: String
+
+scala> @noinline def h = g
+def h: String
+
+scala> assert(h == "g", h)
+
+scala> @inline def g = callerOfCaller
+def g: String
+
+scala> @noinline def h = g
+def h: String
+
+scala> assert(h == "h", h)
+
+scala> :quit
+
+scala> def callerOfCaller = Thread.currentThread.getStackTrace.drop(2).head.getMethodName
+def callerOfCaller: String
+
+scala> @noinline def g = callerOfCaller
+def g: String
+
+scala> @noinline def h = g
+def h: String
+
+scala> assert(h == "g", h)
+
+scala> @inline def g = callerOfCaller
+def g: String
+
+scala> @noinline def h = g
+def h: String
+
+scala> assert(h == "h", h)
+
+scala> :quit

test/files/run/repl-release.scala

@@ -0,0 +1,33 @@
+import scala.tools.partest.ReplTest
+import scala.tools.nsc._
+import scala.tools.nsc.Settings
+import scala.tools.nsc.interpreter.shell.ReplReporterImpl
+
+// cf run/repl-inline.scala
+object Test extends ReplTest {
+
+  var count = 0
+
+  override def transformSettings(s: Settings) = {
+    s.processArguments("-release:8" :: "-opt:inline:**" :: "-Wopt" :: Nil, processAll = true)
+    s.Yreplclassbased.value = count > 0
+    count += 1
+    s
+  }
+
+  override def code =
+    """
+def callerOfCaller = Thread.currentThread.getStackTrace.drop(2).head.getMethodName
+@noinline def g = callerOfCaller
+@noinline def h = g
+assert(h == "g", h)
+@inline def g = callerOfCaller
+@noinline def h = g
+assert(h == "h", h)
+  """
+
+  override def show() = {
+    super.show()
+    super.show()
+  }
+}