Commit 6b7b5af307e for php

commit 6b7b5af307e38dd6f3a5e6261fd71b67e40bf881
Merge: 42df195cc47 fba362b1961
Author: Arnaud Le Blanc <arnaud.lb@gmail.com>
Date:   Fri Oct 30 16:25:53 2026 +0100

    Merge branch 'PHP-8.6'

    * PHP-8.6:
      Fix merge

diff --cc Zend/zend_vm_execute.h
index 4b7fa9b3d60,66a57ed4598..7e843bb6c1f
Binary files differ
diff --cc ext/zend_test/test.c
index 661cba8b8c1,661cba8b8c1..846fd36a403
--- a/ext/zend_test/test.c
+++ b/ext/zend_test/test.c
@@@ -2230,7 -2230,7 +2230,7 @@@ static void (*zend_test_prev_interrupt_
   * leaves an interrupt pending at all times. The VM must still make progress. */
  static void zend_test_rearm_interrupt_function(zend_execute_data *execute_data)
  {
--	zend_atomic_bool_store_ex(&EG(vm_interrupt), true);
++	atomic_store(&EG(vm_interrupt), true);

  	if (zend_test_prev_interrupt_function) {
  		zend_test_prev_interrupt_function(execute_data);
@@@ -2508,7 -2508,7 +2508,7 @@@ PHP_RINIT_FUNCTION(zend_test
  	zend_test_mm_custom_handlers_rinit();

  	if (ZT_G(rearm_vm_interrupt)) {
--		zend_atomic_bool_store_ex(&EG(vm_interrupt), true);
++		atomic_store(&EG(vm_interrupt), true);
  	}

  	return SUCCESS;