Merge pull request scala#5068 from retronym/topic/jdk8ism2

Accomodate and exploit new library, lang features JDK 8

Author: lrytz

src/compiler/scala/reflect/macros/runtime/MacroRuntimes.scala

@@ -1,8 +1,12 @@
 package scala.reflect.macros
 package runtime
 
+import java.net.URLClassLoader
+
 import scala.reflect.internal.Flags._
+import scala.reflect.internal.util.ScalaClassLoader
 import scala.reflect.runtime.ReflectionUtils
+import scala.reflect.internal.util.AbstractFileClassLoader
 
 trait MacroRuntimes extends JavaReflectionRuntimes {
   self: scala.tools.nsc.typechecker.Analyzer =>
@@ -44,7 +48,15 @@ trait MacroRuntimes extends JavaReflectionRuntimes {
    *  which compiles implementations into a virtual directory (very much like REPL does) and then conjures
    *  a classloader mapped to that virtual directory.
    */
-  lazy val defaultMacroClassloader: ClassLoader = findMacroClassLoader()
+  private lazy val defaultMacroClassloaderCache = {
+    def attemptClose(loader: ClassLoader): Unit = loader match {
+      case u: URLClassLoader => debuglog("Closing macro runtime classloader"); u.close()
+      case afcl: AbstractFileClassLoader => attemptClose(afcl.getParent)
+      case _ => ???
+    }
+    perRunCaches.newGeneric(findMacroClassLoader, attemptClose _)
+  }
+  def defaultMacroClassloader: ClassLoader = defaultMacroClassloaderCache()
 
   /** Abstracts away resolution of macro runtimes.
    */

src/compiler/scala/tools/nsc/javac/JavaParsers.scala

@@ -264,7 +264,8 @@ trait JavaParsers extends ast.parser.ParsersCommon with JavaScanners {
         }
       }
 
-    def typ(): Tree =
+    def typ(): Tree = {
+      annotations()
       optArrayBrackets {
         if (in.token == FINAL) in.nextToken()
         if (in.token == IDENTIFIER) {
@@ -287,6 +288,7 @@ trait JavaParsers extends ast.parser.ParsersCommon with JavaScanners {
           basicType()
         }
       }
+    }
 
     def typeArgs(t: Tree): Tree = {
       val wildcards = new ListBuffer[TypeDef]
@@ -404,6 +406,7 @@ trait JavaParsers extends ast.parser.ParsersCommon with JavaScanners {
 
     def typeParam(): TypeDef =
       atPos(in.currentPos) {
+        annotations()
         val name = identForType()
         val hi = if (in.token == EXTENDS) { in.nextToken() ; bound() } else EmptyTree
         TypeDef(Modifiers(Flags.JAVA | Flags.DEFERRED | Flags.PARAM), name, Nil, TypeBoundsTree(EmptyTree, hi))

src/library/scala/collection/generic/BitOperations.scala

@@ -26,16 +26,7 @@ private[collection] object BitOperations {
     def complement(i: Int)                      = (-1) ^ i
     def bits(num: Int)                          = 31 to 0 by -1 map (i => (num >>> i & 1) != 0)
     def bitString(num: Int, sep: String = "")   = bits(num) map (b => if (b) "1" else "0") mkString sep
-
-    def highestOneBit(j: Int) = {
-      var i = j
-      i |= (i >>  1)
-      i |= (i >>  2)
-      i |= (i >>  4)
-      i |= (i >>  8)
-      i |= (i >> 16)
-      i - (i >>> 1)
-    }
+    def highestOneBit(j: Int)                   = java.lang.Integer.highestOneBit(j)
   }
   object Int extends Int
 
@@ -49,17 +40,7 @@ private[collection] object BitOperations {
     def complement(i: Long)                        = (-1L) ^ i
     def bits(num: Long)                            = 63L to 0L by -1L map (i => (num >>> i & 1L) != 0L)
     def bitString(num: Long, sep: String = "")     = bits(num) map (b => if (b) "1" else "0") mkString sep
-
-    def highestOneBit(j: Long) = {
-      var i = j
-      i |= (i >>  1)
-      i |= (i >>  2)
-      i |= (i >>  4)
-      i |= (i >>  8)
-      i |= (i >> 16)
-      i |= (i >> 32)
-      i - (i >>> 1)
-    }
+    def highestOneBit(j: Long)                     = java.lang.Long.highestOneBit(j)
   }
   object Long extends Long
 }

src/library/scala/collection/parallel/Tasks.scala

@@ -66,13 +66,10 @@ trait Task[R, +Tp] {
   }
 
   private[parallel] def mergeThrowables(that: Task[_, _]) {
-    // TODO: As soon as we target Java >= 7, use Throwable#addSuppressed
-    // to pass additional Throwables to the caller, e. g.
-    // if (this.throwable != null && that.throwable != null)
-    //   this.throwable.addSuppressed(that.throwable)
-    // For now, we just use whatever Throwable comes across “first”.
-    if (this.throwable == null && that.throwable != null)
-      this.throwable = that.throwable
+     if (this.throwable != null && that.throwable != null)
+       this.throwable.addSuppressed(that.throwable)
+     else if (this.throwable == null && that.throwable != null)
+       this.throwable = that.throwable
   }
 
   // override in concrete task implementations to signal abort to other tasks

src/library/scala/compat/Platform.scala

@@ -105,8 +105,7 @@ object Platform {
   /** The default line separator.
    *
    * On the JVM, this is equivalent to calling the method:
-   * `System.getProperty("line.separator")`
-   * with a default value of "\n".
+   * `java.lang.System.lineSeparator`
    */
   val EOL = scala.util.Properties.lineSeparator
 

src/library/scala/math/Ordering.scala

@@ -224,42 +224,32 @@ object Ordering extends LowPriorityOrderingImplicits {
   implicit object Unit extends UnitOrdering
 
   trait BooleanOrdering extends Ordering[Boolean] {
-    def compare(x: Boolean, y: Boolean) = (x, y) match {
-      case (false, true) => -1
-      case (true, false) => 1
-      case _ => 0
-    }
+    def compare(x: Boolean, y: Boolean) = java.lang.Boolean.compare(x, y)
   }
   implicit object Boolean extends BooleanOrdering
 
   trait ByteOrdering extends Ordering[Byte] {
-    def compare(x: Byte, y: Byte) = x.toInt - y.toInt
+    def compare(x: Byte, y: Byte) = java.lang.Byte.compare(x, y)
   }
   implicit object Byte extends ByteOrdering
 
   trait CharOrdering extends Ordering[Char] {
-    def compare(x: Char, y: Char) = x.toInt - y.toInt
+    def compare(x: Char, y: Char) = java.lang.Character.compare(x, y)
   }
   implicit object Char extends CharOrdering
 
   trait ShortOrdering extends Ordering[Short] {
-    def compare(x: Short, y: Short) = x.toInt - y.toInt
+    def compare(x: Short, y: Short) = java.lang.Short.compare(x, y)
   }
   implicit object Short extends ShortOrdering
 
   trait IntOrdering extends Ordering[Int] {
-    def compare(x: Int, y: Int) =
-      if (x < y) -1
-      else if (x == y) 0
-      else 1
+    def compare(x: Int, y: Int) = java.lang.Integer.compare(x, y)
   }
   implicit object Int extends IntOrdering
 
   trait LongOrdering extends Ordering[Long] {
-    def compare(x: Long, y: Long) =
-      if (x < y) -1
-      else if (x == y) 0
-      else 1
+    def compare(x: Long, y: Long) = java.lang.Long.compare(x, y)
   }
   implicit object Long extends LongOrdering
 

src/library/scala/runtime/BoxesRunTime.java

@@ -236,10 +236,10 @@ public static int hashFromDouble(java.lang.Double n) {
         if (iv == dv) return iv;
 
         long lv = n.longValue();
-        if (lv == dv) return java.lang.Long.valueOf(lv).hashCode();
+        if (lv == dv) return java.lang.Long.hashCode(lv);
 
         float fv = n.floatValue();
-        if (fv == dv) return java.lang.Float.valueOf(fv).hashCode();
+        if (fv == dv) return java.lang.Float.hashCode(fv);
         else return n.hashCode();
     }
     public static int hashFromFloat(java.lang.Float n) {
@@ -248,7 +248,7 @@ public static int hashFromFloat(java.lang.Float n) {
         if (iv == fv) return iv;
 
         long lv = n.longValue();
-        if (lv == fv) return java.lang.Long.valueOf(lv).hashCode();
+        if (lv == fv) return java.lang.Long.hashCode(lv);
         else return n.hashCode();
     }
     public static int hashFromNumber(java.lang.Number n) {

src/library/scala/sys/process/BasicIO.scala

@@ -33,7 +33,7 @@ object BasicIO {
   final val BufferSize = 8192
 
   /** Used to separate lines in the `processFully` function that takes `Appendable`. */
-  final val Newline    = props("line.separator")
+  final val Newline    = System.lineSeparator
 
   private[process] final class Streamed[T](
     val process:   T => Unit,

src/library/scala/util/Properties.scala

@@ -120,7 +120,7 @@ private[scala] trait PropertiesTrait {
 
   /** The default end of line character.
    */
-  def lineSeparator         = propOrElse("line.separator", "\n")
+  def lineSeparator         = System.lineSeparator()
 
   /* Various well-known properties. */
   def javaClassPath         = propOrEmpty("java.class.path")

src/library/scala/util/control/NoStackTrace.scala

@@ -14,6 +14,8 @@ package util.control
  *  on a global basis via a system property wrapper in
  *  [[scala.sys.SystemProperties]].
  *
+ *  @note Since JDK 1.7, a similar effect can be achieved with `class Ex extends Throwable(..., writableStackTrace = false)`
+ *
  *  @author   Paul Phillips
  *  @since    2.8
  */