[php-src] PHP-8.6: Merge branch 'PHP-8.5' into PHP-8.6
| From: | ndossche | Date: | Tue, 29 Sep 2026 19:44:50 +0000 |
| Subject: | [php-src] PHP-8.6: Merge branch 'PHP-8.5' into PHP-8.6 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-141731@lists.php.net to get a copy of this message | ||
Author: ndossche (ndossche)
Date: 2026-09-29T21:44:36+02:00
Commit: https://github.com/php/php-src/commit/8d6b5beb7e00b99b524f16d0b9313ac851bf60f1
Raw diff: https://github.com/php/php-src/commit/8d6b5beb7e00b99b524f16d0b9313ac851bf60f1.diff
Merge branch 'PHP-8.5' into PHP-8.6
* PHP-8.5:
Fix GH-23980: ZEND_ASSERT violation @ ZEND_INCLUDE_OR_EVAL (include/eval run with a pending
exception)
Changed paths:
M NEWS
M Zend/zend_vm_def.h
M Zend/zend_vm_execute.h
Diff:
diff --git a/NEWS b/NEWS
index b76282a5c9ac..ac80688fbd44 100644
--- a/NEWS
+++ b/NEWS
@@ -17,6 +17,7 @@ PHP NEWS
zp_arg_must_be_sent_by_ref()). (ndossche)
. Fixed GH-23921 (Fibers start with error_reporting = 0 when the
error_reporting INI directive is not set). (Girgias)
+ . Fixed GH-23980 (ZEND_ASSERT violation @ ZEND_INCLUDE_OR_EVAL). (ndossche)
- FFI:
. Fixed crashes with FFI callbacks created from __call() trampolines
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index c0fd2eef277b..86a66895351a 100644
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -6682,7 +6682,11 @@ ZEND_VM_HANDLER(73, ZEND_INCLUDE_OR_EVAL, CONST|TMP|CV, ANY, EVAL,
SPEC(OBSERVER
}
}
FREE_OP1();
- ZEND_VM_NEXT_OPCODE();
+ if (OP1_TYPE & IS_CONST) {
+ ZEND_VM_NEXT_OPCODE();
+ } else {
+ ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
+ }
}
ZEND_VM_HANDLER(153, ZEND_UNSET_CV, CV, UNUSED)
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index b956b638b7e4..dd284391a2a1 100644
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -5464,7 +5464,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_OPCODE_HANDLER_FUNC_CCONV
ZEND_INCLUDE_OR_EV
}
- ZEND_VM_NEXT_OPCODE();
+ if (IS_CONST & IS_CONST) {
+ ZEND_VM_NEXT_OPCODE();
+ } else {
+ ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
+ }
}
static ZEND_OPCODE_HANDLER_RET ZEND_OPCODE_HANDLER_FUNC_CCONV
ZEND_INCLUDE_OR_EVAL_SPEC_OBSERVER_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
@@ -5547,7 +5551,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_OPCODE_HANDLER_FUNC_CCONV
ZEND_INCLUDE_OR_EV
}
}
FREE_OP(opline->op1_type, opline->op1.var);
- ZEND_VM_NEXT_OPCODE();
+ if (opline->op1_type & IS_CONST) {
+ ZEND_VM_NEXT_OPCODE();
+ } else {
+ ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
+ }
}
static ZEND_OPCODE_HANDLER_RET ZEND_OPCODE_HANDLER_FUNC_CCONV
ZEND_FE_RESET_R_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
@@ -17652,7 +17660,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_OPCODE_HANDLER_FUNC_CCONV
ZEND_INCLUDE_OR_EV
}
}
zval_ptr_dtor_nogc(EX_VAR(opline->op1.var));
- ZEND_VM_NEXT_OPCODE();
+ if (IS_TMP_VAR & IS_CONST) {
+ ZEND_VM_NEXT_OPCODE();
+ } else {
+ ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
+ }
}
static ZEND_OPCODE_HANDLER_RET ZEND_OPCODE_HANDLER_FUNC_CCONV
ZEND_FE_RESET_R_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
@@ -40426,7 +40438,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_OPCODE_HANDLER_FUNC_CCONV
ZEND_INCLUDE_OR_EV
}
- ZEND_VM_NEXT_OPCODE();
+ if (IS_CV & IS_CONST) {
+ ZEND_VM_NEXT_OPCODE();
+ } else {
+ ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
+ }
}
static ZEND_OPCODE_HANDLER_RET ZEND_OPCODE_HANDLER_FUNC_CCONV
ZEND_FE_RESET_R_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
@@ -58309,7 +58325,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_OPCODE_HANDLER_CCONV
ZEND_INCLUDE_OR_EVAL_SP
}
- ZEND_VM_NEXT_OPCODE();
+ if (IS_CONST & IS_CONST) {
+ ZEND_VM_NEXT_OPCODE();
+ } else {
+ ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
+ }
}
static ZEND_OPCODE_HANDLER_RET ZEND_OPCODE_HANDLER_CCONV
ZEND_INCLUDE_OR_EVAL_SPEC_OBSERVER_TAILCALL_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
@@ -58392,7 +58412,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_OPCODE_HANDLER_CCONV
ZEND_INCLUDE_OR_EVAL_SP
}
}
FREE_OP(opline->op1_type, opline->op1.var);
- ZEND_VM_NEXT_OPCODE();
+ if (opline->op1_type & IS_CONST) {
+ ZEND_VM_NEXT_OPCODE();
+ } else {
+ ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
+ }
}
static ZEND_OPCODE_HANDLER_RET ZEND_OPCODE_HANDLER_CCONV
ZEND_FE_RESET_R_SPEC_CONST_TAILCALL_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
@@ -70395,7 +70419,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_OPCODE_HANDLER_CCONV
ZEND_INCLUDE_OR_EVAL_SP
}
}
zval_ptr_dtor_nogc(EX_VAR(opline->op1.var));
- ZEND_VM_NEXT_OPCODE();
+ if (IS_TMP_VAR & IS_CONST) {
+ ZEND_VM_NEXT_OPCODE();
+ } else {
+ ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
+ }
}
static ZEND_OPCODE_HANDLER_RET ZEND_OPCODE_HANDLER_CCONV
ZEND_FE_RESET_R_SPEC_TMP_TAILCALL_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
@@ -93069,7 +93097,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_OPCODE_HANDLER_CCONV
ZEND_INCLUDE_OR_EVAL_SP
}
- ZEND_VM_NEXT_OPCODE();
+ if (IS_CV & IS_CONST) {
+ ZEND_VM_NEXT_OPCODE();
+ } else {
+ ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
+ }
}
static ZEND_OPCODE_HANDLER_RET ZEND_OPCODE_HANDLER_CCONV
ZEND_FE_RESET_R_SPEC_CV_TAILCALL_HANDLER(ZEND_OPCODE_HANDLER_ARGS)