Refactor super type handling in checkAccessible

shawjef3 · Mar 23, 2019 · 02ea347 · 02ea347
1 parent 4f419e7
commit 02ea347
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/compiler/scala/tools/nsc/typechecker/Infer.scala b/src/compiler/scala/tools/nsc/typechecker/Infer.scala
@@ -282,11 +282,11 @@ trait Infer extends Checkable {
             catch { case ex: MalformedType => malformed(ex, pre memberType underlyingSymbol(sym)) }
           )
           tree setSymbol sym1 setType (
-          pre match {
-              case _: SuperType =>
-                if (!sym.isConstructor && !owntype.isInstanceOf[OverloadedType]) owntype // OPT: avoid lambda allocation and Type.map
-                else owntype map ((tp: Type) => if (tp eq pre) site.symbol.thisType else tp)
-              case _            => owntype
+            pre match {
+              // OPT: avoid lambda allocation and Type.map for super constructor calls
+              case _: SuperType if !sym.isConstructor && !owntype.isInstanceOf[OverloadedType] =>
+                owntype map ((tp: Type) => if (tp eq pre) site.symbol.thisType else tp)
+              case _ => owntype
             }
           )
       }