Commit 34ea00fda30 for php
commit 34ea00fda3045c39e10683465ec552e64f47f4c0
Merge: 14bb5921277 198bce1e6ba
Author: David Carlier <devnexen@gmail.com>
Date: Mon Nov 2 18:32:50 2026 +0000
Merge branch 'PHP-8.6'
* PHP-8.6:
Fix GH-24480: finally block running twice when a VM interrupt throws in FAST_RET
diff --cc Zend/zend_vm_execute.h
index b1d7d3d8082,96405697644..2ae103cb1d4
Binary files differ
diff --cc ext/zend_test/observer.c
index a03c89fc260,1aec7f6150e..d8b670769b1
--- a/ext/zend_test/observer.c
+++ b/ext/zend_test/observer.c
@@@ -125,6 -126,11 +126,11 @@@ static void observer_end(zend_execute_d
{
assert_observer_opline(execute_data);
+ if (ZT_G(observer_set_vm_interrupt_on_end) && !EG(exception)) {
+ ZT_G(observer_throw_on_vm_interrupt) = true;
- zend_atomic_bool_store_ex(&EG(vm_interrupt), true);
++ atomic_store(&EG(vm_interrupt), true);
+ }
+
if (!ZT_G(observer_show_output)) {
return;
}