Don't substitute self/parent for anonymous class #19537
Open
+6
−3
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
iluuu1994
changed the title
nielsdos
reviewed
Aug 23, 2025
| @@ -7089,18 +7089,21 @@ static zend_type zend_compile_single_typename(zend_ast *ast) | |||
| zend_assert_valid_class_name(class_name, "a type name"); | |||
| } else { | |||
| ZEND_ASSERT(fetch_type == ZEND_FETCH_CLASS_SELF || fetch_type == ZEND_FETCH_CLASS_PARENT); | |||
| bool substitute_self_parent = zend_is_scope_known() | |||
| && CG(active_class_entry) | |||
There was a problem hiding this comment.
Isn't this always true? (at this point that is)
There was a problem hiding this comment.
Not yet. It was either this condition, or duplicating the check in the self and parent branch.
There was a problem hiding this comment.
To clarify, no scope is considered a known scope.
There was a problem hiding this comment.
Huh, actually given the assert that doesn't make sense. I think it would have to be repeated either way. I thought I tried removing it but got a NULL pointer. I'll try again before merging.
Girgias
reviewed
Aug 23, 2025
edorian
approved these changes
Aug 24, 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.
Fixes GH-18373