diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-07-09 11:58:33 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-07-09 11:58:33 +0200 |
| commit | 613a56d1cbac89a5bba456b3fae7174284260d8a (patch) | |
| tree | 1b4fb619fa79412ee054ce3f29c8fcc4838e9050 /Zend/zend_execute.c | |
| parent | c05bfa362bd0935b761c8077a5c303ef79463dea (diff) | |
| download | php-git-613a56d1cbac89a5bba456b3fae7174284260d8a.tar.gz | |
Remove FREE_UNFETCHED concept
In master normal FREE_OPs work like FREE_UNFETCHED_OP used to, so
there is no point in keeping this distinction anymore, it's just
confusing.
Diffstat (limited to 'Zend/zend_execute.c')
| -rw-r--r-- | Zend/zend_execute.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index 29f4a08ebb..852c9b35e1 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -162,9 +162,6 @@ ZEND_API const zend_internal_function zend_pass_function = { zval_ptr_dtor_nogc(EX_VAR(var)); \ } -#define FREE_UNFETCHED_OP(type, var) \ - FREE_OP(type, var) - #define FREE_OP_VAR_PTR(type, var) \ FREE_OP(type, var) @@ -2903,7 +2900,7 @@ static zend_never_inline int zend_fetch_static_property_address_ex(zval **retval if (EXPECTED((ce = CACHED_PTR(cache_slot)) == NULL)) { ce = zend_fetch_class_by_name(Z_STR_P(class_name), Z_STR_P(class_name + 1), ZEND_FETCH_CLASS_DEFAULT | ZEND_FETCH_CLASS_EXCEPTION); if (UNEXPECTED(ce == NULL)) { - FREE_UNFETCHED_OP(op1_type, opline->op1.var); + FREE_OP(op1_type, opline->op1.var); return FAILURE; } if (UNEXPECTED(op1_type != IS_CONST)) { @@ -2914,7 +2911,7 @@ static zend_never_inline int zend_fetch_static_property_address_ex(zval **retval if (EXPECTED(op2_type == IS_UNUSED)) { ce = zend_fetch_class(NULL, opline->op2.num); if (UNEXPECTED(ce == NULL)) { - FREE_UNFETCHED_OP(op1_type, opline->op1.var); + FREE_OP(op1_type, opline->op1.var); return FAILURE; } } else { |