Unify annotation handling for thread-safe & -unsafe lazy vals #24907
+76
−23
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
SolalPirelli
commented
Jan 6, 2026
| */ | ||
| private def mkContainerTree(x: ValOrDefDef, isVolatile: Boolean)(using Context): (Names.TermName, ValDef) = | ||
| val claz = x.symbol.owner.asClass | ||
| val tpe = if isVolatile then defn.ObjectType else x.tpe.widen.resultType.widen |
Contributor
Author
There was a problem hiding this comment.
The original code used:
- this different type for the container symbol
defaultValue(tpe)as the original value for the unsafe version andnullLiteralfor the safe version
Using one of these two options for tpe regardless of context causes crashes in the newly added test, in both cases because we can't prove Long <: Object, but preserving the original behavior as this line does works fine.
I don't like it though, I think I'm missing something.
SolalPirelli
force-pushed
the
solal/transient-threadUnsafe
branch
from
077105a to
20bd1d5
Compare
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.
Fixes #23487