Remove unused ZEND_FILE_LINE in i_zval_ptr_dtor

diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index 7f7a9d7f1aa2d0228f8c20be6646438bd60ff660..7ec4dc6c3da05617b1677c0bab7a057530a3d2c6 100644 (file)
--- 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 6859654bbe77061cbce0e76b5bf6d3484677cf9a..217cd99ebb8966a3ee45b1baaa5c5502d56b754e 100644 (file)
--- 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 60260b93918d04e663a8f56a338b95ab52c97e7c..57a7e80819ebdd63dbd63f990d787215af0d8331 100644 (file)
--- 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 16f7897e1e4aa57d8f0ed843a6d9ab6c6ad47033..3022352e4bd530cddc254541062ddc93971eaf00 100644 (file)
--- 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 7f173c93444a0d0b75495301f11947990b93f37a..d979d733efada7f6ed1315b1e4e34a6fc15ea809 100644 (file)
--- 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 3019174ff23583b5b6e8f668d2ec4b37a9f7beb1..60fb5dd36742ece98f839bbfc452734991d53b8c 100644 (file)
--- 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 1999cf9c2567f648328a824d734345cb866a8e89..745ee86be881213a986078efb664f7200a148a1b 100644 (file)
--- 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 a65c2e5aabdc7b521dc23d0cb144bf30eebcb06b..34fc8bc271b242226a956004305e6ae442db9bcf 100644 (file)
--- 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 8de71e3f498190288129a302fd4624c33dae14a0..0d62a6b16ca74742854c7fb240adf5b656c9aa8b 100644 (file)
--- 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);

diff --git a/ext/standard/array.c b/ext/standard/array.c
index 8ada2c4d8f247d905e9db9997033b4cb1c0adcb0..fb3120f4452645e4f7f7fff043ee649a23d692cd 100644 (file)
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -6140,7 +6140,7 @@ PHP_FUNCTION(array_map)
 
                        ZVAL_COPY(&arg, zv);
                        ret = zend_call_function(&fci, &fci_cache);
-                       i_zval_ptr_dtor(&arg ZEND_FILE_LINE_CC);
+                       i_zval_ptr_dtor(&arg);
                        if (ret != SUCCESS || Z_TYPE(result) == IS_UNDEF) {
                                zend_array_destroy(Z_ARR_P(return_value));
                                RETURN_NULL();

diff --git a/ext/standard/var_unserializer.c b/ext/standard/var_unserializer.c
index 2f78c2120dd8397dfd0f1f1192678bc64044bb81..518277ca00ab65b4feb01ece36aaa909e6100e81 100644 (file)
--- a/ext/standard/var_unserializer.c
+++ b/ext/standard/var_unserializer.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 1.0.3 */
+/* Generated by re2c 1.0.1 */
 #line 1 "ext/standard/var_unserializer.re"
 /*
   +----------------------------------------------------------------------+
@@ -231,7 +231,7 @@ PHPAPI void var_destroy(php_unserialize_data_t *var_hashx)
                                }
                        }
 
-                       i_zval_ptr_dtor(zv ZEND_FILE_LINE_CC);
+                       i_zval_ptr_dtor(zv);
                }
                next = var_dtor_hash->next;
                efree_size(var_dtor_hash, sizeof(var_dtor_entries));
@@ -315,7 +315,7 @@ static inline int unserialize_allowed_class(
 #define YYMARKER marker
 
 
-#line 325 "ext/standard/var_unserializer.re"
+#line 323 "ext/standard/var_unserializer.re"
 
 
 
@@ -673,7 +673,7 @@ static int php_var_unserialize_internal(UNSERIALIZE_PARAMETER, int as_key)
        start = cursor;
 
 
-#line 679 "ext/standard/var_unserializer.c"
+#line 677 "ext/standard/var_unserializer.c"
 {
        YYCTYPE yych;
        static const unsigned char yybm[] = {
@@ -731,9 +731,9 @@ static int php_var_unserialize_internal(UNSERIALIZE_PARAMETER, int as_key)
 yy2:
        ++YYCURSOR;
 yy3:
-#line 1078 "ext/standard/var_unserializer.re"
+#line 1076 "ext/standard/var_unserializer.re"
        { return 0; }
-#line 739 "ext/standard/var_unserializer.c"
+#line 737 "ext/standard/var_unserializer.c"
 yy4:
        yych = *(YYMARKER = ++YYCURSOR);
        if (yych == ':') goto yy17;
@@ -780,13 +780,13 @@ yy14:
        goto yy3;
 yy15:
        ++YYCURSOR;
-#line 1072 "ext/standard/var_unserializer.re"
+#line 1070 "ext/standard/var_unserializer.re"
        {
        /* this is the case where we have less data than planned */
        php_error_docref(NULL, E_NOTICE, "Unexpected end of serialized data");
        return 0; /* not sure if it should be 0 or 1 here? */
 }
-#line 792 "ext/standard/var_unserializer.c"
+#line 790 "ext/standard/var_unserializer.c"
 yy17:
        yych = *++YYCURSOR;
        if (yybm[0+yych] & 128) {
@@ -797,13 +797,13 @@ yy18:
        goto yy3;
 yy19:
        ++YYCURSOR;
-#line 733 "ext/standard/var_unserializer.re"
+#line 731 "ext/standard/var_unserializer.re"
        {
        *p = YYCURSOR;
        ZVAL_NULL(rval);
        return 1;
 }
-#line 809 "ext/standard/var_unserializer.c"
+#line 807 "ext/standard/var_unserializer.c"
 yy21:
        yych = *++YYCURSOR;
        if (yych <= '/') goto yy18;
@@ -1007,7 +1007,7 @@ yy56:
        goto yy18;
 yy57:
        ++YYCURSOR;
-#line 683 "ext/standard/var_unserializer.re"
+#line 681 "ext/standard/var_unserializer.re"
        {
        zend_long id;
 
@@ -1032,7 +1032,7 @@ yy57:
 
        return 1;
 }
-#line 1038 "ext/standard/var_unserializer.c"
+#line 1036 "ext/standard/var_unserializer.c"
 yy59:
        yych = *++YYCURSOR;
        if (yych == '"') goto yy80;
@@ -1043,22 +1043,22 @@ yy60:
        goto yy18;
 yy61:
        ++YYCURSOR;
-#line 739 "ext/standard/var_unserializer.re"
+#line 737 "ext/standard/var_unserializer.re"
        {
        *p = YYCURSOR;
        ZVAL_FALSE(rval);
        return 1;
 }
-#line 1055 "ext/standard/var_unserializer.c"
+#line 1053 "ext/standard/var_unserializer.c"
 yy63:
        ++YYCURSOR;
-#line 745 "ext/standard/var_unserializer.re"
+#line 743 "ext/standard/var_unserializer.re"
        {
        *p = YYCURSOR;
        ZVAL_TRUE(rval);
        return 1;
 }
-#line 1064 "ext/standard/var_unserializer.c"
+#line 1062 "ext/standard/var_unserializer.c"
 yy65:
        ++YYCURSOR;
        if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
@@ -1078,7 +1078,7 @@ yy65:
        }
 yy67:
        ++YYCURSOR;
-#line 793 "ext/standard/var_unserializer.re"
+#line 791 "ext/standard/var_unserializer.re"
        {
 #if SIZEOF_ZEND_LONG == 4
 use_double:
@@ -1087,7 +1087,7 @@ use_double:
        ZVAL_DOUBLE(rval, zend_strtod((const char *)start + 2, NULL));
        return 1;
 }
-#line 1093 "ext/standard/var_unserializer.c"
+#line 1091 "ext/standard/var_unserializer.c"
 yy69:
        yych = *++YYCURSOR;
        if (yych <= ',') {
@@ -1109,7 +1109,7 @@ yy71:
        goto yy18;
 yy72:
        ++YYCURSOR;
-#line 751 "ext/standard/var_unserializer.re"
+#line 749 "ext/standard/var_unserializer.re"
        {
 #if SIZEOF_ZEND_LONG == 4
        int digits = YYCURSOR - start - 3;
@@ -1135,14 +1135,14 @@ yy72:
        ZVAL_LONG(rval, parse_iv(start + 2));
        return 1;
 }
-#line 1141 "ext/standard/var_unserializer.c"
+#line 1139 "ext/standard/var_unserializer.c"
 yy74:
        yych = *++YYCURSOR;
        if (yych == '"') goto yy88;
        goto yy18;
 yy75:
        ++YYCURSOR;
-#line 708 "ext/standard/var_unserializer.re"
+#line 706 "ext/standard/var_unserializer.re"
        {
        zend_long id;
 
@@ -1167,14 +1167,14 @@ yy75:
 
        return 1;
 }
-#line 1173 "ext/standard/var_unserializer.c"
+#line 1171 "ext/standard/var_unserializer.c"
 yy77:
        yych = *++YYCURSOR;
        if (yych == '"') goto yy90;
        goto yy18;
 yy78:
        ++YYCURSOR;
-#line 920 "ext/standard/var_unserializer.re"
+#line 918 "ext/standard/var_unserializer.re"
        {
        size_t len, len2, len3, maxlen;
        zend_long elements;
@@ -1326,10 +1326,10 @@ yy78:
 
        return object_common2(UNSERIALIZE_PASSTHRU, elements);
 }
-#line 1332 "ext/standard/var_unserializer.c"
+#line 1330 "ext/standard/var_unserializer.c"
 yy80:
        ++YYCURSOR;
-#line 842 "ext/standard/var_unserializer.re"
+#line 840 "ext/standard/var_unserializer.re"
        {
        size_t len, maxlen;
        zend_string *str;
@@ -1363,10 +1363,10 @@ yy80:
        ZVAL_STR(rval, str);
        return 1;
 }
-#line 1369 "ext/standard/var_unserializer.c"
+#line 1367 "ext/standard/var_unserializer.c"
 yy82:
        ++YYCURSOR;
-#line 876 "ext/standard/var_unserializer.re"
+#line 874 "ext/standard/var_unserializer.re"
        {
        zend_long elements = parse_iv(start + 2);
        /* use iv() not uiv() in order to check data range */
@@ -1399,7 +1399,7 @@ yy82:
 
        return finish_nested_data(UNSERIALIZE_PASSTHRU);
 }
-#line 1405 "ext/standard/var_unserializer.c"
+#line 1403 "ext/standard/var_unserializer.c"
 yy84:
        yych = *++YYCURSOR;
        if (yych <= '/') goto yy18;
@@ -1418,7 +1418,7 @@ yy87:
        goto yy18;
 yy88:
        ++YYCURSOR;
-#line 909 "ext/standard/var_unserializer.re"
+#line 907 "ext/standard/var_unserializer.re"
        {
        zend_long elements;
     if (!var_hash) return 0;
@@ -1429,10 +1429,10 @@ yy88:
        }
        return object_common2(UNSERIALIZE_PASSTHRU, elements);
 }
-#line 1435 "ext/standard/var_unserializer.c"
+#line 1433 "ext/standard/var_unserializer.c"
 yy90:
        ++YYCURSOR;
-#line 802 "ext/standard/var_unserializer.re"
+#line 800 "ext/standard/var_unserializer.re"
        {
        size_t len, maxlen;
        char *str;
@@ -1472,10 +1472,10 @@ yy90:
        }
        return 1;
 }
-#line 1478 "ext/standard/var_unserializer.c"
+#line 1476 "ext/standard/var_unserializer.c"
 yy92:
        ++YYCURSOR;
-#line 777 "ext/standard/var_unserializer.re"
+#line 775 "ext/standard/var_unserializer.re"
        {
        *p = YYCURSOR;
 
@@ -1491,9 +1491,9 @@ yy92:
 
        return 1;
 }
-#line 1497 "ext/standard/var_unserializer.c"
+#line 1495 "ext/standard/var_unserializer.c"
 }
-#line 1080 "ext/standard/var_unserializer.re"
+#line 1078 "ext/standard/var_unserializer.re"
 
 
        return 0;

diff --git a/ext/standard/var_unserializer.re b/ext/standard/var_unserializer.re
index c99e673c8d2ea87ce5a2d1dee9b0e3d2ecce8637..1b398560918729191dc02edd3b2652c92468bb04 100644 (file)
--- a/ext/standard/var_unserializer.re
+++ b/ext/standard/var_unserializer.re
@@ -229,7 +229,7 @@ PHPAPI void var_destroy(php_unserialize_data_t *var_hashx)
                                }
                        }
 
-                       i_zval_ptr_dtor(zv ZEND_FILE_LINE_CC);
+                       i_zval_ptr_dtor(zv);
                }
                next = var_dtor_hash->next;
                efree_size(var_dtor_hash, sizeof(var_dtor_entries));