Fix errors in the global initialization checker when compiling bootstrapped dotty #23429
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
liufengyun
approved these changes
Jun 27, 2025
| @@ -151,12 +151,12 @@ class Objects(using Context @constructorOnly): | |||
| def hasVar(sym: Symbol)(using Heap.MutableData): Boolean = Heap.containsVal(this, sym) | |||
|
|
|||
| def initVal(field: Symbol, value: Value)(using Context, Heap.MutableData) = log("Initialize " + field.show + " = " + value + " for " + this, printer) { | |||
| assert(!field.is(Flags.Mutable), "Field is mutable: " + field.show) | |||
| assert(field.is(Flags.Param) || !field.is(Flags.Mutable), "Field is mutable: " + field.show) | |||
| Heap.writeJoinVal(this, field, value) | |||
| } | |||
There was a problem hiding this comment.
It is not obvious why Flags.Param is an exception. A comment will be helpful.
| targetType.asInstanceOf[ExprType].resType | ||
| else | ||
| targetType.asInstanceOf[MethodType].resType | ||
| val returnType = targetType.finalResultType |
| @@ -1326,7 +1318,8 @@ class Objects(using Context @constructorOnly): | |||
| report.warning("[Internal error] top-level class should have `Package` as outer, class = " + klass.show + ", outer = " + outer.show + ", " + Trace.show, Trace.position) | |||
| (Bottom, Env.NoEnv) | |||
| else | |||
| val outerCls = klass.owner.enclosingClass.asClass | |||
| // enclosingClass is specially handled for java static terms, so use `lexicallyEnclosingClass` here | |||
| val outerCls = klass.owner.lexicallyEnclosingClass.asClass | |||
There was a problem hiding this comment.
Nice catch and comment 👍
olhotak
approved these changes
Jun 27, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
With this fix, the global initialization checker can be run when compiling bootstrapped dotty and reported warnings in the dotty source code
[test_scala2_library_tasty]