Merge branch 'master' into fix-hashcode

Author: felixmulder

.gitignore

@@ -44,6 +44,7 @@ scala-scala
 out/
 build/
 !out/.keep
+testlogs/
 
 # Ignore build-file
 .packages

compiler/src/dotty/tools/dotc/core/Decorators.scala

@@ -103,7 +103,7 @@ object Decorators {
      *  as long as `xs`.
      */
     def zipWithConserve[U](ys: List[U])(f: (T, U) => T): List[T] =
-      if (xs.isEmpty) xs
+      if (xs.isEmpty || ys.isEmpty) Nil
       else {
         val x1 = f(xs.head, ys.head)
         val xs1 = xs.tail.zipWithConserve(ys.tail)(f)

compiler/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala

@@ -661,7 +661,7 @@ class ClassfileParser(
     for (entry <- innerClasses.values) {
       // create a new class member for immediate inner classes
       if (entry.outerName == currentClassName) {
-        val file = ctx.platform.classPath.findSourceFile(entry.externalName.toString) getOrElse {
+        val file = ctx.platform.classPath.findBinaryFile(entry.externalName.toString) getOrElse {
           throw new AssertionError(entry.externalName)
         }
         enterClassAndModule(entry, file, entry.jflags)

compiler/src/dotty/tools/dotc/reporting/MessageRendering.scala

@@ -21,7 +21,7 @@ trait MessageRendering {
     * @return string stripped of ANSI escape codes
     */
   def stripColor(str: String): String =
-    str.replaceAll("\u001B\\[[;\\d]*m", "")
+    str.replaceAll("\u001b\\[.*?m", "")
 
   /** When inlining a method call, if there's an error we'd like to get the
     * outer context and the `pos` at which the call was inlined.

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

@@ -848,26 +848,21 @@ class PatternMatcher extends MiniPhaseTransform with DenotTransformer {
 
       val nextBinder = afterTest.asTerm
 
-      def needsOuterTest(patType: Type, selType: Type, currentOwner: Symbol): Boolean = {
+      def outerTestNeeded(implicit ctx: Context): Boolean = {
         // See the test for SI-7214 for motivation for dealias. Later `treeCondStrategy#outerTest`
         // generates an outer test based on `patType.prefix` with automatically dealises.
-        patType.dealias match {
-          case tref @ TypeRef(pre, name) =>
-            (pre ne NoPrefix) && tref.symbol.isClass &&
-            ExplicitOuter.needsOuterIfReferenced(tref.symbol.asClass)
+        expectedTp.dealias match {
+          case tref @ TypeRef(pre: SingletonType, name) =>
+            val s = tref
+            s.symbol.isClass &&
+            ExplicitOuter.needsOuterIfReferenced(s.symbol.asClass)
           case _ =>
             false
         }
       }
 
       override lazy val introducedRebindings = NoRebindings
 
-      def outerTestNeeded = {
-        val np = expectedTp.normalizedPrefix
-        val ts = np.termSymbol
-        (ts ne NoSymbol) && needsOuterTest(expectedTp, testedBinder.info, ctx.owner)
-      }
-
       // the logic to generate the run-time test that follows from the fact that
       // a `prevBinder` is expected to have type `expectedTp`
       // the actual tree-generation logic is factored out, since the analyses generate Cond(ition)s rather than Trees

compiler/src/dotty/tools/dotc/util/DiffUtil.scala

@@ -58,8 +58,25 @@ object DiffUtil {
     (fnd, exp, totalChange.toDouble / (expected.length + found.length))
   }
 
-  def mkColoredCodeDiff(code: String, lastCode: String, printDiffDel: Boolean): String = {
+  def mkColoredLineDiff(expected: String, actual: String): String = {
+    val tokens = splitTokens(expected, Nil).toArray
+    val lastTokens = splitTokens(actual, Nil).toArray
+
+    val diff = hirschberg(lastTokens, tokens)
 
+    "  |SOF\n" + diff.collect {
+      case Unmodified(str) =>
+        "  |" + str
+      case Inserted(str) =>
+        ADDITION_COLOR + "e |" + str + ANSI_DEFAULT
+      case Modified(old, str) =>
+        DELETION_COLOR + "a |" + old + "\ne |" + ADDITION_COLOR + str + ANSI_DEFAULT
+      case Deleted(str) =>
+        DELETION_COLOR + "\na |" + str + ANSI_DEFAULT
+    }.mkString + "\n  |EOF"
+  }
+
+  def mkColoredCodeDiff(code: String, lastCode: String, printDiffDel: Boolean): String = {
     val tokens = splitTokens(code, Nil).toArray
     val lastTokens = splitTokens(lastCode, Nil).toArray
 

compiler/src/dotty/tools/io/ClassPath.scala

@@ -240,22 +240,16 @@ abstract class ClassPath {
   def findClass(name: String): Option[AnyClassRep] =
     name.splitWhere(_ == '.', doDropIndex = true) match {
       case Some((pkg, rest)) =>
-        val rep = packages find (_.name == pkg) flatMap (_ findClass rest)
-        rep map {
-          case x: ClassRep  => x
-          case x            => throw new FatalError("Unexpected ClassRep '%s' found searching for name '%s'".format(x, name))
-        }
+        packages find (_.name == pkg) flatMap (_ findClass rest)
       case _ =>
         classes find (_.name == name)
     }
 
-  def findSourceFile(name: String): Option[AbstractFile] =
-    findClass(name) match {
-      case Some(ClassRep(Some(x: AbstractFile), _)) => Some(x)
-      case _                                        => None
-    }
+  def findBinaryFile(name: String): Option[AbstractFile] =
+    findClass(name).flatMap(_.binary)
 
   def sortString = join(split(asClasspathString).sorted: _*)
+
   override def equals(that: Any) = that match {
     case x: ClassPath => this.sortString == x.sortString
     case _            => false

compiler/test/dotty/tools/dotc/CompilationTests.scala

@@ -12,7 +12,7 @@ import scala.util.matching.Regex
 class CompilationTests extends ParallelSummaryReport with ParallelTesting {
   import CompilationTests._
 
-  def isInteractive: Boolean = !sys.env.contains("DRONE")
+  def isInteractive: Boolean = ParallelSummaryReport.isInteractive
 
   def testFilter: Option[Regex] = sys.props.get("dotty.partest.filter").map(r => new Regex(r))
 

compiler/test/dotty/tools/dotc/ParallelSummaryReport.java

@@ -11,7 +11,9 @@
  *  this class
  */
 public class ParallelSummaryReport {
-    private static TestReporter rep = TestReporter.reporter(-1);
+    public final static boolean isInteractive = !System.getenv().containsKey("DRONE");
+
+    private static TestReporter rep = TestReporter.reporter(System.out, -1);
     private static ArrayDeque<String> failedTests = new ArrayDeque<>();
     private static ArrayDeque<String> reproduceInstructions = new ArrayDeque<>();
     private static int passed;
@@ -34,7 +36,7 @@ public final static void addReproduceInstruction(String msg) {
     }
 
     @BeforeClass public final static void setup() {
-        rep = TestReporter.reporter(-1);
+        rep = TestReporter.reporter(System.out, -1);
         failedTests = new ArrayDeque<>();
         reproduceInstructions = new ArrayDeque<>();
     }
@@ -54,14 +56,18 @@ public final static void addReproduceInstruction(String msg) {
             .map(x -> "    " + x)
             .forEach(rep::echo);
 
-        rep.flushToStdErr();
+        // If we're compiling locally, we don't need reproduce instructions
+        if (isInteractive) rep.flushToStdErr();
 
         rep.echo("");
 
         reproduceInstructions
             .stream()
             .forEach(rep::echo);
 
+        // If we're on the CI, we want everything
+        if (!isInteractive) rep.flushToStdErr();
+
         if (failed > 0) rep.flushToFile();
     }
 }

compiler/test/dotty/tools/dotc/ParallelTesting.scala

@@ -51,6 +51,16 @@ trait ParallelTesting { self =>
     def outDir: JFile
     def flags: Array[String]
 
+
+    def title: String = self match {
+      case self: JointCompilationSource =>
+        if (self.files.length > 1) name
+        else self.files.head.getPath
+
+      case self: SeparateCompilationSource =>
+        self.dir.getPath
+    }
+
     /** Adds the flags specified in `newFlags0` if they do not already exist */
     def withFlags(newFlags0: String*) = {
       val newFlags = newFlags0.toArray
@@ -69,7 +79,11 @@ trait ParallelTesting { self =>
       val maxLen = 80
       var lineLen = 0
 
-      sb.append(s"\n\nTest compiled with $errors error(s) and $warnings warning(s), the test can be reproduced by running:")
+      sb.append(
+        s"""|
+            |Test '$title' compiled with $errors error(s) and $warnings warning(s),
+            |the test can be reproduced by running:""".stripMargin
+      )
       sb.append("\n\n./bin/dotc ")
       flags.foreach { arg =>
         if (lineLen > maxLen) {
@@ -160,6 +174,8 @@ trait ParallelTesting { self =>
    *  according to the implementing class "neg", "run" or "pos".
    */
   private abstract class Test(testSources: List[TestSource], times: Int, threadLimit: Option[Int], suppressAllOutput: Boolean) {
+    protected final val realStdout = System.out
+    protected final val realStderr = System.err
 
     /** Actual compilation run logic, the test behaviour is defined here */
     protected def compilationRunnable(testSource: TestSource): Runnable
@@ -178,10 +194,10 @@ trait ParallelTesting { self =>
     val sourceCount = filteredSources.length
 
     private[this] var _errorCount =  0
-    def errorCount: Int = synchronized { _errorCount }
+    def errorCount: Int = _errorCount
 
     private[this] var _testSourcesCompiled = 0
-    private def testSourcesCompiled : Int = synchronized { _testSourcesCompiled }
+    private def testSourcesCompiled: Int = _testSourcesCompiled
 
     /** Complete the current compilation with the amount of errors encountered */
     protected final def registerCompilation(errors: Int) = synchronized {
@@ -214,7 +230,7 @@ trait ParallelTesting { self =>
 
     /** Prints to `System.err` if we're not suppressing all output */
     protected def echo(msg: String): Unit =
-      if (!suppressAllOutput) System.err.println(msg)
+      if (!suppressAllOutput) realStderr.println(msg)
 
     /** A single `Runnable` that prints a progress bar for the curent `Test` */
     private def createProgressMonitor: Runnable = new Runnable {
@@ -224,17 +240,19 @@ trait ParallelTesting { self =>
         while (tCompiled < sourceCount) {
           val timestamp = (System.currentTimeMillis - start) / 1000
           val progress = (tCompiled.toDouble / sourceCount * 40).toInt
-          print(
+
+          realStdout.print(
             "[" + ("=" * (math.max(progress - 1, 0))) +
             (if (progress > 0) ">" else "") +
             (" " * (39 - progress)) +
             s"] compiling ($tCompiled/$sourceCount, ${timestamp}s)\r"
           )
+
           Thread.sleep(100)
           tCompiled = testSourcesCompiled
         }
         // println, otherwise no newline and cursor at start of line
-        println(
+        realStdout.println(
           s"[=======================================] compiled ($sourceCount/$sourceCount, " +
           s"${(System.currentTimeMillis - start) / 1000}s)  "
         )
@@ -245,7 +263,10 @@ trait ParallelTesting { self =>
      *  if it did, the test should automatically fail.
      */
     protected def tryCompile(testSource: TestSource)(op: => Unit): Unit =
-      try op catch {
+      try {
+        if (!isInteractive) realStdout.println(s"Testing ${testSource.title}")
+        op
+      } catch {
         case NonFatal(e) => {
           // if an exception is thrown during compilation, the complete test
           // run should fail
@@ -295,8 +316,10 @@ trait ParallelTesting { self =>
         Runtime.getRuntime.exec(fullArgs).waitFor() == 0
       } else true
 
-      val reporter = TestReporter.parallelReporter(this, logLevel =
-        if (suppressErrors || suppressAllOutput) ERROR + 1 else ERROR)
+      val reporter =
+        TestReporter.reporter(realStdout, logLevel =
+          if (suppressErrors || suppressAllOutput) ERROR + 1 else ERROR)
+
       val driver =
         if (times == 1) new Driver { def newCompiler(implicit ctx: Context) = new Compiler }
         else new Driver {
@@ -339,8 +362,12 @@ trait ParallelTesting { self =>
         }
 
         pool.shutdown()
-        if (!pool.awaitTermination(10, TimeUnit.MINUTES))
+        if (!pool.awaitTermination(20, TimeUnit.MINUTES)) {
+          pool.shutdownNow()
+          System.setOut(realStdout)
+          System.setErr(realStderr)
           throw new TimeoutException("Compiling targets timed out")
+        }
 
         if (didFail) {
           reportFailed()
@@ -403,16 +430,14 @@ trait ParallelTesting { self =>
       import java.net.{ URL, URLClassLoader }
 
       val printStream = new ByteArrayOutputStream
-      val oldOut = System.out
-      val oldErr = System.err
 
       try {
         // Do classloading magic and running here:
         val ucl = new URLClassLoader(Array(dir.toURI.toURL))
         val cls = ucl.loadClass("Test")
         val meth = cls.getMethod("main", classOf[Array[String]])
 
-        self.synchronized {
+        synchronized {
           try {
             val ps = new PrintStream(printStream)
             System.setOut(ps)
@@ -422,9 +447,13 @@ trait ParallelTesting { self =>
                 meth.invoke(null, Array("jvm")) // partest passes at least "jvm" as an arg
               }
             }
-          } finally {
-            System.setOut(oldOut)
-            System.setErr(oldErr)
+            System.setOut(realStdout)
+            System.setErr(realStderr)
+          } catch {
+            case t: Throwable =>
+              System.setOut(realStdout)
+              System.setErr(realStderr)
+              throw t
           }
         }
       }
@@ -447,6 +476,7 @@ trait ParallelTesting { self =>
     private def verifyOutput(checkFile: JFile, dir: JFile, testSource: TestSource, warnings: Int) = {
       val outputLines = runMain(dir, testSource)
       val checkLines = Source.fromFile(checkFile).getLines.toArray
+      val sourceTitle = testSource.title
 
       def linesMatch =
         outputLines
@@ -456,9 +486,13 @@ trait ParallelTesting { self =>
       if (outputLines.length != checkLines.length || !linesMatch) {
         // Print diff to files and summary:
         val diff = outputLines.zip(checkLines).map { case (act, exp) =>
-          DiffUtil.mkColoredCodeDiff(exp, act, true)
+          DiffUtil.mkColoredLineDiff(exp, act)
         }.mkString("\n")
-        val msg = s"\nOutput from run test '$checkFile' did not match expected, output:\n$diff\n"
+
+        val msg =
+          s"""|Output from '$sourceTitle' did not match check file.
+              |Diff ('e' is expected, 'a' is actual):
+              |""".stripMargin + diff + "\n"
         echo(msg)
         addFailureInstruction(msg)
 
@@ -920,9 +954,8 @@ trait ParallelTesting { self =>
   private def compilationTargets(sourceDir: JFile): (List[JFile], List[JFile]) =
     sourceDir.listFiles.foldLeft((List.empty[JFile], List.empty[JFile])) { case ((dirs, files), f) =>
       if (f.isDirectory) (f :: dirs, files)
-      else if (f.getName.endsWith(".check")) (dirs, files)
-      else if (f.getName.endsWith(".flags")) (dirs, files)
-      else (dirs, f :: files)
+      else if (isSourceFile(f)) (dirs, f :: files)
+      else (dirs, files)
     }
 
   /** Gets the name of the calling method via reflection.