Stop using the bootclasspath for Java 9 compatibility

It's no longer introspectable under Java 9. The scalac 2.12 shell scripts work
around this by passing the bootclasspath jars as an additional system
property, but we can avoid this complication by just using -classpath instead.
This may have a slight negative impact on startup performance since the
JVM bytecode verifier is not run for classes from the bootclasspath, but
we can worry about that later.

Author: smarter

bench/src/main/scala/Benchmarks.scala

@@ -37,7 +37,7 @@ object Bench {
     val libs = System.getProperty("BENCH_CLASS_PATH")
 
     val opts = new OptionsBuilder()
-               .jvmArgsPrepend("-Xbootclasspath/a:" + libs + ":", "-Xms2G", "-Xmx2G")
+               .jvmArgsPrepend("-classpath " + libs + ":", "-Xms2G", "-Xmx2G")
                .mode(Mode.AverageTime)
                .timeUnit(TimeUnit.MILLISECONDS)
                .warmupIterations(warmup)

dist/bin/dotc

@@ -28,7 +28,6 @@ fi
 source "$PROG_HOME/bin/common"
 
 default_java_opts="-Xmx768m -Xms768m"
-bootcp=true
 
 CompilerMain=dotty.tools.dotc.Main
 FromTasty=dotty.tools.dotc.FromTasty
@@ -64,11 +63,7 @@ classpathArgs () {
   toolchain+="$DOTTY_LIB$PSEP"
   toolchain+="$DOTTY_COMP"
 
-  if [[ -n "$bootcp" ]]; then
-    jvm_cp_args="-Xbootclasspath/a:\"$toolchain\""
-  else
-    jvm_cp_args="-classpath \"$toolchain\""
-  fi
+  jvm_cp_args="-classpath \"$toolchain\""
 }
 
 while [[ $# -gt 0 ]]; do
@@ -85,8 +80,6 @@ case "$1" in
        -tasty) PROG_NAME="$FromTasty" && shift ;;
      -compile) PROG_NAME="$CompilerMain" && shift ;;
          -run) PROG_NAME="$ReplMain" && shift ;;
-      -bootcp) bootcp=true && shift ;;
-   -nobootcp) unset bootcp && shift ;;
       -colors) colors=true && shift ;;
    -no-colors) unset colors && shift ;;
 

project/Build.scala

@@ -514,11 +514,16 @@ object Build {
         }
       },
       run := Def.inputTaskDyn {
+        val attList = (dependencyClasspath in Runtime).value
+        val scalaLib = attList
+          .map(_.data.getAbsolutePath)
+          .find(_.contains("scala-library"))
+          .toList.mkString(":")
         val dottyLib = packageAll.value("dotty-library")
         val args: Seq[String] = spaceDelimited("<arg>").parsed
 
         val fullArgs = args.span(_ != "-classpath") match {
-          case (beforeCp, Nil) => beforeCp ++ ("-classpath" :: dottyLib :: Nil)
+          case (beforeCp, Nil) => beforeCp ++ ("-classpath" :: s"$dottyLib:$scalaLib" :: Nil)
           case (beforeCp, rest) => beforeCp ++ rest
         }
 
@@ -529,11 +534,16 @@ object Build {
       dotc := run.evaluated,
 
       repl := Def.inputTaskDyn {
+        val attList = (dependencyClasspath in Runtime).value
+        val scalaLib = attList
+          .map(_.data.getAbsolutePath)
+          .find(_.contains("scala-library"))
+          .toList.mkString(":")
         val dottyLib = packageAll.value("dotty-library")
         val args: Seq[String] = spaceDelimited("<arg>").parsed
 
         val fullArgs = args.span(_ != "-classpath") match {
-          case (beforeCp, Nil) => beforeCp ++ ("-classpath" :: dottyLib :: Nil)
+          case (beforeCp, Nil) => beforeCp ++ ("-classpath" :: s"$dottyLib:$scalaLib" :: Nil)
           case (beforeCp, rest) => beforeCp ++ rest
         }
 
@@ -592,25 +602,8 @@ object Build {
       // http://grokbase.com/t/gg/simple-build-tool/135ke5y90p/sbt-setting-jvm-boot-paramaters-for-scala
       // packageAll should always be run before tests
       javaOptions ++= {
-        val attList = (dependencyClasspath in Runtime).value
         val pA = packageAll.value
 
-        // put needed dependencies on classpath:
-        val path = for {
-          file <- attList.map(_.data)
-          path = file.getAbsolutePath
-          // FIXME: when we snip the cord, this should go bye-bye
-          if path.contains("scala-library") ||
-            // FIXME: currently needed for tests referencing scalac internals
-            path.contains("scala-reflect") ||
-            // FIXME: should go away when xml literal parsing is removed
-            path.contains("scala-xml") ||
-            // used for tests that compile dotty
-            path.contains("scala-asm") ||
-            // needed for the xsbti interface
-            path.contains("sbt-interface")
-        } yield "-Xbootclasspath/p:" + path
-
         val ci_build = // propagate if this is a ci build
           if (sys.props.isDefinedAt(JENKINS_BUILD))
             List(s"-D$JENKINS_BUILD=${sys.props(JENKINS_BUILD)}") ::: jenkinsMemLimit
@@ -630,7 +623,7 @@ object Build {
           "-Ddotty.tests.classes.compiler=" + pA("dotty-compiler")
         )
 
-        jars ::: tuning ::: agentOptions ::: ci_build ::: path.toList
+        jars ::: tuning ::: agentOptions ::: ci_build
       }
   )