Skip to content

zend_compile.c: remove unneeded const_expr_context wrapper for boolean #15925

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

zend_compile.c: remove unneeded const_expr_context wrapper for boolean #15925

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 3 additions & 11 deletions Zend/zend_compile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11178,14 +11178,9 @@ static void zend_compile_const_expr_args(zend_ast **ast_ptr)
}
}

typedef struct {
/* Whether the value of this expression may differ on each evaluation. */
bool allow_dynamic;
} const_expr_context;

static void zend_compile_const_expr(zend_ast **ast_ptr, void *context) /* {{{ */
{
const_expr_context *ctx = (const_expr_context *) context;
bool allow_dynamic = *(bool *) context;
zend_ast *ast = *ast_ptr;
if (ast == NULL || ast->kind == ZEND_AST_ZVAL) {
return;
Expand All @@ -11209,7 +11204,7 @@ static void zend_compile_const_expr(zend_ast **ast_ptr, void *context) /* {{{ */
zend_compile_const_expr_magic_const(ast_ptr);
break;
case ZEND_AST_NEW:
if (!ctx->allow_dynamic) {
if (!allow_dynamic) {
zend_error_noreturn(E_COMPILE_ERROR,
"New expressions are not supported in this context");
}
Expand All @@ -11226,11 +11221,8 @@ static void zend_compile_const_expr(zend_ast **ast_ptr, void *context) /* {{{ */

void zend_const_expr_to_zval(zval *result, zend_ast **ast_ptr, bool allow_dynamic) /* {{{ */
{
const_expr_context context;
context.allow_dynamic = allow_dynamic;

zend_eval_const_expr(ast_ptr);
zend_compile_const_expr(ast_ptr, &context);
zend_compile_const_expr(ast_ptr, &allow_dynamic);
if ((*ast_ptr)->kind != ZEND_AST_ZVAL) {
/* Replace with compiled AST zval representation. */
zval ast_zv;
Expand Down
Loading