Scala 2.11 compatibiltity: no Java SAMs

Author: retronym

src/main/scala/scala/async/internal/ExprBuilder.scala

@@ -302,7 +302,9 @@ trait ExprBuilder {
         checkForUnsupportedAwait(scrutinee)
 
         val caseStates = new Array[Int](cases.length)
-        java.util.Arrays.setAll(caseStates, (_ => nextState()): IntUnaryOperator)
+        java.util.Arrays.setAll(caseStates, new IntUnaryOperator {
+          override def applyAsInt(operand: Int): Int = nextState()
+        })
         val afterMatchState = nextState()
 
         asyncStates +=

src/main/scala/scala/async/internal/LiveVariables.scala

@@ -1,6 +1,7 @@
 package scala.async.internal
 
 import java.util
+import java.util.function.{IntConsumer, IntPredicate}
 
 import scala.collection.immutable.IntMap
 
@@ -26,7 +27,7 @@ trait LiveVariables {
     var assignsOf = Map[Int, List[Tree]]()
 
     for ((fld, where) <- liveVarsMap) {
-      where.foreach { (state: Int) =>
+      where.foreach { new IntConsumer { def accept(state: Int): Unit = {
         assignsOf get state match {
           case None =>
             assignsOf += (state -> List(fld))
@@ -35,7 +36,7 @@ trait LiveVariables {
           case _ =>
             // do nothing
         }
-      }
+      }}}
     }
 
     assignsOf
@@ -272,15 +273,21 @@ trait LiveVariables {
     val nullOutAt: Map[Tree, StateSet] =
       for ((fld, lastStates) <- lastUsages) yield {
         var result = new StateSet
-        lastStates.foreach { s =>
+        lastStates.foreach(new IntConsumer { def accept(s: Int): Unit = {
           if (s != finalState.state) {
             val lastAsyncState = asyncStates.find(_.state == s).get
             val succNums       = lastAsyncState.nextStates
             // all successor states that are not indirect predecessors
             // filter out successor states where the field is live at the entry
-            util.Arrays.stream(succNums).filter(num => !isPred(num, s)).filter(num => !LVentry(num).contains(fld.symbol)).forEach(result += _)
+            var i = 0
+            while (i < succNums.length) {
+              val num = succNums(i)
+              if (!isPred(num, s) && !LVentry(num).contains(fld.symbol))
+                result += num
+              i += 1
+            }
           }
-        }
+        }})
         (fld, result)
       }
 

src/main/scala/scala/async/internal/StateSet.scala

@@ -4,7 +4,7 @@
 package scala.async.internal
 
 import java.util
-import java.util.function.IntConsumer
+import java.util.function.{Consumer, IntConsumer}
 
 import scala.collection.JavaConverters.{asScalaIteratorConverter, iterableAsScalaIterableConverter}
 import scala.collection.mutable
@@ -20,6 +20,8 @@ final class StateSet {
   }
   def foreach(f: IntConsumer): Unit = {
     bitSet.stream().forEach(f)
-    caseSet.stream().forEach(integer => f.accept(integer))
+    caseSet.stream().forEach(new Consumer[Integer] {
+      override def accept(value: Integer): Unit = f.accept(value)
+    })
   }
 }