Reduce selector while normalizing Match

OlivierBlanvillain · OlivierBlanvillain · commit c0097c80024f · 2018-10-25T18:07:33.000+02:00
diff --git a/compiler/src/dotty/tools/dotc/core/Normalize.scala b/compiler/src/dotty/tools/dotc/core/Normalize.scala
@@ -263,8 +263,9 @@ private final class NormalizeMap(implicit ctx: Context) extends TypeMap {
       }
 
     case tp @ TypeOf.Match(selector, cases) =>
+      val tp1 = TypeOf.Match.derived(tp)(apply(selector), cases).asInstanceOf[TypeOf]
       new PatternMatcher.Translator(NoType, null)(ctx.enterTypeOf())
-        .evaluateMatch(tp.tree.asInstanceOf[Match], normalizeBoolType).getOrElse(Stuck(tp))
+        .evaluateMatch(tp1.tree.asInstanceOf[Match], normalizeBoolType).getOrElse(Stuck(tp1))
 
     case tp =>
       mapOver(tp) match {

Original file line number	Diff line number	Diff line change
`@@ -263,8 +263,9 @@ private final class NormalizeMap(implicit ctx: Context) extends TypeMap {`
`263`	`263`	`}`
`264`	`264`
`265`	`265`	`case tp @ TypeOf.Match(selector, cases) =>`
	`266`	`+ val tp1 = TypeOf.Match.derived(tp)(apply(selector), cases).asInstanceOf[TypeOf]`
`266`	`267`	`new PatternMatcher.Translator(NoType, null)(ctx.enterTypeOf())`
`267`		`- .evaluateMatch(tp.tree.asInstanceOf[Match], normalizeBoolType).getOrElse(Stuck(tp))`
	`268`	`+ .evaluateMatch(tp1.tree.asInstanceOf[Match], normalizeBoolType).getOrElse(Stuck(tp1))`
`268`	`269`
`269`	`270`	`case tp =>`
`270`	`271`	`mapOver(tp) match {`