From 6188b7a1da3573964ed60b394b0fa10cc2bc4fb7 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Fri, 9 Oct 2020 15:05:43 +0200 Subject: 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. --- Zend/zend_execute_API.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Zend/zend_execute_API.c') 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)); } -- cgit v1.2.1