Update check file

liufengyun · liufengyun · commit c8b9bd4b0dc3 · 2022-07-13T02:37:49.000+02:00
diff --git a/compiler/src/dotty/tools/dotc/transform/init/Errors.scala b/compiler/src/dotty/tools/dotc/transform/init/Errors.scala
@@ -82,11 +82,11 @@ object Errors:
 
   case class AccessCold(field: Symbol, trace: Seq[Tree]) extends Error:
     def show(using Context): String =
-      "Access field " + field.show +  " on a value with a cold object." + stacktrace()
+      "Access field " + field.show +  " on a cold object." + stacktrace()
 
   case class CallCold(meth: Symbol, trace: Seq[Tree]) extends Error:
     def show(using Context): String =
-      "Call method " + meth.show + " on a value with an cold object." + stacktrace()
+      "Call method " + meth.show + " on a cold object." + stacktrace()
 
   case class CallUnknown(meth: Symbol, trace: Seq[Tree]) extends Error:
     def show(using Context): String =
diff --git a/compiler/src/dotty/tools/dotc/transform/init/Semantic.scala b/compiler/src/dotty/tools/dotc/transform/init/Semantic.scala
@@ -1231,7 +1231,7 @@ object Semantic:
   /** Utility definition used for better error-reporting of argument errors */
   case class ArgInfo(value: Value, trace: Trace):
     def promote: Contextual[Unit] = withTrace(trace) {
-      value.promote("Cannot prove the argument is fully initialized. Only fully initialized values are safe to leak. \nFound = " + value.show + ". ")
+      value.promote("Cannot prove the argument is fully initialized. Only fully initialized values are safe to leak.\nFound = " + value.show + ". ")
     }
 
   /** Evaluate an expression with the given value for `this` in a given class `klass`
diff --git a/tests/init/neg/closureLeak.check b/tests/init/neg/closureLeak.check
@@ -1,14 +1,16 @@
 -- Error: tests/init/neg/closureLeak.scala:11:14 -----------------------------------------------------------------------
 11 |    l.foreach(a => a.addX(this)) // error
    |              ^^^^^^^^^^^^^^^^^
-   |  Cannot prove the argument is fully initialized. Only fully initialized values are safe to leak. Calling trace:
-   |  -> class Outer {	[ closureLeak.scala:1 ]
-   |     ^
-   |  -> l.foreach(a => a.addX(this)) // error	[ closureLeak.scala:11 ]
-   |               ^^^^^^^^^^^^^^^^^
+   |              Cannot prove the argument is fully initialized. Only fully initialized values are safe to leak.
+   |              Found = Fun { this = ThisRef[class Outer], owner = class Outer }.  Calling trace:
+   |              -> class Outer {	[ closureLeak.scala:1 ]
+   |                 ^
+   |              -> l.foreach(a => a.addX(this)) // error	[ closureLeak.scala:11 ]
+   |                           ^^^^^^^^^^^^^^^^^
    |
-   |  Promoting the value to fully initialized failed due to the following problem:
-   |  Cannot prove the argument is fully initialized. Only fully initialized values are safe to leak.
-   |  Non initialized field(s): value p. Calling trace:
-   |  -> l.foreach(a => a.addX(this)) // error	[ closureLeak.scala:11 ]
-   |                           ^^^^
+   |              Promoting the value to fully initialized failed due to the following problem:
+   |              Cannot prove the argument is fully initialized. Only fully initialized values are safe to leak.
+   |              Found = ThisRef[class Outer]. 
+   |              Non initialized field(s): value p. Calling trace:
+   |              -> l.foreach(a => a.addX(this)) // error	[ closureLeak.scala:11 ]
+   |                                       ^^^^
diff --git a/tests/init/neg/cycle-structure.check b/tests/init/neg/cycle-structure.check
@@ -8,7 +8,7 @@
   |                       ^^^^^^^
   |
   |            It leads to the following error during object initialization:
-  |            Access field on a value with an unknown initialization status. Calling trace:
+  |            Access field value x on a cold object. Calling trace:
   |            -> case class B(a: A) {	[ cycle-structure.scala:7 ]
   |               ^
   |            -> val x1 = a.x	[ cycle-structure.scala:8 ]
@@ -23,7 +23,7 @@
   |                       ^^^^^^^
   |
   |            It leads to the following error during object initialization:
-  |            Access field on a value with an unknown initialization status. Calling trace:
+  |            Access field value x on a cold object. Calling trace:
   |            -> case class A(b: B) {	[ cycle-structure.scala:1 ]
   |               ^
   |            -> val x1 = b.x	[ cycle-structure.scala:2 ]
diff --git a/tests/init/neg/default-this.check b/tests/init/neg/default-this.check
@@ -2,6 +2,7 @@
 9 |        compare() // error
   |        ^^^^^^^
   |        Cannot prove the argument is fully initialized. Only fully initialized values are safe to leak.
+  |        Found = ThisRef[class B]. 
   |        Non initialized field(s): value result. Calling trace:
   |        -> class B extends A {	[ default-this.scala:6 ]
   |           ^
diff --git a/tests/init/neg/i15363.check b/tests/init/neg/i15363.check
@@ -8,7 +8,7 @@
   |                     ^^^^^^^^^^^
   |
   |          It leads to the following error during object initialization:
-  |          Access field on a value with an unknown initialization status. Calling trace:
+  |          Access field value m on a cold object. Calling trace:
   |          -> class B(a: A):	[ i15363.scala:7 ]
   |             ^
   |          -> val x = a.m	[ i15363.scala:8 ]
diff --git a/tests/init/neg/i15459.check b/tests/init/neg/i15459.check
@@ -2,6 +2,7 @@
 3 |  println(this)  // error
   |          ^^^^
   |          Cannot prove the argument is fully initialized. Only fully initialized values are safe to leak.
+  |          Found = ThisRef[class Sub]. 
   |          Non initialized field(s): value b. Calling trace:
   |          -> class Sub extends Sup:	[ i15459.scala:5 ]
   |             ^
diff --git a/tests/init/neg/inherit-non-hot.check b/tests/init/neg/inherit-non-hot.check
@@ -12,4 +12,4 @@
   |                     ^^^^^^^^^^^^^^^
   |
   |Promoting the value to fully initialized failed due to the following problem:
-  |Cannot prove that the field val a is fully initialized.
+  |Cannot prove that the field value a is fully initialized. Found = Cold. 
diff --git a/tests/init/neg/inlined-method.check b/tests/init/neg/inlined-method.check
@@ -2,6 +2,7 @@
 8 |    scala.runtime.Scala3RunTime.assertFailed(message) // error
   |                                             ^^^^^^^
   |                   Cannot prove the argument is fully initialized. Only fully initialized values are safe to leak.
+  |                   Found = ThisRef[class InlineError]. 
   |                   Non initialized field(s): value v. Calling trace:
   |                   -> class InlineError {	[ inlined-method.scala:1 ]
   |                      ^
diff --git a/tests/init/neg/inner-first.check b/tests/init/neg/inner-first.check
@@ -2,6 +2,7 @@
 3 |    println(this)           // error
   |            ^^^^
   |            Cannot prove the argument is fully initialized. Only fully initialized values are safe to leak.
+  |            Found = ThisRef[class B]. 
   |            Non initialized field(s): value n. Calling trace:
   |            -> class B:	[ inner-first.scala:2 ]
   |               ^
diff --git a/tests/init/neg/leak-warm.check b/tests/init/neg/leak-warm.check
@@ -1,7 +1,7 @@
 -- Error: tests/init/neg/leak-warm.scala:19:18 -------------------------------------------------------------------------
 19 |    val l2 = l.map(_.m()) // error
    |             ^^^^^^^^^^^^
-   |             Call method on a value with an unknown initialization. Calling trace:
+   |             Call method method map on a cold object. Calling trace:
    |             -> object leakWarm {	[ leak-warm.scala:1 ]
    |                ^
    |             -> val l2 = l.map(_.m()) // error	[ leak-warm.scala:19 ]
diff --git a/tests/init/neg/promotion-loop.check b/tests/init/neg/promotion-loop.check
@@ -1,12 +1,13 @@
 -- Error: tests/init/neg/promotion-loop.scala:16:10 --------------------------------------------------------------------
 16 |  println(b)      // error
    |          ^
-   |  Cannot prove the argument is fully initialized. Only fully initialized values are safe to leak. Calling trace:
-   |  -> class Test { test =>	[ promotion-loop.scala:1 ]
-   |     ^
-   |  -> println(b)      // error	[ promotion-loop.scala:16 ]
+   |          Cannot prove the argument is fully initialized. Only fully initialized values are safe to leak.
+   |          Found = Warm[class B] { outer = ThisRef[class Test] }.  Calling trace:
+   |          -> class Test { test =>	[ promotion-loop.scala:1 ]
    |             ^
+   |          -> println(b)      // error	[ promotion-loop.scala:16 ]
+   |                     ^
    |
-   |  Promoting the value to fully initialized failed due to the following problem:
-   |  Cannot prove that the field val outer is fully initialized.
-   |  Non initialized field(s): value n.
+   |          Promoting the value to fully initialized failed due to the following problem:
+   |          Cannot prove that the field value outer is fully initialized. Found = ThisRef[class Test]. 
+   |          Non initialized field(s): value n.
diff --git a/tests/init/neg/secondary-ctor4.check b/tests/init/neg/secondary-ctor4.check
@@ -8,7 +8,7 @@
    |                         ^^^^^^^^^^^
    |
    |              It leads to the following error during object initialization:
-   |              Access field on a value with an unknown initialization status. Calling trace:
+   |              Access field value n on a cold object. Calling trace:
    |              -> def this(b: B, x: Int) = this(b)	[ secondary-ctor4.scala:49 ]
    |                                          ^^^^^^^
    |              -> class C(b: B) extends A(b) with T {	[ secondary-ctor4.scala:48 ]
@@ -33,7 +33,7 @@
    |       ^^^^^^^^^^^^^^^^^^^
    |
    |    It leads to the following error during object initialization:
-   |    Access field on a value with an unknown initialization status. Calling trace:
+   |    Access field value n on a cold object. Calling trace:
    |    -> def this(b: B) = {	[ secondary-ctor4.scala:17 ]
    |       ^
    |    -> Inner().foo()	[ secondary-ctor4.scala:26 ]
diff --git a/tests/init/neg/t3273.check b/tests/init/neg/t3273.check
@@ -1,26 +1,28 @@
 -- Error: tests/init/neg/t3273.scala:4:42 ------------------------------------------------------------------------------
 4 |  val num1: LazyList[Int] = 1 #:: num1.map(_ + 1)                        // error
   |                                  ^^^^^^^^^^^^^^^
-  |    Cannot prove the argument is fully initialized. Only fully initialized values are safe to leak. Calling trace:
-  |    -> object Test {	[ t3273.scala:3 ]
-  |       ^
-  |    -> val num1: LazyList[Int] = 1 #:: num1.map(_ + 1)                        // error	[ t3273.scala:4 ]
-  |                                       ^^^^^^^^^^^^^^^
+  |              Cannot prove the argument is fully initialized. Only fully initialized values are safe to leak.
+  |              Found = Fun { this = ThisRef[object Test], owner = object Test }.  Calling trace:
+  |              -> object Test {	[ t3273.scala:3 ]
+  |                 ^
+  |              -> val num1: LazyList[Int] = 1 #:: num1.map(_ + 1)                        // error	[ t3273.scala:4 ]
+  |                                                 ^^^^^^^^^^^^^^^
   |
-  |    Promoting the value to fully initialized failed due to the following problem:
-  |    Access non-initialized value num1. Calling trace:
-  |    -> val num1: LazyList[Int] = 1 #:: num1.map(_ + 1)                        // error	[ t3273.scala:4 ]
-  |                                       ^^^^
+  |              Promoting the value to fully initialized failed due to 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 the argument is fully initialized. Only fully initialized values are safe to leak. Calling trace:
-  |    -> object Test {	[ t3273.scala:3 ]
-  |       ^
-  |    -> val num2: LazyList[Int] = 1 #:: num2.iterator.map(_ + 1).to(LazyList)  // error	[ t3273.scala:5 ]
-  |                                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  |              Cannot prove the argument is fully initialized. Only fully initialized values are safe to leak.
+  |              Found = Fun { this = ThisRef[object Test], owner = object Test }.  Calling trace:
+  |              -> object Test {	[ t3273.scala:3 ]
+  |                 ^
+  |              -> val num2: LazyList[Int] = 1 #:: num2.iterator.map(_ + 1).to(LazyList)  // error	[ t3273.scala:5 ]
+  |                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   |
-  |    Promoting the value to fully initialized failed due to the following problem:
-  |    Access non-initialized value num2. Calling trace:
-  |    -> val num2: LazyList[Int] = 1 #:: num2.iterator.map(_ + 1).to(LazyList)  // error	[ t3273.scala:5 ]
-  |                                       ^^^^
+  |              Promoting the value to fully initialized failed due to the following problem:
+  |              Access non-initialized value num2. Calling trace:
+  |              -> val num2: LazyList[Int] = 1 #:: num2.iterator.map(_ + 1).to(LazyList)  // error	[ t3273.scala:5 ]
+  |                                                 ^^^^
diff --git a/tests/init/neg/unsound1.check b/tests/init/neg/unsound1.check
@@ -1,7 +1,7 @@
 -- Error: tests/init/neg/unsound1.scala:2:35 ---------------------------------------------------------------------------
 2 |  if (m > 0) println(foo(m - 1).a2.n) // error
   |                     ^^^^^^^^^^^^^^^
-  |                     Access field on a value with an unknown initialization status. Calling trace:
+  |                     Access field variable n on a cold object. Calling trace:
   |                     -> class A(m: Int) {	[ unsound1.scala:1 ]
   |                        ^
   |                     -> if (m > 0) println(foo(m - 1).a2.n) // error	[ unsound1.scala:2 ]
diff --git a/tests/init/neg/unsound2.check b/tests/init/neg/unsound2.check
@@ -1,7 +1,7 @@
 -- Error: tests/init/neg/unsound2.scala:5:26 ---------------------------------------------------------------------------
 5 |        def getN: Int = a.n // error
   |                        ^^^
-  |   Access field on a value with an unknown initialization status. Calling trace:
+  |   Access field value n on a cold object. Calling trace:
   |   -> case class A(x: Int) {	[ unsound2.scala:1 ]
   |      ^
   |   -> println(foo(x).getB)	[ unsound2.scala:8 ]
diff --git a/tests/init/neg/unsound3.check b/tests/init/neg/unsound3.check
@@ -1,7 +1,7 @@
 -- Error: tests/init/neg/unsound3.scala:10:38 --------------------------------------------------------------------------
 10 |        if (x < 12) then foo().getC().b else newB // error
    |                         ^^^^^^^^^^^^^^
-   |                         Access field on a value with an unknown initialization status. Calling trace:
+   |                         Access field value b on a cold object. Calling trace:
    |                         -> class C {	[ unsound3.scala:5 ]
    |                            ^
    |                         -> val b = foo()	[ unsound3.scala:12 ]

Original file line number	Diff line number	Diff line change
`@@ -1231,7 +1231,7 @@ object Semantic:`
`1231`	`1231`	`/** Utility definition used for better error-reporting of argument errors */`
`1232`	`1232`	`case class ArgInfo(value: Value, trace: Trace):`
`1233`	`1233`	`def promote: Contextual[Unit] = withTrace(trace) {`
`1234`		`- value.promote("Cannot prove the argument is fully initialized. Only fully initialized values are safe to leak. \nFound = " + value.show + ". ")`
	`1234`	`+ value.promote("Cannot prove the argument is fully initialized. Only fully initialized values are safe to leak.\nFound = " + value.show + ". ")`
`1235`	`1235`	`}`
`1236`	`1236`
`1237`	`1237`	/** Evaluate an expression with the given value for `this` in a given class `klass`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`\| ^^^^^^^^^^^`
`9`	`9`	`\|`
`10`	`10`	`\| It leads to the following error during object initialization:`
`11`		`- \| Access field on a value with an unknown initialization status. Calling trace:`
	`11`	`+ \| Access field value m on a cold object. Calling trace:`
`12`	`12`	`\| -> class B(a: A): [ i15363.scala:7 ]`
`13`	`13`	`\| ^`
`14`	`14`	`\| -> val x = a.m [ i15363.scala:8 ]`
Original file line number	Diff line number	Diff line change
`@@ -12,4 +12,4 @@`
`12`	`12`	`\| ^^^^^^^^^^^^^^^`
`13`	`13`	`\|`
`14`	`14`	`\|Promoting the value to fully initialized failed due to the following problem:`
`15`		`- \|Cannot prove that the field val a is fully initialized.`
	`15`	`+ \|Cannot prove that the field value a is fully initialized. Found = Cold.`