Remove one sneaky left-over WhileDo-like label-def.

Author: sjrd

compiler/src/dotty/tools/dotc/ast/tpd.scala

@@ -313,16 +313,6 @@ object tpd extends Trees.Instance[Type] with TypedTreeInfo {
     Block(cdef :: Nil, New(cls.typeRef, Nil))
   }
 
-  // { <label> def while$(): Unit = if (cond) { body; while$() } ; while$() }
-  def WhileDo(owner: Symbol, cond: Tree, body: List[Tree])(implicit ctx: Context): Tree = {
-    val sym = ctx.newSymbol(owner, nme.WHILE_PREFIX, Flags.Label | Flags.Synthetic,
-      MethodType(Nil, defn.UnitType), coord = cond.pos)
-
-    val call = Apply(ref(sym), Nil)
-    val rhs = If(cond, Block(body, call), unitLiteral)
-    Block(List(DefDef(sym, rhs)), call)
-  }
-
   def Import(expr: Tree, selectors: List[untpd.Tree])(implicit ctx: Context): Import =
     ta.assignType(untpd.Import(expr, selectors), ctx.newImportSymbol(ctx.owner, expr))
 

compiler/src/dotty/tools/dotc/transform/LazyVals.scala

@@ -376,8 +376,8 @@ class LazyVals extends MiniPhase with IdentityDenotTransformer {
     val cases = Match(stateMask.appliedTo(ref(flagSymbol), Literal(Constant(ord))),
       List(compute, waitFirst, waitSecond, computed, default)) //todo: annotate with @switch
 
-    val whileBody = List(ref(flagSymbol).becomes(getFlag.appliedTo(thiz, offset)), cases)
-    val cycle = WhileDo(methodSymbol, whileCond, whileBody)
+    val whileBody = Block(ref(flagSymbol).becomes(getFlag.appliedTo(thiz, offset)) :: Nil, cases)
+    val cycle = WhileDo(whileCond, whileBody)
     val setNullables = nullOut(nullables)
     DefDef(methodSymbol, Block(resultDef :: retryDef :: flagDef :: cycle :: setNullables, ref(resultSymbol)))
   }