Fix setRawValueWithoutLazyInitialization() / skipLazyInitialization() on initialized proxy #16344
Conversation
This file contains 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
… on initialized proxy
iluuu1994
reviewed
Nov 19, 2024
|
|
||
| if (!(Z_PROP_FLAG_P(dst) & IS_PROP_LAZY)) { | ||
| if (!prop_was_lazy) { |
There was a problem hiding this comment.
prop_was_lazy is used below, and always true. Is this correct? In that case, it should be dropped from the condition.
|
@iluuu1994 just to be sure, you meant 8.4.0, not 8.4? |
|
@arnaud-lb Yes. Sorry for the imprecise wording. |
|
No worries! Thank you for the review |
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.
skipLazyInitialization()removes the lazy flag of a property and initializes it to its default value. If the property was already initialized, it has no effect.However, initialized proxies have all their properties marked as lazy, but
skipLazyInitialization()should not initialize them.Similarly,
setRawValueWithoutLazyInitialization()should not set the value on initialized proxies.Here I make sure to produce the effect on the real instance rather than the proxy.
NB: It's possible that the real instance is also a proxy. In this case I fetch its real instance again, and the affected object is the deepest instance.