From dfa166e7ed28479b2d979fa3318c669732969d4d Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sun, 16 Sep 2018 17:12:44 +0200 Subject: Remove unused ZEND_FILE_LINE in i_zval_ptr_dtor --- Zend/zend_API.c | 2 +- Zend/zend_execute.c | 2 +- Zend/zend_execute_API.c | 2 +- Zend/zend_hash.c | 12 ++++++------ Zend/zend_objects.c | 4 ++-- Zend/zend_opcode.c | 6 +++--- Zend/zend_operators.c | 4 ++-- Zend/zend_variables.c | 4 ++-- Zend/zend_variables.h | 2 +- 9 files changed, 19 insertions(+), 19 deletions(-) (limited to 'Zend') diff --git a/Zend/zend_API.c b/Zend/zend_API.c index 7f7a9d7f1a..7ec4dc6c3d 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -3493,7 +3493,7 @@ ZEND_API void zend_fcall_info_args_clear(zend_fcall_info *fci, int free_mem) /* zval *end = p + fci->param_count; while (p != end) { - i_zval_ptr_dtor(p ZEND_FILE_LINE_CC); + i_zval_ptr_dtor(p); p++; } if (free_mem) { diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index 6859654bbe..217cd99ebb 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -132,7 +132,7 @@ ZEND_API const zend_internal_function zend_pass_function = { }; #undef zval_ptr_dtor -#define zval_ptr_dtor(zv) i_zval_ptr_dtor(zv ZEND_FILE_LINE_CC) +#define zval_ptr_dtor(zv) i_zval_ptr_dtor(zv) #define FREE_VAR_PTR_AND_EXTRACT_RESULT_IF_NECESSARY(free_op, result) do { \ zval *__container_to_free = (free_op); \ diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index 60260b9391..57a7e80819 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -205,7 +205,7 @@ static void zend_unclean_zval_ptr_dtor(zval *zv) /* {{{ */ if (Z_TYPE_P(zv) == IS_INDIRECT) { zv = Z_INDIRECT_P(zv); } - i_zval_ptr_dtor(zv ZEND_FILE_LINE_CC); + i_zval_ptr_dtor(zv); } /* }}} */ diff --git a/Zend/zend_hash.c b/Zend/zend_hash.c index 16f7897e1e..3022352e4b 100644 --- a/Zend/zend_hash.c +++ b/Zend/zend_hash.c @@ -1549,11 +1549,11 @@ ZEND_API void ZEND_FASTCALL zend_array_destroy(HashTable *ht) if (HT_HAS_STATIC_KEYS_ONLY(ht)) { do { - i_zval_ptr_dtor(&p->val ZEND_FILE_LINE_CC); + i_zval_ptr_dtor(&p->val); } while (++p != end); } else if (HT_IS_WITHOUT_HOLES(ht)) { do { - i_zval_ptr_dtor(&p->val ZEND_FILE_LINE_CC); + i_zval_ptr_dtor(&p->val); if (EXPECTED(p->key)) { zend_string_release_ex(p->key, 0); } @@ -1561,7 +1561,7 @@ ZEND_API void ZEND_FASTCALL zend_array_destroy(HashTable *ht) } else { do { if (EXPECTED(Z_TYPE(p->val) != IS_UNDEF)) { - i_zval_ptr_dtor(&p->val ZEND_FILE_LINE_CC); + i_zval_ptr_dtor(&p->val); if (EXPECTED(p->key)) { zend_string_release_ex(p->key, 0); } @@ -1659,11 +1659,11 @@ ZEND_API void ZEND_FASTCALL zend_symtable_clean(HashTable *ht) end = p + ht->nNumUsed; if (HT_HAS_STATIC_KEYS_ONLY(ht)) { do { - i_zval_ptr_dtor(&p->val ZEND_FILE_LINE_CC); + i_zval_ptr_dtor(&p->val); } while (++p != end); } else if (HT_IS_WITHOUT_HOLES(ht)) { do { - i_zval_ptr_dtor(&p->val ZEND_FILE_LINE_CC); + i_zval_ptr_dtor(&p->val); if (EXPECTED(p->key)) { zend_string_release(p->key); } @@ -1671,7 +1671,7 @@ ZEND_API void ZEND_FASTCALL zend_symtable_clean(HashTable *ht) } else { do { if (EXPECTED(Z_TYPE(p->val) != IS_UNDEF)) { - i_zval_ptr_dtor(&p->val ZEND_FILE_LINE_CC); + i_zval_ptr_dtor(&p->val); if (EXPECTED(p->key)) { zend_string_release(p->key); } diff --git a/Zend/zend_objects.c b/Zend/zend_objects.c index 7f173c9344..d979d733ef 100644 --- a/Zend/zend_objects.c +++ b/Zend/zend_objects.c @@ -52,7 +52,7 @@ ZEND_API void zend_object_std_dtor(zend_object *object) if (EXPECTED(object->ce->default_properties_count)) { end = p + object->ce->default_properties_count; do { - i_zval_ptr_dtor(p ZEND_FILE_LINE_CC); + i_zval_ptr_dtor(p); p++; } while (p != end); } @@ -187,7 +187,7 @@ ZEND_API void ZEND_FASTCALL zend_objects_clone_members(zend_object *new_object, zval *end = src + old_object->ce->default_properties_count; do { - i_zval_ptr_dtor(dst ZEND_FILE_LINE_CC); + i_zval_ptr_dtor(dst); ZVAL_COPY_VALUE(dst, src); zval_add_ref(dst); src++; diff --git a/Zend/zend_opcode.c b/Zend/zend_opcode.c index 3019174ff2..60fb5dd367 100644 --- a/Zend/zend_opcode.c +++ b/Zend/zend_opcode.c @@ -151,7 +151,7 @@ ZEND_API void zend_cleanup_internal_class_data(zend_class_entry *ce) ce->static_members_table = NULL; #endif while (p != end) { - i_zval_ptr_dtor(p ZEND_FILE_LINE_CC); + i_zval_ptr_dtor(p); p++; } efree(static_members); @@ -226,7 +226,7 @@ ZEND_API void destroy_zend_class(zval *zv) zval *end = p + ce->default_properties_count; while (p != end) { - i_zval_ptr_dtor(p ZEND_FILE_LINE_CC); + i_zval_ptr_dtor(p); p++; } efree(ce->default_properties_table); @@ -236,7 +236,7 @@ ZEND_API void destroy_zend_class(zval *zv) zval *end = p + ce->default_static_members_count; while (p != end) { - i_zval_ptr_dtor(p ZEND_FILE_LINE_CC); + i_zval_ptr_dtor(p); p++; } efree(ce->default_static_members_table); diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c index 1999cf9c25..745ee86be8 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -1821,7 +1821,7 @@ ZEND_API int ZEND_FASTCALL concat_function(zval *result, zval *op1, zval *op2) / if (UNEXPECTED(Z_STRLEN_P(op1) == 0)) { if (EXPECTED(result != op2)) { if (result == orig_op1) { - i_zval_ptr_dtor(result ZEND_FILE_LINE_CC); + i_zval_ptr_dtor(result); } ZVAL_COPY(result, op2); } @@ -1852,7 +1852,7 @@ ZEND_API int ZEND_FASTCALL concat_function(zval *result, zval *op1, zval *op2) / result_str = zend_string_alloc(result_len, 0); memcpy(ZSTR_VAL(result_str), Z_STRVAL_P(op1), op1_len); if (result == orig_op1) { - i_zval_ptr_dtor(result ZEND_FILE_LINE_CC); + i_zval_ptr_dtor(result); } } diff --git a/Zend/zend_variables.c b/Zend/zend_variables.c index a65c2e5aab..34fc8bc271 100644 --- a/Zend/zend_variables.c +++ b/Zend/zend_variables.c @@ -76,7 +76,7 @@ static void ZEND_FASTCALL zend_string_destroy(zend_string *str) static void ZEND_FASTCALL zend_reference_destroy(zend_reference *ref) { - i_zval_ptr_dtor(&ref->val ZEND_FILE_LINE_CC); + i_zval_ptr_dtor(&ref->val); efree_size(ref, sizeof(zend_reference)); } @@ -108,7 +108,7 @@ static void ZEND_FASTCALL zend_ast_ref_destroy_wrapper(zend_ast_ref *ast) ZEND_API void zval_ptr_dtor(zval *zval_ptr) /* {{{ */ { - i_zval_ptr_dtor(zval_ptr ZEND_FILE_LINE_CC); + i_zval_ptr_dtor(zval_ptr); } /* }}} */ diff --git a/Zend/zend_variables.h b/Zend/zend_variables.h index 8de71e3f49..0d62a6b16c 100644 --- a/Zend/zend_variables.h +++ b/Zend/zend_variables.h @@ -36,7 +36,7 @@ static zend_always_inline void zval_ptr_dtor_nogc(zval *zval_ptr) } } -static zend_always_inline void i_zval_ptr_dtor(zval *zval_ptr ZEND_FILE_LINE_DC) +static zend_always_inline void i_zval_ptr_dtor(zval *zval_ptr) { if (Z_REFCOUNTED_P(zval_ptr)) { zend_refcounted *ref = Z_COUNTED_P(zval_ptr); -- cgit v1.2.1