Fix updating SSA object type for *_ASSIGN_OP #10458
Merged
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
The code fetched the class entry into ce for objects and static properties. However, when the actual update needs to take place (when result_def exists), the class entry in ce was reset to NULL. So the SSA object type update never happened. Fetch the class entry in the result_def>=0 case instead after the reset of ce to NULL.
nielsdos
force-pushed
the
fix-ce-inference
branch
from
bf18fbd
to
b5b44f9
Compare
|
Rebased because the upstream code was updated in the meantime. |
|
Maybe it's wise to tag @dstogov here as well because he recently changed this code. |
|
I didn't recently change anything I'll try to check this now... |
|
I think the fix is right. |
|
Looks fine to me. We don't need ce in the initial calls because binary_op_result_type doesn't use it (though maybe it could to check for operator overloading). This probably doesn't really matter in practice because you usually can't meaningfull apply operators to objects. |
dstogov
added a commit
that referenced
this pull request
Feb 14, 2023
* PHP-8.1: Fix updating SSA object type for *_ASSIGN_OP (#10458)
dstogov
added a commit
that referenced
this pull request
Feb 14, 2023
* PHP-8.2: Fix updating SSA object type for *_ASSIGN_OP (#10458)
Merged
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.
The code fetched the class entry into ce for objects and static properties. However, when the actual update needs to take place (when result_def exists), the class entry in ce was reset to NULL. So the SSA object type update never happened. Fetch the class entry in the result_def>=0 case instead after the reset of ce to NULL.