Skip to content

Commit 27e221b

Browse files
liufengyunliufengyun
authored
Merge pull request #12989 from EnzeXing/refactor-tryPromote
Refactoring tryPromote to fix non-determinism in Issue #12824
2 parents bb5d1d9 + 1f26b8d commit 27e221b

File tree

9 files changed

+59
-51
lines changed

9 files changed

+59
-51
lines changed

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -91,18 +91,14 @@ object Errors {
9191
/** Promote a value under initialization to fully-initialized */
9292
case class UnsafePromotion(msg: String, source: Tree, trace: Seq[Tree], errors: Errors) extends Error {
9393
assert(errors.nonEmpty)
94-
9594
override def issue(using Context): Unit =
9695
report.warning(show, source.srcPos)
9796

9897
def show(using Context): String = {
9998
var index = 0
100-
"Promoting the value to fully-initialized is unsafe. " + msg + "\n" + stacktrace +
101-
"\nThe unsafe promotion may cause the following problem(s):\n" +
102-
(errors.flatMap(_.flatten).map { error =>
103-
index += 1
104-
s"\n$index. " + error.show + error.stacktrace
105-
}.mkString)
99+
"Cannot prove that the value is fully-initialized. " + msg + ".\n" + stacktrace +
100+
"\nThe unsafe promotion may cause the following problem:\n" +
101+
errors.head.show + errors.head.stacktrace
106102
}
107103
}
108104
}

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

Lines changed: 16 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -607,33 +607,24 @@ class Semantic {
607607
if classRef.memberClasses.nonEmpty || !warm.isFullyFilled then
608608
return PromoteError(msg, source, trace.toVector) :: Nil
609609

610-
val fields = classRef.fields
611-
val methods = classRef.membersBasedOnFlags(Flags.Method, Flags.Deferred | Flags.Accessor)
612610
val buffer = new mutable.ArrayBuffer[Error]
613611

614-
fields.exists { denot =>
615-
val f = denot.symbol
616-
if !f.isOneOf(Flags.Deferred | Flags.Private | Flags.Protected) && f.hasSource then
617-
val trace2 = trace.add(f.defTree)
618-
val res = warm.select(f, source)
619-
locally {
620-
given Trace = trace2
621-
buffer ++= res.ensureHot(msg, source).errors
622-
}
623-
buffer.nonEmpty
624-
}
625-
626-
buffer.nonEmpty || methods.exists { denot =>
627-
val m = denot.symbol
628-
if !m.isConstructor && m.hasSource then
629-
val trace2 = trace.add(m.defTree)
630-
locally {
631-
given Trace = trace2
632-
val args = m.info.paramInfoss.flatten.map(_ => ArgInfo(Hot, EmptyTree))
633-
val res = warm.call(m, args, superType = NoType, source = source)
634-
buffer ++= res.ensureHot(msg, source).errors
635-
}
636-
buffer.nonEmpty
612+
warm.klass.baseClasses.exists { klass =>
613+
klass.hasSource && klass.info.decls.exists { member =>
614+
if !member.isType && !member.isConstructor && member.hasSource && !member.is(Flags.Deferred) then
615+
if member.is(Flags.Method) then
616+
val trace2 = trace.add(source)
617+
locally {
618+
given Trace = trace2
619+
val args = member.info.paramInfoss.flatten.map(_ => ArgInfo(Hot, EmptyTree))
620+
val res = warm.call(member, args, superType = NoType, source = member.defTree)
621+
buffer ++= res.ensureHot(msg, source).errors
622+
}
623+
else
624+
val res = warm.select(member, source)
625+
buffer ++= res.ensureHot(msg, source).errors
626+
buffer.nonEmpty
627+
}
637628
}
638629

639630
if buffer.isEmpty then Nil

‎tests/init/neg/closureLeak.check

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
-- Error: tests/init/neg/closureLeak.scala:11:14 -----------------------------------------------------------------------
22
11 | l.foreach(a => a.addX(this)) // error
33
| ^^^^^^^^^^^^^^^^^
4-
| Promoting the value to fully-initialized is unsafe. May only use initialized value as arguments
4+
| Cannot prove that the value is fully-initialized. May only use initialized value as arguments.
55
|
6-
| The unsafe promotion may cause the following problem(s):
7-
|
8-
| 1. Promote the value under initialization to fully-initialized. May only use initialized value as arguments.
6+
| The unsafe promotion may cause the following problem:
7+
| Promote the value under initialization to fully-initialized. May only use initialized value as arguments.

‎tests/init/neg/early-promote5.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
abstract class A {
2-
bar(this)
2+
bar(this) // error
33
def bar(x: A): Unit
44
}
55

‎tests/init/neg/enum-desugared.check

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
-- Error: tests/init/neg/enum-desugared.scala:17:15 --------------------------------------------------------------------
2+
17 | Array(this.LazyErrorId, this.NoExplanationID) // error // error
3+
| ^^^^^^^^^^^^^^^^
4+
| Cannot prove that the value is fully-initialized. May only use initialized value as method arguments.
5+
|
6+
| The unsafe promotion may cause the following problem:
7+
| Calling the external method method name may cause initialization errors. Calling trace:
8+
| -> Array(this.LazyErrorId, this.NoExplanationID) // error // error [ enum-desugared.scala:17 ]
9+
| -> override def productPrefix: String = this.name() [ enum-desugared.scala:29 ]
10+
-- Error: tests/init/neg/enum-desugared.scala:17:33 --------------------------------------------------------------------
11+
17 | Array(this.LazyErrorId, this.NoExplanationID) // error // error
12+
| ^^^^^^^^^^^^^^^^^^^^
13+
| Cannot prove that the value is fully-initialized. May only use initialized value as method arguments.
14+
|
15+
| The unsafe promotion may cause the following problem:
16+
| Calling the external method method ordinal may cause initialization errors. Calling trace:
17+
| -> Array(this.LazyErrorId, this.NoExplanationID) // error // error [ enum-desugared.scala:17 ]
18+
| -> def errorNumber: Int = this.ordinal() - 2 [ enum-desugared.scala:8 ]

‎tests/init/neg/enum.check

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
-- Error: tests/init/neg/enum.scala:4:8 --------------------------------------------------------------------------------
2+
4 | NoExplanationID // error
3+
| ^
4+
| Cannot prove that the value is fully-initialized. May only use initialized value as method arguments.
5+
|
6+
| The unsafe promotion may cause the following problem:
7+
| Calling the external method method name may cause initialization errors. Calling trace:
8+
| -> NoExplanationID // error [ enum.scala:4 ]

‎tests/init/neg/promotion-loop.check

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
-- Error: tests/init/neg/promotion-loop.scala:16:10 --------------------------------------------------------------------
22
16 | println(b) // error
33
| ^
4-
|Promoting the value to fully-initialized is unsafe. May only use initialized value as arguments
4+
| Cannot prove that the value is fully-initialized. May only use initialized value as arguments.
55
|
6-
|The unsafe promotion may cause the following problem(s):
7-
|
8-
|1. Promote the value under initialization to fully-initialized. May only use initialized value as arguments. Calling trace:
9-
| -> val outer = test [ promotion-loop.scala:12 ]
6+
| The unsafe promotion may cause the following problem:
7+
| Promote the value under initialization to fully-initialized. May only use initialized value as arguments.

‎tests/init/neg/secondary-ctor2.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ class A(b: B, x: Int) {
66
}
77
Inner().foo()
88

9-
val f = () => new A(b, 3)
9+
val f = () => new A(b, 3) // error: Cannot promote
1010
f() // ok
1111
}
1212
}

‎tests/init/neg/t3273.check

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
11
-- Error: tests/init/neg/t3273.scala:4:42 ------------------------------------------------------------------------------
22
4 | val num1: LazyList[Int] = 1 #:: num1.map(_ + 1) // error
33
| ^^^^^^^^^^^^^^^
4-
| Promoting the value to fully-initialized is unsafe. May only use initialized value as arguments
4+
| Cannot prove that the value is fully-initialized. May only use initialized value as arguments.
55
|
6-
| The unsafe promotion may cause the following problem(s):
7-
|
8-
| 1. Access non-initialized value num1. Calling trace:
6+
| The unsafe promotion may cause the following problem:
7+
| Access non-initialized value num1. Calling trace:
98
| -> val num1: LazyList[Int] = 1 #:: num1.map(_ + 1) // error [ t3273.scala:4 ]
109
-- Error: tests/init/neg/t3273.scala:5:61 ------------------------------------------------------------------------------
1110
5 | val num2: LazyList[Int] = 1 #:: num2.iterator.map(_ + 1).to(LazyList) // error
1211
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
13-
| Promoting the value to fully-initialized is unsafe. May only use initialized value as arguments
14-
|
15-
| The unsafe promotion may cause the following problem(s):
12+
| Cannot prove that the value is fully-initialized. May only use initialized value as arguments.
1613
|
17-
| 1. Access non-initialized value num2. Calling trace:
14+
| The unsafe promotion may cause the following problem:
15+
| Access non-initialized value num2. Calling trace:
1816
| -> val num2: LazyList[Int] = 1 #:: num2.iterator.map(_ + 1).to(LazyList) // error [ t3273.scala:5 ]

0 commit comments

Comments
 (0)