diff options
| author | Alex Dowad <alexinbeijing@gmail.com> | 2020-05-06 22:22:07 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-05-12 17:13:46 +0200 |
| commit | f0960879e4e93e8204e6b70ce833f8f0b405cc28 (patch) | |
| tree | f1aae470a6a521b0cc9bdc6cafbf558c83475b23 | |
| parent | 53f5cfd99eb19a47ce3bb2bd245d14103c9c1194 (diff) | |
| download | php-git-f0960879e4e93e8204e6b70ce833f8f0b405cc28.tar.gz | |
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.
| -rw-r--r-- | Zend/zend_execute.h | 2 | ||||
| -rw-r--r-- | Zend/zend_execute_API.c | 2 | ||||
| -rw-r--r-- | Zend/zend_vm_def.h | 2 | ||||
| -rw-r--r-- | Zend/zend_vm_execute.h | 2 | ||||
| -rw-r--r-- | ext/opcache/jit/zend_jit_x86.dasc | 3 |
5 files changed, 5 insertions, 6 deletions
diff --git a/Zend/zend_execute.h b/Zend/zend_execute.h index 8c4f928e33..5dbc2ad11d 100644 --- 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 bbd7bb8f8b..e8b70840b7 100644 --- 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 6a4719b3dd..1395d48605 100644 --- 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 346dbec656..6bf3ff5101 100644 --- 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 b654ed2fc7..e0ae11241e 100644 --- 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) { |