Merge pull request #1896 from dotty-staging/fix/bootstrap

smarter · web-flow · commit 6e8933ccc40b · 2017-01-28T20:38:36.000+01:00
Add sbt-based bootstrap
diff --git a/.drone.yml b/.drone.yml
@@ -5,10 +5,11 @@ pipeline:
     commands:
       - ln -s /var/cache/drone/scala-scala scala-scala
       - ./scripts/update-scala-library
-      - sbt -Ddotty.drone.mem=4096m -ivy /var/cache/drone/ivy2 "${TEST}"
+      - sbt -J-Xmx4096m -J-XX:ReservedCodeCacheSize=512m -J-XX:MaxMetaspaceSize=1024m -Ddotty.drone.mem=4096m -ivy /var/cache/drone/ivy2 "${TEST}"
 
 matrix:
   TEST:
     - test
+    - ;publishLocal;dotty-bootstrapped/test
     - partest-only-no-bootstrap --show-diff --verbose
     - partest-only --show-diff --verbose
diff --git a/compiler/src/dotty/tools/dotc/config/JavaPlatform.scala b/compiler/src/dotty/tools/dotc/config/JavaPlatform.scala
@@ -17,8 +17,6 @@ class JavaPlatform extends Platform {
     if (currentClassPath.isEmpty)
       currentClassPath = Some(new PathResolver().result)
     val cp = currentClassPath.get
-    //println(cp)
-    //println("------------------")
     cp
   }
 
diff --git a/compiler/src/dotty/tools/dotc/config/PathResolver.scala b/compiler/src/dotty/tools/dotc/config/PathResolver.scala
@@ -255,14 +255,7 @@ class PathResolver(implicit ctx: Context) {
   def containers = Calculated.containers
 
   lazy val result: JavaClassPath = {
-    // Prioritize `dotty.jar` and `dotty-lib.jar` to shadow others
-    val (dottyJars, others) =
-      containers.partition(x => x.name.contains("dotty-lib.jar") || x.name.contains("dotty.jar"))
-    // Then any jars with `dotty` in the name - putting them before scala-library
-    val (dottyCp, remaining) =
-      others.partition(_.name.contains("dotty-"))
-
-    val cp = new JavaClassPath((dottyJars ++ dottyCp ++ remaining).toIndexedSeq, context)
+    val cp = new JavaClassPath(containers.toIndexedSeq, context)
 
     if (settings.Ylogcp.value) {
       Console.println("Classpath built from " + settings.toConciseString(ctx.sstate))
diff --git a/compiler/src/dotty/tools/dotc/core/Definitions.scala b/compiler/src/dotty/tools/dotc/core/Definitions.scala
@@ -319,7 +319,17 @@ class Definitions {
     def staticsMethodRef(name: PreName) = ScalaStaticsModule.requiredMethodRef(name)
     def staticsMethod(name: PreName) = ScalaStaticsModule.requiredMethod(name)
 
-  lazy val DottyPredefModuleRef = ctx.requiredModuleRef("dotty.DottyPredef")
+  // Dotty deviation: we cannot use a lazy val here because lazy vals in dotty
+  // will return "null" when called recursively, see #1856.
+  def DottyPredefModuleRef = {
+    if (myDottyPredefModuleRef == null) {
+      myDottyPredefModuleRef = ctx.requiredModuleRef("dotty.DottyPredef")
+      assert(myDottyPredefModuleRef != null)
+    }
+    myDottyPredefModuleRef
+  }
+  private[this] var myDottyPredefModuleRef: TermRef = _
+
   def DottyPredefModule(implicit ctx: Context) = DottyPredefModuleRef.symbol
 
     def Predef_eqAny(implicit ctx: Context) = DottyPredefModule.requiredMethod(nme.eqAny)
diff --git a/compiler/src/dotty/tools/dotc/core/SymDenotations.scala b/compiler/src/dotty/tools/dotc/core/SymDenotations.scala
@@ -45,9 +45,13 @@ trait SymDenotations { this: Context =>
     else {
       val initial = denot.initial
       val firstPhaseId = initial.validFor.firstPhaseId.max(ctx.typerPhase.id)
-      if ((initial ne denot) || ctx.phaseId != firstPhaseId)
-        ctx.withPhase(firstPhaseId).stillValidInOwner(initial)
-      else
+     if ((initial ne denot) || ctx.phaseId != firstPhaseId) {
+       ctx.withPhase(firstPhaseId).stillValidInOwner(initial) ||
+         // Workaround #1895: A symbol might not be entered into an owner
+         // until the second phase where it exists
+         (denot.validFor.containsPhaseId(firstPhaseId + 1)) &&
+           ctx.withPhase(firstPhaseId + 1).stillValidInOwner(initial)
+      } else
         stillValidInOwner(denot)
     }
 
diff --git a/compiler/src/dotty/tools/dotc/parsing/Scanners.scala b/compiler/src/dotty/tools/dotc/parsing/Scanners.scala
@@ -567,7 +567,8 @@ object Scanners {
               nextChar()
               getOperatorRest()
             } else {
-              error(f"illegal character '\\u${ch: Int}%04x'")
+              // FIXME: Dotty deviation: f"" interpolator is not supported (#1814)
+              error("illegal character '\\u%04x'".format(ch: Int))
               nextChar()
             }
           }
diff --git a/compiler/src/dotty/tools/dotc/sbt/ExtractDependencies.scala b/compiler/src/dotty/tools/dotc/sbt/ExtractDependencies.scala
@@ -175,7 +175,7 @@ private class ExtractDependenciesCollector(implicit val ctx: Context) extends tp
   override def traverse(tree: Tree)(implicit ctx: Context): Unit = {
     tree match {
       case Import(expr, selectors) =>
-        def lookupImported(name: Name) = expr.tpe.member(name).symbol
+        def lookupImported(name: Name) = expr.tpe.select(name).typeSymbol
         def addImported(name: Name) = {
           // importing a name means importing both a term and a type (if they exist)
           addDependency(lookupImported(name.toTermName))
diff --git a/compiler/src/dotty/tools/dotc/transform/ElimByName.scala b/compiler/src/dotty/tools/dotc/transform/ElimByName.scala
@@ -81,7 +81,11 @@ class ElimByName extends MiniPhaseTransform with InfoTransformer { thisTransform
             val inSuper = if (ctx.mode.is(Mode.InSuperCall)) InSuperCall else EmptyFlags
             val meth = ctx.newSymbol(
                 ctx.owner, nme.ANON_FUN, Synthetic | Method | inSuper, MethodType(Nil, Nil, argType))
-            Closure(meth, _ => arg.changeOwner(ctx.owner, meth))
+            Closure(meth, _ =>
+              atGroupEnd { implicit ctx: Context =>
+                arg.changeOwner(ctx.owner, meth)
+              }
+            )
         }
         ref(defn.dummyApply).appliedToType(argType).appliedTo(argFun)
       case _ =>
diff --git a/compiler/src/dotty/tools/dotc/transform/ExtensionMethods.scala b/compiler/src/dotty/tools/dotc/transform/ExtensionMethods.scala
@@ -63,8 +63,13 @@ class ExtensionMethods extends MiniPhaseTransform with DenotTransformer with Ful
             // not generate them again.
             if (!(valueClass is Scala2x)) ctx.atPhase(thisTransformer) { implicit ctx =>
               for (decl <- valueClass.classInfo.decls) {
-                if (isMethodWithExtension(decl))
-                  decls1.enter(createExtensionMethod(decl, moduleClassSym.symbol))
+                if (isMethodWithExtension(decl)) {
+                  val meth = createExtensionMethod(decl, moduleClassSym.symbol)
+                  decls1.enter(meth)
+                  // Workaround #1895: force denotation of `meth` to be
+                  // at phase where `meth` is entered into the decls of a class
+                  meth.denot(ctx.withPhase(thisTransformer.next))
+                }
               }
             }
 
diff --git a/compiler/src/dotty/tools/dotc/typer/ImportInfo.scala b/compiler/src/dotty/tools/dotc/typer/ImportInfo.scala
@@ -30,7 +30,16 @@ object ImportInfo {
 class ImportInfo(symf: => Symbol, val selectors: List[untpd.Tree],
                  symNameOpt: Option[TermName], val isRootImport: Boolean = false)(implicit ctx: Context) {
 
-  lazy val sym = symf
+  // Dotty deviation: we cannot use a lazy val here for the same reason
+  // that we cannot use one for `DottyPredefModuleRef`.
+  def sym = {
+    if (mySym == null) {
+      mySym = symf
+      assert(mySym != null)
+    }
+    mySym
+  }
+  private[this] var mySym: Symbol = _
 
   /** The (TermRef) type of the qualifier of the import clause */
   def site(implicit ctx: Context): Type = {
diff --git a/compiler/test/dotc/build.scala b/compiler/test/dotc/build.scala
diff --git a/compiler/test/dotc/tests.scala b/compiler/test/dotc/tests.scala
@@ -61,7 +61,7 @@ class tests extends CompilerTest {
     List("-classpath", paths)
   }
 
-  implicit val defaultOptions = noCheckOptions ++ {
+  implicit val defaultOptions: List[String] = noCheckOptions ++ {
     if (isRunByJenkins) List("-Ycheck:tailrec,resolveSuper,mixin,restoreScopes,labelDef") // should be Ycheck:all, but #725
     else List("-Ycheck:tailrec,resolveSuper,mixin,restoreScopes,labelDef")
   } ++ checkOptions ++ classPath
diff --git a/compiler/test/dotty/Jars.scala b/compiler/test/dotty/Jars.scala
@@ -1,20 +1,18 @@
 package dotty
 
-/** Jars used when compiling test, defaults to sbt locations */
+/** Jars used when compiling test, normally set from the sbt build */
 object Jars {
-  val dottyLib: String = sys.env.get("DOTTY_LIB") getOrElse {
-    "../library/target/scala-2.11/dotty-library_2.11-0.1.1-SNAPSHOT.jar"
-  }
+  val dottyLib: String = sys.env.get("DOTTY_LIB")
+    .getOrElse(sys.props("dotty.tests.classes.library"))
 
-  val dottyCompiler: String = sys.env.get("DOTTY_COMPILER") getOrElse {
-    "./target/scala-2.11/dotty-compiler_2.11-0.1.1-SNAPSHOT.jar"
-  }
+  val dottyCompiler: String = sys.env.get("DOTTY_COMPILER")
+    .getOrElse(sys.props("dotty.tests.classes.compiler"))
 
-  val dottyInterfaces: String = sys.env.get("DOTTY_INTERFACE") getOrElse {
-    "../interfaces/target/dotty-interfaces-0.1.1-SNAPSHOT.jar"
-  }
+  val dottyInterfaces: String = sys.env.get("DOTTY_INTERFACE")
+    .getOrElse(sys.props("dotty.tests.classes.interfaces"))
 
-  val dottyExtras: List[String] = sys.env.get("DOTTY_EXTRAS")
+  val dottyExtras: List[String] = Option(sys.env.get("DOTTY_EXTRAS")
+    .getOrElse(sys.props("dotty.tests.extraclasspath")))
     .map(_.split(":").toList).getOrElse(Nil)
 
   val dottyReplDeps: List[String] = dottyLib :: dottyExtras
diff --git a/compiler/test/dotty/partest/DPConsoleRunner.scala b/compiler/test/dotty/partest/DPConsoleRunner.scala
@@ -202,7 +202,7 @@ class DPTestRunner(testFile: File, suiteRunner: DPSuiteRunner) extends nest.Runn
     import FileManager.joinPaths
     // compile using command-line javac compiler
     val args = Seq(
-      javacCmdPath,
+      suiteRunner.javacCmdPath, // FIXME: Dotty deviation just writing "javacCmdPath" doesn't work
       "-d",
       outDir.getAbsolutePath,
       "-classpath",
@@ -300,11 +300,11 @@ class DPTestRunner(testFile: File, suiteRunner: DPSuiteRunner) extends nest.Runn
     // Don't get confused, the neg test passes when compilation fails for at
     // least one round (optionally checking the number of compiler errors and
     // compiler console output)
-    case class CompFailed() extends NegTestState
+    case object CompFailed extends NegTestState
     // the neg test fails when all rounds return either of these:
     case class CompFailedButWrongNErr(expected: String, found: String) extends NegTestState
-    case class CompFailedButWrongDiff() extends NegTestState
-    case class CompSucceeded() extends NegTestState
+    case object CompFailedButWrongDiff extends NegTestState
+    case object CompSucceeded extends NegTestState
 
     def nerrIsOk(reason: String) = {
       val nerrFinder = """compilation failed with (\d+) errors""".r
@@ -350,7 +350,7 @@ class DPTestRunner(testFile: File, suiteRunner: DPSuiteRunner) extends nest.Runn
       if (existsNerr) false
       else {
         val existsDiff = failureStates.exists({
-          case CompFailedButWrongDiff() =>
+          case CompFailedButWrongDiff =>
             nextTestActionFailing(s"output differs")
             true
           case _ =>
@@ -398,8 +398,13 @@ class DPTestRunner(testFile: File, suiteRunner: DPSuiteRunner) extends nest.Runn
   override def extraClasspath =
     suiteRunner.fileManager.asInstanceOf[DottyFileManager].extraJarList ::: super.extraClasspath
 
+
+  // FIXME: Dotty deviation: error if return type is omitted:
+  //   overriding method cleanup in class Runner of type ()Unit;
+  //    method cleanup of type => Boolean | Unit has incompatible type
+
   // override to keep class files if failed and delete clog if ok
-  override def cleanup = if (lastState.isOk) {
+  override def cleanup: Unit = if (lastState.isOk) {
     logFile.delete
     cLogFile.delete
     Directory(outDir).deleteRecursively
diff --git a/compiler/test/dotty/tools/dotc/parsing/ModifiersParsingTest.scala b/compiler/test/dotty/tools/dotc/parsing/ModifiersParsingTest.scala
@@ -10,11 +10,11 @@ import ast.untpd._
 import ast.{ Trees => d }
 import Parsers.Parser
 import util.SourceFile
-import core.Contexts.ContextBase
+import core.Contexts._
 import core.Flags
 
 object ModifiersParsingTest {
-  implicit val ctx = (new ContextBase).initialCtx
+  implicit val ctx: Context = (new ContextBase).initialCtx
 
   implicit def parse(code: String): Tree = {
     val (_, stats) = new Parser(new SourceFile("<meta>", code.toCharArray)).templateStatSeq()
diff --git a/library/test/dotty/ShowTests.scala b/library/test/dotty/ShowTests.scala
@@ -35,13 +35,13 @@ class ShowTests {
 
   @Test def showCar = {
     case class Car(model: String, manufacturer: String, year: Int)
-    implicit val showCar = new Show[Car] {
+    implicit val showCar: Show[Car] = new Show[Car] {
       def show(c: Car) =
         "Car(" + c.model.show + ", " + c.manufacturer.show + ", " + c.year.show + ")"
     }
 
     case class Shop(xs: List[Car], name: String)
-    implicit val showShop = new Show[Shop] {
+    implicit val showShop: Show[Shop] = new Show[Shop] {
       def show(sh: Shop) =
         "Shop(" + sh.xs.show + ", " + sh.name.show + ")"
     }
diff --git a/project/Build.scala b/project/Build.scala
diff --git a/tests/repl/vc.check b/tests/repl/vc.check

Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,6 @@ class JavaPlatform extends Platform {`
`17`	`17`	`if (currentClassPath.isEmpty)`
`18`	`18`	`currentClassPath = Some(new PathResolver().result)`
`19`	`19`	`val cp = currentClassPath.get`
`20`		`- //println(cp)`
`21`		`- //println("------------------")`
`22`	`20`	`cp`
`23`	`21`	`}`
`24`	`22`
Original file line number	Diff line number	Diff line change
`@@ -567,7 +567,8 @@ object Scanners {`
`567`	`567`	`nextChar()`
`568`	`568`	`getOperatorRest()`
`569`	`569`	`} else {`
`570`		`- error(f"illegal character '\\u${ch: Int}%04x'")`
	`570`	`+ // FIXME: Dotty deviation: f"" interpolator is not supported (#1814)`
	`571`	`+ error("illegal character '\\u%04x'".format(ch: Int))`
`571`	`572`	`nextChar()`
`572`	`573`	`}`
`573`	`574`	`}`