Avoid double avoidance when typing blocks

odersky · odersky · commit 45ffdf0dc190 · 2017-08-16T16:18:47.000+02:00
For a Block, TypeAssigner does an avoid just for term symbols whereas
Typer does one for all local symbols. Since Typer called TypeAssigner,
we got a double avoidance pass. This is eliminated by assigning types
directly in Typer without passing through TypeAssigner.
diff --git a/compiler/src/dotty/tools/dotc/typer/Typer.scala b/compiler/src/dotty/tools/dotc/typer/Typer.scala
@@ -624,7 +624,7 @@ class Typer extends Namer with TypeAssigner with Applications with Implicits wit
       else pt.notApplied
     val expr1 = typedExpr(tree.expr, ept)(exprCtx)
     ensureNoLocalRefs(
-        assignType(cpy.Block(tree)(stats1, expr1), stats1, expr1), pt, localSyms(stats1))
+      cpy.Block(tree)(stats1, expr1).withType(expr1.tpe), pt, localSyms(stats1))
   }
 
   def escapingRefs(block: Tree, localSyms: => List[Symbol])(implicit ctx: Context): collection.Set[NamedType] = {

Original file line number	Diff line number	Diff line change
`@@ -624,7 +624,7 @@ class Typer extends Namer with TypeAssigner with Applications with Implicits wit`
`624`	`624`	`else pt.notApplied`
`625`	`625`	`val expr1 = typedExpr(tree.expr, ept)(exprCtx)`
`626`	`626`	`ensureNoLocalRefs(`
`627`		`- assignType(cpy.Block(tree)(stats1, expr1), stats1, expr1), pt, localSyms(stats1))`
	`627`	`+ cpy.Block(tree)(stats1, expr1).withType(expr1.tpe), pt, localSyms(stats1))`
`628`	`628`	`}`
`629`	`629`
`630`	`630`	`def escapingRefs(block: Tree, localSyms: => List[Symbol])(implicit ctx: Context): collection.Set[NamedType] = {`