fixup

Author: retronym

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

@@ -489,7 +489,7 @@ trait ExprBuilder {
         val stateMemberSymbol = symLookup.stateMachineMember(name.state)
         val stateMemberRef = symLookup.memberRef(name.state)
         val body = Match(stateMemberRef, mkCombinedHandlerCases[T] ++ initStates.flatMap(_.mkOnCompleteHandler[T]) ++ List(CaseDef(Ident(nme.WILDCARD), EmptyTree, Throw(Apply(Select(New(Ident(defn.IllegalStateExceptionClass)), termNames.CONSTRUCTOR), List())))))
-        val body1 = eliminateDeadStates(body)
+        val body1 = compactStates(body)
 
         maybeTry(
           body1,
@@ -508,14 +508,9 @@ trait ExprBuilder {
             })), EmptyTree)
       }
 
-      // Identify dead states: `case <id> => { state = nextId; (); (); ... }, eliminated, and compact state ids to
-      // enable emission of a tableswitch.
-      private def eliminateDeadStates(m: Match): Tree = {
+      private def compactStates(m: Match): Tree = {
         val stateMemberSymbol = symLookup.stateMachineMember(name.state)
-        // - remove CaseDef-s for dead states
-        // - rewrite state transitions to dead states to instead transition to the
-        //   non-dead successor.
-        val elimDeadStateTransform = new Transformer {
+        val compactStateTransform = new Transformer {
           override def transform(tree: Tree): Tree = tree match {
             case as @ Assign(lhs, Literal(Constant(i: Integer))) if lhs.symbol == stateMemberSymbol =>
               val replacement = switchIds(i)
@@ -528,7 +523,7 @@ trait ExprBuilder {
         val cases1 = m.cases.flatMap {
           case cd @ CaseDef(Literal(Constant(i: Integer)), EmptyTree, rhs) =>
             val replacement = switchIds(i)
-            val rhs1 = elimDeadStateTransform.transform(rhs)
+            val rhs1 = compactStateTransform.transform(rhs)
             treeCopy.CaseDef(cd, Literal(Constant(replacement)), EmptyTree, rhs1) :: Nil
           case x => x :: Nil
         }

src/test/scala/scala/async/run/late/LateExpansion.scala

@@ -3,7 +3,7 @@ package scala.async.run.late
 import java.io.File
 
 import junit.framework.Assert.assertEquals
-import org.junit.{Assert, Test}
+import org.junit.{Assert, Ignore, Test}
 
 import scala.annotation.StaticAnnotation
 import scala.annotation.meta.{field, getter}