Combine captured vars and constructors into one macro phase.

Needed to fix a problem in CapturedVars to make this work.

Author: odersky

src/dotty/tools/dotc/Compiler.scala

@@ -64,8 +64,7 @@ class Compiler {
            new InterceptedMethods,
            new Literalize),
       List(new Erasure),
-      List(new CapturedVars),
-      List(new Constructors)/*,
+      List(new CapturedVars, new Constructors)/*,
       List(new LambdaLift)*/
     )
 

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

@@ -45,7 +45,7 @@ class CapturedVars extends MiniPhaseTransform with SymTransformer { thisTransfor
   }
 
   override def init(implicit ctx: Context, info: TransformerInfo): Unit =
-    (new CollectCaptured).runOver(ctx.compilationUnit.tpdTree)
+    (new CollectCaptured)(ctx.withPhase(thisTransform)).runOver(ctx.compilationUnit.tpdTree)
 
   override def transformSym(sd: SymDenotation)(implicit ctx: Context): SymDenotation =
     if (captured(sd.symbol)) {