Revert change in MegaPhase

noti0na1 · noti0na1 · commit c9cad4aeb1b0 · 2022-02-09T19:08:08.000-05:00
diff --git a/compiler/src/dotty/tools/dotc/transform/MegaPhase.scala b/compiler/src/dotty/tools/dotc/transform/MegaPhase.scala
@@ -296,8 +296,9 @@ class MegaPhase(val miniPhases: Array[MiniPhase]) extends Phase {
         }
       case tree: Block =>
         inContext(prepBlock(tree, start)(using outerCtx)) {
-          val stats1 = transformStats(tree.stats :+ tree.expr, ctx.owner, start)
-          goBlock(cpy.Block(tree)(stats1.init, stats1.last), start)
+          val stats = transformStats(tree.stats, ctx.owner, start)
+          val expr = transformTree(tree.expr, start)
+          goBlock(cpy.Block(tree)(stats, expr), start)
         }
       case tree: TypeApply =>
         inContext(prepTypeApply(tree, start)(using outerCtx)) {

Original file line number	Diff line number	Diff line change
`@@ -296,8 +296,9 @@ class MegaPhase(val miniPhases: Array[MiniPhase]) extends Phase {`
`296`	`296`	`}`
`297`	`297`	`case tree: Block =>`
`298`	`298`	`inContext(prepBlock(tree, start)(using outerCtx)) {`
`299`		`- val stats1 = transformStats(tree.stats :+ tree.expr, ctx.owner, start)`
`300`		`- goBlock(cpy.Block(tree)(stats1.init, stats1.last), start)`
	`299`	`+ val stats = transformStats(tree.stats, ctx.owner, start)`
	`300`	`+ val expr = transformTree(tree.expr, start)`
	`301`	`+ goBlock(cpy.Block(tree)(stats, expr), start)`
`301`	`302`	`}`
`302`	`303`	`case tree: TypeApply =>`
`303`	`304`	`inContext(prepTypeApply(tree, start)(using outerCtx)) {`