diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2019-05-30 20:43:17 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2019-05-30 20:43:17 +0300 |
| commit | 0a6a350371832bbece79b55d12b78055cf3a3b11 (patch) | |
| tree | c3730db41420021b3e60b8f257ad286e128c527f | |
| parent | edd7fb2a16a17db017724831358a6706b4f69e40 (diff) | |
| parent | ee565529138891e757727de230af9051caeda05d (diff) | |
| download | php-git-0a6a350371832bbece79b55d12b78055cf3a3b11.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Disable "bad" optimisations only for emulation loop
| -rw-r--r-- | Zend/zend_execute.c | 10 | ||||
| -rw-r--r-- | Zend/zend_vm_execute.h | 8 | ||||
| -rw-r--r-- | Zend/zend_vm_execute.skl | 8 |
3 files changed, 16 insertions, 10 deletions
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index e031fa412e..fc047c9340 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -4295,18 +4295,8 @@ static zend_never_inline int ZEND_FASTCALL zend_quick_check_constant( } \ } while (0) -#if ZEND_GCC_VERSION >= 4000 && !defined(__clang__) -# pragma GCC push_options -# pragma GCC optimize("no-gcse") -# pragma GCC optimize("no-ivopts") -#endif - #include "zend_vm_execute.h" -#if ZEND_GCC_VERSION >= 4000 && !defined(__clang__) -# pragma GCC pop_options -#endif - ZEND_API int zend_set_user_opcode_handler(zend_uchar opcode, user_opcode_handler_t handler) { if (opcode != ZEND_USER_OPCODE) { diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 71487b713d..303fc2f66b 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -55943,6 +55943,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_NULL_HANDLER(ZEND_OPCODE_HANDL #endif +#if (ZEND_VM_KIND != ZEND_VM_KIND_CALL) && (ZEND_GCC_VERSION >= 4000) && !defined(__clang__) +# pragma GCC push_options +# pragma GCC optimize("no-gcse") +# pragma GCC optimize("no-ivopts") +#endif ZEND_API void execute_ex(zend_execute_data *ex) { DCL_OPLINE @@ -66789,6 +66794,9 @@ zend_leave_helper_SPEC_LABEL: } zend_error_noreturn(E_CORE_ERROR, "Arrived at end of main loop which shouldn't happen"); } +#if (ZEND_VM_KIND != ZEND_VM_KIND_CALL) && (ZEND_GCC_VERSION >= 4000) && !defined(__clang__) +# pragma GCC pop_options +#endif ZEND_API void zend_execute(zend_op_array *op_array, zval *return_value) { diff --git a/Zend/zend_vm_execute.skl b/Zend/zend_vm_execute.skl index 5e6e98bb24..27aae16391 100644 --- a/Zend/zend_vm_execute.skl +++ b/Zend/zend_vm_execute.skl @@ -1,5 +1,10 @@ {%DEFINES%} +#if (ZEND_VM_KIND != ZEND_VM_KIND_CALL) && (ZEND_GCC_VERSION >= 4000) && !defined(__clang__) +# pragma GCC push_options +# pragma GCC optimize("no-gcse") +# pragma GCC optimize("no-ivopts") +#endif ZEND_API void {%EXECUTOR_NAME%}_ex(zend_execute_data *ex) { DCL_OPLINE @@ -20,6 +25,9 @@ ZEND_API void {%EXECUTOR_NAME%}_ex(zend_execute_data *ex) } zend_error_noreturn(E_CORE_ERROR, "Arrived at end of main loop which shouldn't happen"); } +#if (ZEND_VM_KIND != ZEND_VM_KIND_CALL) && (ZEND_GCC_VERSION >= 4000) && !defined(__clang__) +# pragma GCC pop_options +#endif ZEND_API void zend_{%EXECUTOR_NAME%}(zend_op_array *op_array, zval *return_value) { |