Commit e7dadbc93fa for php

commit e7dadbc93fad9ac249df7cfd1db246a6eef82469
Author: Gina Peter Banyard <girgias@php.net>
Date:   Mon Nov 2 11:30:45 2026 +0000

    Zend: use normal if condition in zend_vm_def.h rather than a preprocessor condition (#24706)

    Effectively reverting 0294485164199ee043d8871a22e0a7a9f3d82fc8

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index 95196c4007c..6ec38be5221 100644
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -4474,9 +4474,7 @@ ZEND_VM_COLD_CONST_HANDLER(124, ZEND_VERIFY_RETURN_TYPE, CONST|TMP|VAR|UNUSED|CV
 		SAVE_OPLINE();
 		zend_verify_missing_return_type(EX(func));
 		HANDLE_EXCEPTION();
-	} else {
-/* prevents "undefined variable opline" errors */
-#if !ZEND_VM_SPEC || (OP1_TYPE != IS_UNUSED)
+	} else if (!ZEND_VM_SPEC || (OP1_TYPE != IS_UNUSED)) {
 		USE_OPLINE
 		zval *retval_ref, *retval_ptr;
 		zend_arg_info *ret_info = EX(func)->common.arg_info - 1;
@@ -4534,7 +4532,6 @@ ZEND_VM_COLD_CONST_HANDLER(124, ZEND_VERIFY_RETURN_TYPE, CONST|TMP|VAR|UNUSED|CV
 			HANDLE_EXCEPTION();
 		}
 		ZEND_VM_NEXT_OPCODE();
-#endif
 	}
 }

diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 7e843bb6c1f..f85378a9953 100644
Binary files a/Zend/zend_vm_execute.h and b/Zend/zend_vm_execute.h differ