Remove conflict between ElimErasedValueTypes and CapturedVars

Author: odersky

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

@@ -91,7 +91,7 @@ class CapturedVars extends MiniPhase with IdentityDenotTransformer { thisTransfo
     }
 
     override def prepareForValDef(vdef: ValDef)(implicit ctx: Context) = {
-      val sym = vdef.symbol
+      val sym = vdef.symbol(ctx.withPhase(thisTransform))
       if (captured contains sym) {
         val newd = sym.denot(ctx.withPhase(thisTransform)).copySymDenotation(
           info = refClass(sym.info.classSymbol, sym.hasAnnotation(defn.VolatileAnnot)).typeRef,
@@ -119,7 +119,7 @@ class CapturedVars extends MiniPhase with IdentityDenotTransformer { thisTransfo
     override def transformIdent(id: Ident)(implicit ctx: Context, info: TransformerInfo): Tree = {
       val vble = id.symbol
       if (captured(vble))
-        (id select nme.elem).ensureConforms(vble.denot(ctx.withPhase(thisTransform)).info)
+        id.select(nme.elem).ensureConforms(vble.denot(ctx.withPhase(thisTransform)).info)
       else id
     }
 

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

@@ -23,8 +23,8 @@ class ElimErasedValueType extends MiniPhaseTransform with InfoTransformer {
 
   override def runsAfter: Set[Class[_ <: Phase]] = Set(classOf[Erasure])
 
-  //override def treeTransformPhase(implicit ctx: Context, info: TransformerInfo) =
-  //  groupEndPhase
+  override def treeTransformPhase(implicit ctx: Context, info: TransformerInfo) =
+    groupEndPhase
 
   def transformInfo(tp: Type, sym: Symbol)(implicit ctx: Context): Type = sym match {
     case sym: ClassSymbol if sym is ModuleClass =>