Remove unused ZEND_FILE_LINE in i_zval_ptr_dtor

nikic · nikic · commit dfa166e7ed28 · 2018-09-16T17:16:26.000+02:00
diff --git 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
@@ -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
@@ -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
@@ -1549,19 +1549,19 @@ 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);
 				}
 			} while (++p != end);
 		} 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,19 +1659,19 @@ 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);
 				}
 			} while (++p != end);
 		} 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/ext/standard/var_unserializer.re b/ext/standard/var_unserializer.re

Original file line number	Diff line number	Diff line change
`@@ -3493,7 +3493,7 @@ ZEND_API void zend_fcall_info_args_clear(zend_fcall_info fci, int free_mem) /`
`3493`	`3493`	`zval *end = p + fci->param_count;`
`3494`	`3494`
`3495`	`3495`	`while (p != end) {`
`3496`		`- i_zval_ptr_dtor(p ZEND_FILE_LINE_CC);`
	`3496`	`+ i_zval_ptr_dtor(p);`
`3497`	`3497`	`p++;`
`3498`	`3498`	`}`
`3499`	`3499`	`if (free_mem) {`
Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,7 @@ static void zend_unclean_zval_ptr_dtor(zval zv) / {{{ */`
`205`	`205`	`if (Z_TYPE_P(zv) == IS_INDIRECT) {`
`206`	`206`	`zv = Z_INDIRECT_P(zv);`
`207`	`207`	`}`
`208`		`- i_zval_ptr_dtor(zv ZEND_FILE_LINE_CC);`
	`208`	`+ i_zval_ptr_dtor(zv);`
`209`	`209`	`}`
`210`	`210`	`/* }}} */`
`211`	`211`
Original file line number	Diff line number	Diff line change
`@@ -1821,7 +1821,7 @@ ZEND_API int ZEND_FASTCALL concat_function(zval result, zval op1, zval *op2) /`
`1821`	`1821`	`if (UNEXPECTED(Z_STRLEN_P(op1) == 0)) {`
`1822`	`1822`	`if (EXPECTED(result != op2)) {`
`1823`	`1823`	`if (result == orig_op1) {`
`1824`		`- i_zval_ptr_dtor(result ZEND_FILE_LINE_CC);`
	`1824`	`+ i_zval_ptr_dtor(result);`
`1825`	`1825`	`}`
`1826`	`1826`	`ZVAL_COPY(result, op2);`
`1827`	`1827`	`}`
`@@ -1852,7 +1852,7 @@ ZEND_API int ZEND_FASTCALL concat_function(zval result, zval op1, zval *op2) /`
`1852`	`1852`	`result_str = zend_string_alloc(result_len, 0);`
`1853`	`1853`	`memcpy(ZSTR_VAL(result_str), Z_STRVAL_P(op1), op1_len);`
`1854`	`1854`	`if (result == orig_op1) {`
`1855`		`- i_zval_ptr_dtor(result ZEND_FILE_LINE_CC);`
	`1855`	`+ i_zval_ptr_dtor(result);`
`1856`	`1856`	`}`
`1857`	`1857`	`}`
`1858`	`1858`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ static void ZEND_FASTCALL zend_string_destroy(zend_string *str)`
`76`	`76`
`77`	`77`	`static void ZEND_FASTCALL zend_reference_destroy(zend_reference *ref)`
`78`	`78`	`{`
`79`		`- i_zval_ptr_dtor(&ref->val ZEND_FILE_LINE_CC);`
	`79`	`+ i_zval_ptr_dtor(&ref->val);`
`80`	`80`	`efree_size(ref, sizeof(zend_reference));`
`81`	`81`	`}`
`82`	`82`
`@@ -108,7 +108,7 @@ static void ZEND_FASTCALL zend_ast_ref_destroy_wrapper(zend_ast_ref *ast)`
`108`	`108`
`109`	`109`	`ZEND_API void zval_ptr_dtor(zval zval_ptr) / {{{ */`
`110`	`110`	`{`
`111`		`- i_zval_ptr_dtor(zval_ptr ZEND_FILE_LINE_CC);`
	`111`	`+ i_zval_ptr_dtor(zval_ptr);`
`112`	`112`	`}`
`113`	`113`	`/* }}} */`
`114`	`114`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ static zend_always_inline void zval_ptr_dtor_nogc(zval *zval_ptr)`
`36`	`36`	`}`
`37`	`37`	`}`
`38`	`38`
`39`		`-static zend_always_inline void i_zval_ptr_dtor(zval *zval_ptr ZEND_FILE_LINE_DC)`
	`39`	`+static zend_always_inline void i_zval_ptr_dtor(zval *zval_ptr)`
`40`	`40`	`{`
`41`	`41`	`if (Z_REFCOUNTED_P(zval_ptr)) {`
`42`	`42`	`zend_refcounted *ref = Z_COUNTED_P(zval_ptr);`