Refactoring tryPromote

Author: EnzeXing

compiler/src/dotty/tools/dotc/transform/init/Semantic.scala

@@ -574,7 +574,7 @@ class Semantic {
           val res = withEnv(env) { eval(body, thisV, klass) }
           val errors2 = res.value.promote(msg, source)
           if (res.errors.nonEmpty || errors2.nonEmpty)
-            UnsafePromotion(msg, source, trace.toVector, res.errors ++ errors2) :: Nil
+            UnsafePromotion(msg, source, trace.toVector, (res.errors ++ errors2).head) :: Nil
           else
             promoted.add(fun)
             Nil
@@ -607,37 +607,34 @@ class Semantic {
       if classRef.memberClasses.nonEmpty || !warm.isFullyFilled then
         return PromoteError(msg, source, trace.toVector) :: Nil
 
-      val fields  = classRef.fields
-      val methods = classRef.membersBasedOnFlags(Flags.Method, Flags.Deferred | Flags.Accessor)
       val buffer  = new mutable.ArrayBuffer[Error]
 
-      fields.exists { denot =>
-        val f = denot.symbol
-        if !f.isOneOf(Flags.Deferred | Flags.Private | Flags.Protected) && f.hasSource then
-          val trace2 = trace.add(f.defTree)
-          val res = warm.select(f, source)
-          locally {
-            given Trace = trace2
-            buffer ++= res.ensureHot(msg, source).errors
+      warm.klass.baseClasses.exists { klass =>
+        klass.hasSource && klass.info.decls.exists { member =>
+          if member.isOneOf(Flags.Method | Flags.Lazy | Flags.Deferred) then {
+            if !member.isConstructor && member.hasSource then
+              val trace2 = trace.add(member.defTree)
+              locally {
+                given Trace = trace2
+                val args = member.info.paramInfoss.flatten.map(_ => ArgInfo(Hot, EmptyTree))
+                val res = warm.call(member, args, superType = NoType, source = source)
+                buffer ++= res.ensureHot(msg, source).errors
+              }
+          } else if !member.isType then {
+            if !member.isOneOf(Flags.Deferred | Flags.Private | Flags.Protected) && member.hasSource then
+              val trace2 = trace.add(member.defTree)
+              val res = warm.select(member, source)
+              locally {
+                given Trace = trace2
+                buffer ++= res.ensureHot(msg, source).errors
+              }
           }
-        buffer.nonEmpty
-      }
-
-      buffer.nonEmpty || methods.exists { denot =>
-        val m = denot.symbol
-        if !m.isConstructor && m.hasSource then
-          val trace2 = trace.add(m.defTree)
-          locally {
-            given Trace = trace2
-            val args = m.info.paramInfoss.flatten.map(_ => ArgInfo(Hot, EmptyTree))
-            val res = warm.call(m, args, superType = NoType, source = source)
-            buffer ++= res.ensureHot(msg, source).errors
-          }
-        buffer.nonEmpty
+          buffer.nonEmpty
+        }
       }
 
       if buffer.isEmpty then Nil
-      else UnsafePromotion(msg, source, trace.toVector, buffer.toList) :: Nil
+      else UnsafePromotion(msg, source, trace.toVector, buffer(0)) :: Nil
     }
 
   end extension