Skip to content

Commit 51a9945

Browse files
committed
Merge branch 'PHP-8.2'
* PHP-8.2: Remove unnecessary ast eval bailout
2 parents 3daa8a9 + 1d6b32f commit 51a9945

File tree

3 files changed

+4
-12
lines changed

3 files changed

+4
-12
lines changed

Zend/zend_ast.c

+1-10
Original file line numberDiff line numberDiff line change
@@ -801,8 +801,6 @@ static zend_result ZEND_FASTCALL zend_ast_evaluate_ex(zval *result, zend_ast *as
801801
{
802802
zend_string *class_name = zend_ast_get_str(ast->child[0]);
803803
zend_string *const_name = zend_ast_get_str(ast->child[1]);
804-
zval *zv;
805-
bool bailout = 0;
806804

807805
zend_string *previous_filename;
808806
zend_long previous_lineno;
@@ -812,18 +810,11 @@ static zend_result ZEND_FASTCALL zend_ast_evaluate_ex(zval *result, zend_ast *as
812810
EG(filename_override) = scope->info.user.filename;
813811
EG(lineno_override) = zend_ast_get_lineno(ast);
814812
}
815-
zend_try {
816-
zv = zend_get_class_constant_ex(class_name, const_name, scope, ast->attr);
817-
} zend_catch {
818-
bailout = 1;
819-
} zend_end_try();
813+
zval *zv = zend_get_class_constant_ex(class_name, const_name, scope, ast->attr);
820814
if (scope) {
821815
EG(filename_override) = previous_filename;
822816
EG(lineno_override) = previous_lineno;
823817
}
824-
if (bailout) {
825-
zend_bailout();
826-
}
827818

828819
if (UNEXPECTED(zv == NULL)) {
829820
ZVAL_UNDEF(result);

Zend/zend_execute_API.c

-2
Original file line numberDiff line numberDiff line change
@@ -471,8 +471,6 @@ void shutdown_executor(void) /* {{{ */
471471
if (EG(ht_iterators) != EG(ht_iterators_slots)) {
472472
efree(EG(ht_iterators));
473473
}
474-
475-
ZEND_ASSERT(EG(filename_override) == NULL);
476474
}
477475

478476
#if ZEND_DEBUG

main/main.c

+3
Original file line numberDiff line numberDiff line change
@@ -1589,6 +1589,9 @@ static void php_free_request_globals(void)
15891589
efree(PG(php_sys_temp_dir));
15901590
PG(php_sys_temp_dir) = NULL;
15911591
}
1592+
1593+
EG(filename_override) = NULL;
1594+
EG(lineno_override) = -1;
15921595
}
15931596
/* }}} */
15941597

0 commit comments

Comments
 (0)