Peformance improvement: Better basetype caching

Now first checks in cache before going into special case for static classes (derivesFrom on types is not free!)

1 files changed, 4 insertions, 4 deletions

diff --git a/src/dotty/tools/dotc/core/SymDenotations.scala b/src/dotty/tools/dotc/core/SymDenotations.scala
index b377817f9..70b928a42 100644
--- a/src/dotty/tools/dotc/core/SymDenotations.scala
+++ b/src/dotty/tools/dotc/core/SymDenotations.scala
@@ -1065,7 +1065,9 @@ object SymDenotations {
 
       def computeBaseTypeOf(tp: Type): Type = {
         Stats.record("computeBaseTypeOf")
-        tp match {
+        if (symbol.isStatic && tp.derivesFrom(symbol))
+          symbol.typeRef
+        else tp match {
           case tp: TypeRef =>
             val subcls = tp.symbol
             if (subcls eq symbol)
@@ -1089,9 +1091,7 @@ object SymDenotations {
       }
 
       /*>|>*/ ctx.debugTraceIndented(s"$tp.baseType($this)") /*<|<*/ {
-        if (symbol.isStatic && tp.derivesFrom(symbol))
-          symbol.typeRef
-        else tp match {
+        tp match {
           case tp: CachedType =>
             if (baseTypeValid != ctx.runId) {
               baseTypeCache = new java.util.HashMap[CachedType, Type]