zend_timeout is not a signal handler function

The 'int dummy' parameter to this function makes it appear that it was intended as a
signal handler, but it is not being used as such. So remove the redundant parameter.

diff --git a/Zend/zend_execute.h b/Zend/zend_execute.h
index 8c4f928e3392cee797889262c5a8448c07882499..5dbc2ad11dabf4185efb7be437af804536db04bd 100644 (file)
--- a/Zend/zend_execute.h
+++ b/Zend/zend_execute.h
@@ -297,7 +297,7 @@ ZEND_API zend_bool zend_is_executing(void);
 
 ZEND_API void zend_set_timeout(zend_long seconds, int reset_signals);
 ZEND_API void zend_unset_timeout(void);
-ZEND_API ZEND_NORETURN void ZEND_FASTCALL zend_timeout(int dummy);
+ZEND_API ZEND_NORETURN void ZEND_FASTCALL zend_timeout(void);
 ZEND_API zend_class_entry *zend_fetch_class(zend_string *class_name, int fetch_type);
 ZEND_API zend_class_entry *zend_fetch_class_by_name(zend_string *class_name, zend_string *lcname, int fetch_type);
 

diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index bbd7bb8f8b98332e1b35f5f99de09e02ed1e233a..e8b70840b7831ba533eb0911fcb74d1f80ba29de 100644 (file)
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -1104,7 +1104,7 @@ ZEND_API int zend_eval_string_ex(const char *str, zval *retval_ptr, const char *
 
 static void zend_set_timeout_ex(zend_long seconds, int reset_signals);
 
-ZEND_API ZEND_NORETURN void ZEND_FASTCALL zend_timeout(int dummy) /* {{{ */
+ZEND_API ZEND_NORETURN void ZEND_FASTCALL zend_timeout(void) /* {{{ */
 {
 #if defined(PHP_WIN32)
 # ifndef ZTS

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index 6a4719b3dd28f06d744d5cc328b25925730b2fea..1395d48605e4b3108ae46dd5cdee7c013286af0f 100644 (file)
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -9208,7 +9208,7 @@ ZEND_VM_HELPER(zend_interrupt_helper, ANY, ANY)
        EG(vm_interrupt) = 0;
        SAVE_OPLINE();
        if (EG(timed_out)) {
-               zend_timeout(0);
+               zend_timeout();
        } else if (zend_interrupt_function) {
                zend_interrupt_function(execute_data);
                ZEND_VM_ENTER();

diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 346dbec656f9a6157d0a1200a6570cd556be85bc..6bf3ff510172c5c32b928825997e4fd309d7e29e 100644 (file)
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -2838,7 +2838,7 @@ static zend_never_inline ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_interrupt_he
        EG(vm_interrupt) = 0;
        SAVE_OPLINE();
        if (EG(timed_out)) {
-               zend_timeout(0);
+               zend_timeout();
        } else if (zend_interrupt_function) {
                zend_interrupt_function(execute_data);
                ZEND_VM_ENTER();

diff --git a/ext/opcache/jit/zend_jit_x86.dasc b/ext/opcache/jit/zend_jit_x86.dasc
index b654ed2fc742652b719abe7704230e8498d1d2b2..e0ae11241e16b45efd6076586cf7a54687b48c40 100644 (file)
--- a/ext/opcache/jit/zend_jit_x86.dasc
+++ b/ext/opcache/jit/zend_jit_x86.dasc
@@ -1612,8 +1612,7 @@ static int zend_jit_interrupt_handler_stub(dasm_State **Dst)
        |       //if (EG(timed_out)) {
        |       MEM_OP2_1_ZTS cmp, byte, executor_globals, timed_out, 0, r0
        |       je >1
-       |       //zend_timeout(0);
-       |       xor FCARG1d, FCARG1d
+       |       //zend_timeout();
        |       EXT_CALL zend_timeout, r0
        |1:
        |       //} else if (zend_interrupt_function) {