Merge pull request scala-js#3231 from sjrd/remove-jdk8-bridge-hacks

Remove hacks to build on older JDKs.

Author: sjrd

javalanglib/src/main/scala/java/lang/AutoCloseable.scala

@@ -0,0 +1,5 @@
+package java.lang
+
+trait AutoCloseable {
+  def close(): Unit
+}

javalanglib/src/main/scala/java/lang/MathJDK8Bridge.scala

@@ -159,7 +159,7 @@ private[math] object Conversion {
     if (sign == 0) {
       "0"
     } else if (numberLength == 1) {
-      val absStr = MathJDK8Bridge.toUnsignedString(digits(0))
+      val absStr = Integer.toUnsignedString(digits(0))
       if (sign < 0) "-" + absStr
       else absStr
     } else {
@@ -175,7 +175,7 @@ private[math] object Conversion {
         var i: Int = tempLen - 1
         while (i >= 0) {
           val temp1 = (rem.toLong << 32) + (temp(i) & 0xFFFFFFFFL)
-          val quot = MathJDK8Bridge.divideUnsigned(temp1, 1000000000L).toInt
+          val quot = java.lang.Long.divideUnsigned(temp1, 1000000000L).toInt
           temp(i) = quot
           rem = (temp1 - quot * 1000000000L).toInt
           i -= 1

javalib/src/main/scala/java/lang/AutoCloseable.scala

@@ -110,7 +110,7 @@ private[math] object Division {
           ((normA(j) & UINT_MAX) << 32) + (normA(j - 1) & UINT_MAX)
         val firstDivisorDigitLong = firstDivisorDigit & UINT_MAX
         val quotient =
-          MathJDK8Bridge.divideUnsigned(product, firstDivisorDigitLong)
+          java.lang.Long.divideUnsigned(product, firstDivisorDigitLong)
         guessDigit = quotient.toInt
         var rem = (product - quotient * firstDivisorDigitLong).toInt
 
@@ -190,8 +190,8 @@ private[math] object Division {
     val valSign = bi.sign
     if (valLen == 1) {
       val valDigit = valDigits(0)
-      var quo = MathJDK8Bridge.divideUnsigned(valDigit, divisor) & UINT_MAX
-      var rem = MathJDK8Bridge.remainderUnsigned(valDigit, divisor) & UINT_MAX
+      var quo = Integer.divideUnsigned(valDigit, divisor) & UINT_MAX
+      var rem = Integer.remainderUnsigned(valDigit, divisor) & UINT_MAX
       if (valSign != divisorSign)
         quo = -quo
       if (valSign < 0)
@@ -229,7 +229,7 @@ private[math] object Division {
     var i = srcLength - 1
     while (i >= 0) {
       val temp: Long = (rem.toLong << 32) | (src(i) & UINT_MAX)
-      val quot = MathJDK8Bridge.divideUnsigned(temp, bLong)
+      val quot = java.lang.Long.divideUnsigned(temp, bLong)
       rem = (temp - quot * bLong).toInt
       dest(i) = quot.toInt
       i -= 1
@@ -743,7 +743,7 @@ private[math] object Division {
     var i = srcLength - 1
     while (i >= 0) {
       val temp = (result.toLong << 32) | (src(i).toLong & UINT_MAX)
-      result = MathJDK8Bridge.remainderUnsigned(temp, longDivisor).toInt
+      result = java.lang.Long.remainderUnsigned(temp, longDivisor).toInt
       i -= 1
     }
     result

javalib/src/main/scala/java/lang/MathJDK8Bridge.scala

@@ -5,14 +5,8 @@ package org.junit.internal
 
 object ArrayComparisonFailure
 
-/* Attention: AssertionError does not have a (String, Throwable) constructor
- * in JDK 6. If we try to call that one, compilation *succeeds* because of
- * auto-boxing, but it does not do the right thing. See #3154.
- */
 class ArrayComparisonFailure(message: String, cause: AssertionError, index: Int)
-    extends AssertionError(message) {
-
-  initCause(cause)
+    extends AssertionError(message, cause) {
 
   private var fIndices: List[Int] = index :: Nil
 
@@ -29,7 +23,7 @@ class ArrayComparisonFailure(message: String, cause: AssertionError, index: Int)
     val indices =
       if (fIndices == null) s"[$index]" // see #3148
       else fIndices.map(index => s"[$index]").mkString
-    val causeMessage = cause.getMessage // do not use getCause(), see #3148
+    val causeMessage = getCause.getMessage
     s"${msg}arrays first differed at element $indices; $causeMessage"
   }
 

javalib/src/main/scala/java/math/Conversion.scala

@@ -724,8 +724,7 @@ object RuntimeLong {
     if (isUInt32(ahi)) {
       if (isUInt32(bhi)) {
         hiReturn = 0
-        // Integer.divideUnsigned(alo, blo), inaccessible when compiling on JDK < 8
-        rawToInt(alo.toUint / blo.toUint)
+        Integer.divideUnsigned(alo, blo)
       } else {
         // a < b
         hiReturn = 0
@@ -819,8 +818,7 @@ object RuntimeLong {
     if (isUInt32(ahi)) {
       if (isUInt32(bhi)) {
         hiReturn = 0
-        // Integer.remainderUnsigned(alo, blo), inaccessible when compiling on JDK < 8
-        rawToInt(alo.toUint % blo.toUint)
+        Integer.remainderUnsigned(alo, blo)
       } else {
         // a < b
         hiReturn = ahi

javalib/src/main/scala/java/math/Division.scala

@@ -1105,20 +1105,15 @@ object Build {
 
             val filter = ("*.sjsir": NameFilter)
 
-            val javalibProducts = (products in LocalProject("javalib")).value
-            val javalibMappings =
-              javalibProducts.flatMap(base => Path.selectSubpaths(base, filter))
-            val javalibFilteredMappings = javalibMappings.filter(
-                _._2.replace('\\', '/') != "java/lang/MathJDK8Bridge$.sjsir")
-
             val otherProducts = (
                 (products in LocalProject("javalanglib")).value ++
+                (products in LocalProject("javalib")).value ++
                 (products in LocalProject("scalalib")).value ++
                 (products in LocalProject("libraryAux")).value)
             val otherMappings =
               otherProducts.flatMap(base => Path.selectSubpaths(base, filter))
 
-            libraryMappings ++ otherMappings ++ javalibFilteredMappings
+            libraryMappings ++ otherMappings
           }
       ))
   ).withScalaJSCompiler