Updating calling trace.

Author: EnzeXing

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

@@ -50,7 +50,7 @@ object Errors {
     }
 
     /** Flatten UnsafePromotion errors
-      */
+     */
     def flatten: Errors = this match {
       case unsafe: UnsafePromotion => unsafe.errors.flatMap(_.flatten)
       case _ => this :: Nil
@@ -90,13 +90,13 @@ object Errors {
 
   /** Promote a value under initialization to fully-initialized */
   case class UnsafePromotion(msg: String, source: Tree, trace: Seq[Tree], errors: Errors) extends Error {
-
+    assert(errors.nonEmpty)
     override def issue(using Context): Unit =
       report.warning(show, source.srcPos)
 
     def show(using Context): String = {
       var index = 0
-      "Cannot prove that the value is fully-initialized. " + msg + "\n" + stacktrace +
+      "Cannot prove that the value is fully-initialized. " + msg + ".\n" + stacktrace +
         "\nThe unsafe promotion may cause the following problem:\n" +
         errors.head.show + errors.head.stacktrace
     }

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

@@ -612,21 +612,17 @@ class Semantic {
       warm.klass.baseClasses.exists { klass =>
         klass.hasSource && klass.info.decls.exists { member =>
           if !member.isType && !member.isConstructor && member.hasSource  && !member.is(Flags.Deferred) then
-            if member.isOneOf(Flags.Method | Flags.Lazy) then
-              val trace2 = trace.add(member.defTree)
+            if member.is(Flags.Method) then
+              val trace2 = trace.add(source)
               locally {
                 given Trace = trace2
                 val args = member.info.paramInfoss.flatten.map(_ => ArgInfo(Hot, EmptyTree))
-                val res = warm.call(member, args, superType = NoType, source = source)
+                val res = warm.call(member, args, superType = NoType, source = member.defTree)
                 buffer ++= res.ensureHot(msg, source).errors
               }
             else
-              val trace2 = trace.add(member.defTree)
               val res = warm.select(member, source)
-              locally {
-                given Trace = trace2
-                buffer ++= res.ensureHot(msg, source).errors
-              }
+              buffer ++= res.ensureHot(msg, source).errors
           buffer.nonEmpty
         }
       }

tests/init/neg/closureLeak.check

@@ -1,7 +1,7 @@
 -- Error: tests/init/neg/closureLeak.scala:11:14 -----------------------------------------------------------------------
 11 |    l.foreach(a => a.addX(this)) // error
    |              ^^^^^^^^^^^^^^^^^
-   |       Cannot prove that the value is fully-initialized. May only use initialized value as arguments
+   |       Cannot prove that the value is fully-initialized. May only use initialized value as arguments.
    |
    |       The unsafe promotion may cause the following problem:
    |       Promote the value under initialization to fully-initialized. May only use initialized value as arguments.

tests/init/neg/enum-desugared.check

@@ -1,18 +1,18 @@
 -- Error: tests/init/neg/enum-desugared.scala:17:15 --------------------------------------------------------------------
 17 |    Array(this.LazyErrorId, this.NoExplanationID) // error // error
    |          ^^^^^^^^^^^^^^^^
-   |          Cannot prove that the value is fully-initialized. May only use initialized value as method arguments
+   |          Cannot prove that the value is fully-initialized. May only use initialized value as method arguments.
    |
    |          The unsafe promotion may cause the following problem:
    |          Calling the external method method name may cause initialization errors. Calling trace:
-   |           -> override def productPrefix: String = this.name()	[ enum-desugared.scala:29 ]
-   |            -> Array(this.LazyErrorId, this.NoExplanationID) // error // error	[ enum-desugared.scala:17 ]
+   |           -> Array(this.LazyErrorId, this.NoExplanationID) // error // error	[ enum-desugared.scala:17 ]
+   |            -> override def productPrefix: String = this.name()	[ enum-desugared.scala:29 ]
 -- Error: tests/init/neg/enum-desugared.scala:17:33 --------------------------------------------------------------------
 17 |    Array(this.LazyErrorId, this.NoExplanationID) // error // error
    |                            ^^^^^^^^^^^^^^^^^^^^
-   |            Cannot prove that the value is fully-initialized. May only use initialized value as method arguments
+   |           Cannot prove that the value is fully-initialized. May only use initialized value as method arguments.
    |
-   |            The unsafe promotion may cause the following problem:
-   |            Calling the external method method ordinal may cause initialization errors. Calling trace:
+   |           The unsafe promotion may cause the following problem:
+   |           Calling the external method method ordinal may cause initialization errors. Calling trace:
+   |            -> Array(this.LazyErrorId, this.NoExplanationID) // error // error	[ enum-desugared.scala:17 ]
    |             -> def errorNumber: Int = this.ordinal() - 2	[ enum-desugared.scala:8 ]
-   |              -> Array(this.LazyErrorId, this.NoExplanationID) // error // error	[ enum-desugared.scala:17 ]

tests/init/neg/enum.check

@@ -1,7 +1,7 @@
 -- Error: tests/init/neg/enum.scala:4:8 --------------------------------------------------------------------------------
 4 |        NoExplanationID // error
   |        ^
-  |        Cannot prove that the value is fully-initialized. May only use initialized value as method arguments
+  |        Cannot prove that the value is fully-initialized. May only use initialized value as method arguments.
   |
   |        The unsafe promotion may cause the following problem:
   |        Calling the external method method name may cause initialization errors. Calling trace:

tests/init/neg/promotion-loop.check

@@ -1,8 +1,7 @@
 -- Error: tests/init/neg/promotion-loop.scala:16:10 --------------------------------------------------------------------
 16 |  println(b)      // error
    |          ^
-   |Cannot prove that the value is fully-initialized. May only use initialized value as arguments
+   |       Cannot prove that the value is fully-initialized. May only use initialized value as arguments.
    |
-   |The unsafe promotion may cause the following problem:
-   |Promote the value under initialization to fully-initialized. May only use initialized value as arguments. Calling trace:
-   | -> val outer = test	[ promotion-loop.scala:12 ]
+   |       The unsafe promotion may cause the following problem:
+   |       Promote the value under initialization to fully-initialized. May only use initialized value as arguments.

tests/init/neg/t3273.check

@@ -1,15 +1,15 @@
 -- Error: tests/init/neg/t3273.scala:4:42 ------------------------------------------------------------------------------
 4 |  val num1: LazyList[Int] = 1 #:: num1.map(_ + 1)                        // error
   |                                  ^^^^^^^^^^^^^^^
-  |             Cannot prove that the value is fully-initialized. May only use initialized value as arguments
+  |             Cannot prove that the value is fully-initialized. May only use initialized value as arguments.
   |
   |             The unsafe promotion may cause the following problem:
   |             Access non-initialized value num1. Calling trace:
   |              -> val num1: LazyList[Int] = 1 #:: num1.map(_ + 1)                        // error	[ t3273.scala:4 ]
 -- Error: tests/init/neg/t3273.scala:5:61 ------------------------------------------------------------------------------
 5 |  val num2: LazyList[Int] = 1 #:: num2.iterator.map(_ + 1).to(LazyList)  // error
   |                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-  |             Cannot prove that the value is fully-initialized. May only use initialized value as arguments
+  |             Cannot prove that the value is fully-initialized. May only use initialized value as arguments.
   |
   |             The unsafe promotion may cause the following problem:
   |             Access non-initialized value num2. Calling trace: