Avoid shoing trace in debugging logs

Author: liufengyun

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

@@ -79,35 +79,35 @@ object Errors:
   override def toString() = this.getClass.getName.nn
 
   /** Access non-initialized field */
-  case class AccessNonInit(field: Symbol, trace: Seq[Tree]) extends Error:
+  case class AccessNonInit(field: Symbol)(val trace: Seq[Tree]) extends Error:
     def source: Tree = trace.last
     def show(using Context): String =
       "Access non-initialized " + field.show + "." + stacktrace
 
     override def pos(using Context): SourcePosition = field.sourcePos
 
   /** Promote a value under initialization to fully-initialized */
-  case class PromoteError(msg: String, trace: Seq[Tree]) extends Error:
+  case class PromoteError(msg: String)(val trace: Seq[Tree]) extends Error:
     def show(using Context): String = msg + stacktrace
 
-  case class AccessCold(field: Symbol, trace: Seq[Tree]) extends Error:
+  case class AccessCold(field: Symbol)(val trace: Seq[Tree]) extends Error:
     def show(using Context): String =
       "Access field " + field.show +  " on a cold object." + stacktrace
 
-  case class CallCold(meth: Symbol, trace: Seq[Tree]) extends Error:
+  case class CallCold(meth: Symbol)(val trace: Seq[Tree]) extends Error:
     def show(using Context): String =
       "Call method " + meth.show + " on a cold object." + stacktrace
 
-  case class CallUnknown(meth: Symbol, trace: Seq[Tree]) extends Error:
+  case class CallUnknown(meth: Symbol)(val trace: Seq[Tree]) extends Error:
     def show(using Context): String =
       val prefix = if meth.is(Flags.Method) then "Calling the external method " else "Accessing the external field"
       prefix + meth.show + " may cause initialization errors." + stacktrace
 
   /** Promote a value under initialization to fully-initialized */
-  case class UnsafePromotion(msg: String, trace: Seq[Tree], error: Error) extends Error:
+  case class UnsafePromotion(msg: String, error: Error)(val trace: Seq[Tree]) extends Error:
     def show(using Context): String =
       msg + stacktrace + "\n" +
-        "Promoting the value to hot failed due to the following problem:\n" + {
+        "Promoting the value to hot (transitively initialized) failed due to the following problem:\n" + {
           val ctx2 = ctx.withProperty(IsFromPromotion, Some(true))
           error.show(using ctx2)
         }
@@ -116,7 +116,7 @@ object Errors:
    *
    *  Invariant: argsIndices.nonEmpty
    */
-  case class UnsafeLeaking(trace: Seq[Tree], error: Error, nonHotOuterClass: Symbol, argsIndices: List[Int]) extends Error:
+  case class UnsafeLeaking(error: Error, nonHotOuterClass: Symbol, argsIndices: List[Int])(val trace: Seq[Tree]) extends Error:
     def show(using Context): String =
       "Problematic object instantiation: " + argumentInfo() + stacktrace + "\n" +
         "It leads to the following error during object initialization:\n" +
@@ -141,5 +141,5 @@ object Errors:
           acc + text2
         }
       val verb = if multiple then " are " else " is "
-      val adjective = "not hot."
+      val adjective = "not hot (transitively initialized)."
       subject + verb + adjective

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

@@ -12,7 +12,7 @@ import NameKinds.SuperAccessorName
 
 import ast.tpd.*
 import config.Printers.init as printer
-import reporting.trace as log
+import reporting.trace.force as log
 
 import Errors.*
 
@@ -664,7 +664,7 @@ object Semantic:
           Hot
 
         case Cold =>
-          val error = AccessCold(field, trace.toVector)
+          val error = AccessCold(field)(trace.toVector)
           reporter.report(error)
           Hot
 
@@ -689,11 +689,11 @@ object Semantic:
                 val rhs = target.defTree.asInstanceOf[ValOrDefDef].rhs
                 eval(rhs, ref, target.owner.asClass, cacheResult = true)
               else
-                val error = CallUnknown(field, trace.toVector)
+                val error = CallUnknown(field)(trace.toVector)
                 reporter.report(error)
                 Hot
             else
-              val error = AccessNonInit(target, trace.toVector)
+              val error = AccessNonInit(target)(trace.toVector)
               reporter.report(error)
               Hot
           else
@@ -779,7 +779,7 @@ object Semantic:
 
         case Cold =>
           promoteArgs()
-          val error = CallCold(meth, trace.toVector)
+          val error = CallCold(meth)(trace.toVector)
           reporter.report(error)
           Hot
 
@@ -820,7 +820,7 @@ object Semantic:
               // try promoting the receiver as last resort
               val hasErrors = Reporter.hasErrors { ref.promote("try promote value to hot") }
               if hasErrors then
-                val error = CallUnknown(target, trace.toVector)
+                val error = CallUnknown(target)(trace.toVector)
                 reporter.report(error)
               Hot
           else if target.exists then
@@ -899,7 +899,7 @@ object Semantic:
             Hot
           else
             // no source code available
-            val error = CallUnknown(ctor, trace.toVector)
+            val error = CallUnknown(ctor)(trace.toVector)
             reporter.report(error)
             Hot
       }
@@ -922,7 +922,7 @@ object Semantic:
             yield
               i + 1
 
-          val error = UnsafeLeaking(trace.toVector, errors.head, nonHotOuterClass, indices)
+          val error = UnsafeLeaking(errors.head, nonHotOuterClass, indices)(trace.toVector)
           reporter.report(error)
           Hot
         else
@@ -947,7 +947,7 @@ object Semantic:
             tryLeak(warm, NoSymbol, args2)
 
         case Cold =>
-          val error = CallCold(ctor, trace.toVector)
+          val error = CallCold(ctor)(trace.toVector)
           reporter.report(error)
           Hot
 
@@ -1078,15 +1078,15 @@ object Semantic:
         case Hot   =>
 
         case Cold  =>
-          reporter.report(PromoteError(msg, trace.toVector))
+          reporter.report(PromoteError(msg)(trace.toVector))
 
         case thisRef: ThisRef =>
           val emptyFields = thisRef.nonInitFields()
           if emptyFields.isEmpty then
             promoted.promoteCurrent(thisRef)
           else
             val fields = "Non initialized field(s): " + emptyFields.map(_.show).mkString(", ") + "."
-            reporter.report(PromoteError(msg + "\n" + fields, trace.toVector))
+            reporter.report(PromoteError(msg + "\n" + fields)(trace.toVector))
 
         case warm: Warm =>
           if !promoted.contains(warm) then
@@ -1106,7 +1106,7 @@ object Semantic:
               res.promote("The function return value is not hot. Found = " + res.show + ".")
             }
             if errors.nonEmpty then
-              reporter.report(UnsafePromotion(msg, trace.toVector, errors.head))
+              reporter.report(UnsafePromotion(msg, errors.head)(trace.toVector))
             else
               promoted.add(fun)
 
@@ -1156,7 +1156,7 @@ object Semantic:
         if !isHotSegment then
           for member <- klass.info.decls do
             if member.isClass then
-              val error = PromoteError("Promotion cancelled as the value contains inner " + member.show + ".", Vector.empty)
+              val error = PromoteError("Promotion cancelled as the value contains inner " + member.show + ".")(Vector.empty)
               reporter.report(error)
             else if !member.isType && !member.isConstructor  && !member.is(Flags.Deferred) then
               given Trace = Trace.empty
@@ -1189,7 +1189,7 @@ object Semantic:
       }
 
       if errors.isEmpty then Nil
-      else UnsafePromotion(msg, trace.toVector, errors.head) :: Nil
+      else UnsafePromotion(msg, errors.head)(trace.toVector) :: Nil
     }
 
   end extension
@@ -1516,6 +1516,8 @@ object Semantic:
         val cls = tmref.widenSingleton.classSymbol.asClass
         if cls.isStaticOwner && !cls.isContainedIn(promoted.entryClass) then
           Hot
+        else if cls.isStaticOwner && klass.isContainedIn(cls) then
+          resolveThis(cls, thisV, klass)
         else
           cases(tmref.prefix, thisV, klass).select(tmref.symbol, receiver = tmref.prefix)