Merge pull request scala#6001 from szeiger/merge/2.12.x-to-2.13.x-2017020

Merge/2.12.x to 2.13.x 2017020 [ci: last-only]

Author: szeiger

build.sbt

@@ -542,7 +542,7 @@ lazy val scalacheck = project.in(file("test") / "scalacheck")
   .settings(disableDocs)
   .settings(disablePublishing)
   .settings(
-    fork in Test := true,
+    fork in Test := false,
     javaOptions in Test += "-Xss1M",
     libraryDependencies ++= Seq(scalacheckDep),
     unmanagedSourceDirectories in Compile := Nil,

src/compiler/scala/tools/nsc/backend/jvm/BCodeBodyBuilder.scala

@@ -1360,10 +1360,14 @@ abstract class BCodeBodyBuilder extends BCodeSkelBuilder {
   private def visitInvokeDynamicInsnLMF(jmethod: MethodNode, samName: String, invokedType: String, samMethodType: asm.Type,
                                         implMethodHandle: asm.Handle, instantiatedMethodType: asm.Type,
                                         serializable: Boolean, markerInterfaces: Seq[asm.Type]) = {
-    import java.lang.invoke.LambdaMetafactory.{FLAG_MARKERS, FLAG_SERIALIZABLE}
+    import java.lang.invoke.LambdaMetafactory.{FLAG_MARKERS, FLAG_SERIALIZABLE, FLAG_BRIDGES}
+    // scala/bug#10334: make sure that a lambda object for `T => U` has a method `apply(T)U`, not only the `(Object)Object`
+    // version. Using the lambda a structural type `{def apply(t: T): U}` causes a reflective lookup for this method.
+    val needsBridge = samMethodType != instantiatedMethodType
+    val bridges = if (needsBridge) Seq(Int.box(1), instantiatedMethodType) else Nil
     def flagIf(b: Boolean, flag: Int): Int = if (b) flag else 0
-    val flags = FLAG_MARKERS | flagIf(serializable, FLAG_SERIALIZABLE)
-    val bsmArgs = Seq(samMethodType, implMethodHandle, instantiatedMethodType, Int.box(flags), Int.box(markerInterfaces.length)) ++ markerInterfaces
+    val flags = FLAG_MARKERS | flagIf(serializable, FLAG_SERIALIZABLE) | flagIf(needsBridge, FLAG_BRIDGES)
+    val bsmArgs = Seq(samMethodType, implMethodHandle, instantiatedMethodType, Int.box(flags), Int.box(markerInterfaces.length)) ++ markerInterfaces ++ bridges
     jmethod.visitInvokeDynamicInsn(samName, invokedType, lambdaMetaFactoryAltMetafactoryHandle, bsmArgs: _*)
   }
 

src/library/scala/sys/process/ProcessImpl.scala

@@ -147,6 +147,7 @@ private[process] trait ProcessImpl {
           throw err
         }
       runInterruptible {
+        source.join()
         val exit1 = first.exitValue()
         val exit2 = second.exitValue()
         // Since file redirection (e.g. #>) is implemented as a piped process,

src/reflect/scala/reflect/internal/Symbols.scala

@@ -2375,16 +2375,14 @@ trait Symbols extends api.Symbols { self: SymbolTable =>
 
     /** Returns all symbols overridden by this symbol. */
     final def allOverriddenSymbols: List[Symbol] = {
-      @tailrec
-      def loop(xs: List[Symbol], result: List[Symbol]): List[Symbol] = xs match {
-        case Nil     => result
-        case x :: xs =>
-          overriddenSymbol(x) match {
-            case NoSymbol => loop(xs, result)
-            case sym      => loop(xs, sym :: result)
-          }
-      }
-      if (isOverridingSymbol) loop(owner.ancestors, Nil) else Nil
+      if (isOverridingSymbol) {
+        // performance sensitive
+        val builder = List.newBuilder[Symbol]
+        for (o <- owner.ancestors) {
+          overriddenSymbol(o).andAlso(builder += _)
+        }
+        builder.result()
+      } else Nil
     }
 
     /** Equivalent to allOverriddenSymbols.nonEmpty, but more efficient. */

test/files/run/t10334.scala

@@ -0,0 +1,70 @@
+import scala.language.reflectiveCalls
+
+object Test {
+  def main(args: Array[String]): Unit = {
+    assert(t1 == "hi")
+    assert(t2 == 1)
+    t3()
+  }
+
+  def t1: Object = {
+    val f: { def apply(s: String): Object } = (x: String) => x
+    f("hi")
+  }
+
+  def t2: Int = {
+    def byName(b: => Int): Int = b
+    def namer[A, B](f: A => B): (A => B) { def apply(i: A): B } = f
+
+    val namedFunction = namer(byName _)
+    namedFunction(1)
+  }
+
+  // Not sure how to fix this one.. https://github.com/scala/bug/issues/10334
+  def t3(): Unit = {
+    val f1 = new T[A] {
+      def m(x: A) = "f1-a"
+      def m(x: B) = "f1-b"
+       // the m(Object)Object bridge method invokes (A)Object
+    }
+
+    val f2 = new T[B] {
+      def m(x: A) = "f2-a"
+      def m(x: B) = "f2-b"
+       // the (Object)Object bridge method invokes (B)Object
+    }
+
+    val g1: T[C] = f1
+    val g2: T[C] = f2
+
+    assert(g1.m(new C) == "f1-a")
+    assert(g2.m(new C) == "f2-b")
+
+    val s1: { def m(s: C): Object } = g1
+    val s2: { def m(s: C): Object } = g2
+
+    // the reflective lookup doesn't find `m(C)Object`
+    try {
+      s1.m(new C) // should invoke `m(A)Object`
+      throw new Error()
+    } catch {
+      case _: java.lang.NoSuchMethodException =>
+    }
+
+    // the reflective lookup doesn't find `m(C)Object`
+    try {
+      s2.m(new C) // should invoke `m(B)Object`
+      throw new Error()
+    } catch {
+      case _: java.lang.NoSuchMethodException =>
+    }
+  }
+}
+
+class A
+class B extends A
+class C extends B
+
+trait T[-A] {
+  def m(a: A): Object
+}

test/files/run/t10334b/A.java

@@ -0,0 +1,4 @@
+public interface A<T> {
+  public String apply(T s);
+  public default String apply(String s) { return "hi"; }
+}

test/files/run/t10334b/Test.scala

@@ -0,0 +1,21 @@
+trait T[T] { def apply(x: Int): T }
+class C(val x: Int) extends AnyVal { override def toString = s"$x" }
+
+object Test {
+  def main(args: Array[String]): Unit = {
+    {
+      val t: A[String] = s => s
+      assert((t: A[_]).apply("there") == "there")
+    }
+    {
+      var u = 0
+      val t: T[Unit] = x => u = x
+      t.apply(1)
+      assert(u == 1)
+    }
+    {
+      val t: T[C] = x => new C(x)
+      assert(t.apply(1) == new C(1))
+    }
+  }
+}

test/junit/scala/sys/process/PipedProcessTest.scala

@@ -9,6 +9,7 @@ import java.lang.reflect.InvocationTargetException
 import scala.concurrent.{Await, Future}
 import scala.concurrent.ExecutionContext.Implicits.global
 import scala.util.control.Exception.ignoring
+import org.junit.Assert.assertEquals
 
 // Each test normally ends in a moment, but for failure cases, waits two seconds.
 // scala/bug#7350, scala/bug#8768
@@ -94,6 +95,24 @@ class PipedProcessTest {
     assert(b.destroyCount == 0)
   }
 
+  @Test
+  def shouldSyncRunAndExitValue() {
+    val io = BasicIO(false, ProcessLogger(_ => ()))
+    val source = new PipeSourceMock {
+      override def run(): Unit = {
+        Thread.sleep(5) //used to simulate the block
+      }
+    }
+    val sink = new PipeSinkMock
+    val a = new ProcessMock(error = false)
+    val b = new ProcessMock(error = false)
+    val p = new PipedProcesses(new ProcessBuilderMock(a, error = false), new ProcessBuilderMock(b, error = false), io, false)
+
+    p.callRunAndExitValue(source, sink)
+
+    assertEquals(false, source.isAlive)
+  }
+
   // PipedProcesses must release resources when b.run() failed
   @Test
   def bFailed() {

test/scalacheck/scala/tools/nsc/scaladoc/HtmlFactoryTest.scala

@@ -2,8 +2,9 @@ package scala.tools.nsc.scaladoc
 
 import org.scalacheck._
 import org.scalacheck.Prop._
-
 import java.net.{URLClassLoader, URLDecoder}
+import java.nio.file.{Files, Paths}
+
 import scala.collection.mutable
 import scala.xml.NodeSeq
 
@@ -32,22 +33,11 @@ object HtmlFactoryTest extends Properties("HtmlFactory") {
   import scala.tools.nsc.doc.{DocFactory, Settings}
   import scala.tools.nsc.doc.html.HtmlFactory
 
-  def getClasspath = {
-    // these things can be tricky
-    // this test previously relied on the assumption that the current thread's classloader is an url classloader and contains all the classpaths
-    // does partest actually guarantee this? to quote Leonard Nimoy: The answer, of course, is no.
-    // this test _will_ fail again some time in the future.
-    // Footnote: java.lang.ClassCastException: org.apache.tools.ant.loader.AntClassLoader5 cannot be cast to java.net.URLClassLoader
-    val loader = Thread.currentThread.getContextClassLoader.asInstanceOf[URLClassLoader]
-    val paths = loader.getURLs.map(u => URLDecoder.decode(u.getPath))
-    paths mkString java.io.File.pathSeparator
-  }
-
   def createFactory = {
     val settings = new Settings({Console.err.println(_)})
     settings.scaladocQuietRun = true
     settings.nowarn.value = true
-    settings.classpath.value = getClasspath
+    SettingsUtil.configureClassAndSourcePath(settings)
     settings.docAuthor.value = true
 
     val reporter = new scala.tools.nsc.reporters.ConsoleReporter(settings)
@@ -57,7 +47,8 @@ object HtmlFactoryTest extends Properties("HtmlFactory") {
   def createTemplates(basename: String): collection.Map[String, NodeSeq] = {
     val result = mutable.Map[String, NodeSeq]()
 
-    createFactory.makeUniverse(Left(List(RESOURCES+basename))) match {
+    val path: String = SettingsUtil.checkoutRoot.resolve(RESOURCES).resolve(basename).toAbsolutePath.toString
+    createFactory.makeUniverse(Left(List(path))) match {
       case Some(universe) => {
         new HtmlFactory(universe, new ScalaDocReporter(universe.settings)).writeTemplates((page) => {
           result += (page.absoluteLinkTo(page.path) -> page.body)
@@ -320,7 +311,7 @@ object HtmlFactoryTest extends Properties("HtmlFactory") {
   }
 
   property("scala/bug#4421") = {
-    createTemplate("SI_4421.scala") match {
+    createTemplate("t4421.scala") match {
       case node: scala.xml.Node => {
         val html = node.toString
         html.contains(">Example:") && html.contains(">Note<")
@@ -330,7 +321,7 @@ object HtmlFactoryTest extends Properties("HtmlFactory") {
   }
 
   property("scala/bug#4589") = {
-    createTemplate("SI_4589.scala") match {
+    createTemplate("t4589.scala") match {
       case node: scala.xml.Node => {
         val html = node.toString
         html.contains(">x0123456789: <") &&
@@ -341,7 +332,7 @@ object HtmlFactoryTest extends Properties("HtmlFactory") {
   }
 
   property("scala/bug#4714: Should decode symbolic type alias name.") = {
-    createTemplate("SI_4715.scala") match {
+    createTemplate("t4715.scala") match {
       case node: scala.xml.Node => {
         val html = node.toString
         html.contains(">:+:<")
@@ -351,7 +342,7 @@ object HtmlFactoryTest extends Properties("HtmlFactory") {
   }
 
   property("scala/bug#4287: Default arguments of synthesized constructor") = {
-    val files = createTemplates("SI_4287.scala")
+    val files = createTemplates("t4287.scala")
 
     files("ClassWithSugar.html") match {
       case node: scala.xml.Node => {
@@ -362,53 +353,53 @@ object HtmlFactoryTest extends Properties("HtmlFactory") {
   }
 
   property("scala/bug#4507: Default arguments of synthesized constructor") = {
-    createTemplate("SI_4507.scala") match {
+    createTemplate("t4507.scala") match {
       case node: scala.xml.Node =>
         ! node.toString.contains("<li>returns silently when evaluating true and true</li>")
       case _ => false
     }
   }
 
   property("scala/bug#4898: Use cases and links should not crash scaladoc") = {
-    createTemplate("SI_4898.scala")
+    createTemplate("t4898.scala")
     true
   }
 
   property("scala/bug#5054: Use cases should override their original members") =
-     checkText("SI_5054_q1.scala")(
+     checkText("t5054_q1.scala")(
        (None,"""def test(): Int""", true)
        //Disabled because the full signature is now displayed
        //(None, """def test(implicit lost: Int): Int""", false)
      )
 
   property("scala/bug#5054: Use cases should keep their flags - final should not be lost") =
-    checkText("SI_5054_q2.scala")((None, """final def test(): Int""", true))
+    checkText("t5054_q2.scala")((None, """final def test(): Int""", true))
 
   property("scala/bug#5054: Use cases should keep their flags - implicit should not be lost") =
-    checkText("SI_5054_q3.scala")((None, """implicit def test(): Int""", true))
+    checkText("t5054_q3.scala")((None, """implicit def test(): Int""", true))
 
   property("scala/bug#5054: Use cases should keep their flags - real abstract should not be lost") =
-    checkText("SI_5054_q4.scala")((None, """abstract def test(): Int""", true))
+    checkText("t5054_q4.scala")((None, """abstract def test(): Int""", true))
 
   property("scala/bug#5054: Use cases should keep their flags - traits should not be affected") =
-    checkText("SI_5054_q5.scala")((None, """def test(): Int""", true))
+    checkText("t5054_q5.scala")((None, """def test(): Int""", true))
 
   property("scala/bug#5054: Use cases should keep their flags - traits should not be affected") =
-    checkText("SI_5054_q6.scala")((None, """abstract def test(): Int""", true))
+    checkText("t5054_q6.scala")((None, """abstract def test(): Int""", true))
 
   property("scala/bug#5054: Use case individual signature test") =
-    checkText("SI_5054_q7.scala")(
+    checkText("t5054_q7.scala")(
       (None, """abstract def test2(explicit: Int): Int [use case] This takes the explicit value passed.""", true),
       (None, """abstract def test1(): Int [use case] This takes the implicit value in scope.""", true)
     )
 
   property("scala/bug#5287: Display correct \"Definition classes\"") =
-    checkText("SI_5287.scala")(
+    checkText("t5287.scala")(
       (None,
           """def method(): Int
            [use case] The usecase explanation
            [use case] The usecase explanation
-           Definition Classes SI_5287 SI_5287_B SI_5287_A""", true)
+           Definition Classes t5287 t5287_B t5287_A""", true)
     )      // the explanation appears twice, as small comment and full comment
 
   property("Comment inheritance: Correct comment inheritance for overriding") =
@@ -578,31 +569,31 @@ object HtmlFactoryTest extends Properties("HtmlFactory") {
   property("Comment inheritance: Correct explicit inheritance in corner cases") =
     checkText("inheritdoc-corner-cases.scala")(
       (Some("D"),
-       """def hello1: Int
+        """def hello1: Int
           Inherited: Hello 1 comment
           Inherited: Hello 1 comment
           Definition Classes D → A
        """, true),
       (Some("D"),
-       """def hello2: Int
+        """def hello2: Int
           Inherited: Hello 2 comment
           Inherited: Hello 2 comment
           Definition Classes D → B
        """, true),
       (Some("G"),
-       """def hello1: Int
+        """def hello1: Int
           Inherited: Hello 1 comment
           Inherited: Hello 1 comment
           Definition Classes G → D → A
        """, true),
       (Some("G"),
-       """def hello2: Int
+        """def hello2: Int
           Inherited: Hello 2 comment
           Inherited: Hello 2 comment
           Definition Classes G → D → B
        """, true),
       (Some("I"),
-       """def hello1(i: Int): Unit
+        """def hello1(i: Int): Unit
           [use case] Inherited: Hello 1 comment
           [use case] Inherited: Hello 1 comment
           Definition Classes I → G → D → A