Draft
Conversation
Change zend_function_entry.flags to a uint64_t to that both ZEND_ACC_ and ZEND_ACC2_ flags can be represented. Introduce ZEND_FENTRY_FLAGS(flags, flags2) to pass ZEND_ACC2_ flags to ZEND_RAW_FENTRY(), ZEND_FENTRY(). Source-level backwards compatibility is maintained, as passing raw ZEND_ACC_ flags to ZEND_RAW_FENTRY(), ZEND_FENTRY() still works.
Functions that use zend_forbid_dynamic_call() must be flagged with ZEND_ACC2_FORBID_DYN_CALLS. In stubs, this is done by using @forbid-dynamic-calls. To ensure consistency, we assert that the flag exists in zend_forbid_dynamic_call(), and we assert that flagged functions thrown after a dynamic call.
arnaud-lb
force-pushed
the
forbid-dyn-call
branch
from
8b437c7 to
ab1b483
Compare
TimWolla
reviewed
Apr 21, 2026
Member
TimWolla
left a comment
TimWolla
left a comment
There was a problem hiding this comment.
Should Closure::getCurrent() be added to that list or does it work?
TimWolla
reviewed
Apr 21, 2026
Comment on lines
+4163
to
+4165
| if (ZEND_CALL_INFO(call) & ZEND_CALL_DYNAMIC) { | ||
| ZEND_ASSERT(!(call->func->common.fn_flags2 & ZEND_ACC2_FORBID_DYN_CALLS)); | ||
| } |
Member
There was a problem hiding this comment.
An if() just for a ZEND_ASSERT feels wrong.
Suggested change
| if (ZEND_CALL_INFO(call) & ZEND_CALL_DYNAMIC) { | |
| ZEND_ASSERT(!(call->func->common.fn_flags2 & ZEND_ACC2_FORBID_DYN_CALLS)); | |
| } | |
| ZEND_ASSERT(!(ZEND_CALL_INFO(call) & ZEND_CALL_DYNAMIC) || !(call->func->common.fn_flags2 & ZEND_ACC2_FORBID_DYN_CALLS)); |
Comment on lines
+752
to
+754
| #if ZEND_DEBUG | ||
| ZEND_ASSERT(!(closure->func.common.fn_flags2 & ZEND_ACC2_FORBID_DYN_CALLS) || EG(exception)); | ||
| #endif |
Member
There was a problem hiding this comment.
Why is this assert wrapped in a ZEND_DEBUG check?
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Flag functions that forbid dynamic calls with
ZEND_ACC2_FORBID_DYN_CALLS, so that we can recognize them without making a hard-coded list.This will be used in the PFA implementation.
See individual commits for details.
UPGRADING.INTERNALS: