diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-10-09 15:05:43 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-10-09 15:06:12 +0200 |
| commit | 6188b7a1da3573964ed60b394b0fa10cc2bc4fb7 (patch) | |
| tree | 07a6ee892560172ae1f5631081554c04669c48c8 /Zend | |
| parent | cc58347105939879f73d43db4afa7a937409f06a (diff) | |
| download | php-git-6188b7a1da3573964ed60b394b0fa10cc2bc4fb7.tar.gz | |
Revert "Change calling convention of zval_update_constant[_ex]() to fastcall."
This reverts commit 5a447b086bba450d61c283adfecbdec657cc5f34.
Revert this ABI break from PHP-8.0, leaving it only on master.
Diffstat (limited to 'Zend')
| -rw-r--r-- | Zend/zend_execute.h | 4 | ||||
| -rw-r--r-- | Zend/zend_execute_API.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Zend/zend_execute.h b/Zend/zend_execute.h index 62cee34452..ab96d43c4c 100644 --- a/Zend/zend_execute.h +++ b/Zend/zend_execute.h @@ -155,8 +155,8 @@ static zend_always_inline zval* zend_assign_to_variable(zval *variable_ptr, zval return variable_ptr; } -ZEND_API zend_result ZEND_FASTCALL zval_update_constant(zval *pp); -ZEND_API zend_result ZEND_FASTCALL zval_update_constant_ex(zval *pp, zend_class_entry *scope); +ZEND_API zend_result zval_update_constant(zval *pp); +ZEND_API zend_result zval_update_constant_ex(zval *pp, zend_class_entry *scope); /* dedicated Zend executor functions - do not use! */ struct _zend_vm_stack { diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index 2eb3463eff..7572a0d890 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -610,7 +610,7 @@ ZEND_API zend_bool zend_is_executing(void) /* {{{ */ } /* }}} */ -ZEND_API zend_result ZEND_FASTCALL zval_update_constant_ex(zval *p, zend_class_entry *scope) /* {{{ */ +ZEND_API zend_result zval_update_constant_ex(zval *p, zend_class_entry *scope) /* {{{ */ { if (Z_TYPE_P(p) == IS_CONSTANT_AST) { zend_ast *ast = Z_ASTVAL_P(p); @@ -638,7 +638,7 @@ ZEND_API zend_result ZEND_FASTCALL zval_update_constant_ex(zval *p, zend_class_e } /* }}} */ -ZEND_API zend_result ZEND_FASTCALL zval_update_constant(zval *pp) /* {{{ */ +ZEND_API zend_result zval_update_constant(zval *pp) /* {{{ */ { return zval_update_constant_ex(pp, EG(current_execute_data) ? zend_get_executed_scope() : CG(active_class_entry)); } |