Merge pull request #132 from DarkDimius/small-fixes

Small fixes

Author: DarkDimius

src/dotty/tools/dotc/ast/Trees.scala

@@ -775,6 +775,10 @@ object Trees {
     override def isEmpty: Boolean = trees.isEmpty
     override def toList: List[Tree[T]] = flatten(trees)
     override def toString = if (isEmpty) "EmptyTree" else "Thicket(" + trees.mkString(", ") + ")"
+    override def withPos(pos: Position): this.type = {
+      val newTrees = trees.map(_.withPos(pos))
+      new Thicket[T](newTrees).asInstanceOf[this.type]
+    }
   }
 
   class EmptyValDef[T >: Untyped] extends ValDef[T](

src/dotty/tools/dotc/core/Phases.scala

@@ -109,7 +109,10 @@ object Phases {
           squashedPhases += block
           prevPhases ++= phasess(i).map(_.name)
           block.init(this, phasess(i).head.id, phasess(i).last.id)
-        } else squashedPhases += phasess(i).head
+        } else {
+          squashedPhases += phasess(i).head
+          prevPhases += phasess(i).head.name
+        }
         i += 1
       }
       (NoPhase :: squashedPhases.toList ::: new TerminalPhase :: Nil).toArray

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

@@ -38,7 +38,7 @@ abstract class CreateCompanionObjects extends TreeTransform {
           else {
             val moduleSymbol = ctx.newCompleteModuleSymbol(claz.symbol.owner, claz.name.toTermName, Flags.Synthetic, Flags.Synthetic, List(defn.ObjectClass.typeRef), Scopes.newScope)
             if (moduleSymbol.owner.isClass) moduleSymbol.entered
-            val companion = tpd.ModuleDef(moduleSymbol, List(EmptyTree))
+            val companion = tpd.ModuleDef(moduleSymbol, List(EmptyTree)).withPos(claz.pos)
             acc += claz
             acc += companion
             transformStats0(stats, acc)

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

@@ -379,7 +379,7 @@ class LazyValTranformContext {
         val state = Select(Ident(helperModule.termRef), LazyVals.Names.state.toTermName)
         val cas = Select(Ident(helperModule.termRef), LazyVals.Names.cas.toTermName)
 
-        val accessor = mkThreadSafeDef(x.symbol.asTerm, claz, ord, containerSymbol, rhs, x.tpe, offset, getFlag, state, cas, setFlag, wait)
+        val accessor = mkThreadSafeDef(x.symbol.asTerm, claz, ord, containerSymbol, rhs, tpe, offset, getFlag, state, cas, setFlag, wait)
         if(flag eq EmptyTree)
           Thicket(List(containerTree, accessor))
         else Thicket(List(containerTree, flag, accessor))