@@ -1316,7 +1316,6 @@ PHP_FUNCTION(min)
1316
1316
}
1317
1317
}
1318
1318
1319
- ZVAL_DEREF (min );
1320
1319
ZVAL_COPY (return_value , min );
1321
1320
}
1322
1321
}
@@ -1363,7 +1362,6 @@ PHP_FUNCTION(max)
1363
1362
}
1364
1363
}
1365
1364
1366
- ZVAL_DEREF (max );
1367
1365
ZVAL_COPY (return_value , max );
1368
1366
}
1369
1367
}
@@ -3812,7 +3810,6 @@ static inline void php_array_merge_or_replace_wrapper(INTERNAL_FUNCTION_PARAMETE
3812
3810
for (i = 0 ; i < argc ; i ++ ) {
3813
3811
zval * arg = args + i ;
3814
3812
3815
- ZVAL_DEREF (arg );
3816
3813
if (Z_TYPE_P (arg ) != IS_ARRAY ) {
3817
3814
php_error_docref (NULL , E_WARNING , "Argument #%d is not an array" , i + 1 );
3818
3815
RETURN_NULL ();
@@ -3825,19 +3822,16 @@ static inline void php_array_merge_or_replace_wrapper(INTERNAL_FUNCTION_PARAMETE
3825
3822
3826
3823
/* copy first array */
3827
3824
arg = args ;
3828
- ZVAL_DEREF (arg );
3829
3825
dest = zend_array_dup (Z_ARRVAL_P (arg ));
3830
3826
ZVAL_ARR (return_value , dest );
3831
3827
if (recursive ) {
3832
3828
for (i = 1 ; i < argc ; i ++ ) {
3833
3829
arg = args + i ;
3834
- ZVAL_DEREF (arg );
3835
3830
php_array_replace_recursive (dest , Z_ARRVAL_P (arg ));
3836
3831
}
3837
3832
} else {
3838
3833
for (i = 1 ; i < argc ; i ++ ) {
3839
3834
arg = args + i ;
3840
- ZVAL_DEREF (arg );
3841
3835
zend_hash_merge (dest , Z_ARRVAL_P (arg ), zval_add_ref , 1 );
3842
3836
}
3843
3837
}
@@ -3846,7 +3840,6 @@ static inline void php_array_merge_or_replace_wrapper(INTERNAL_FUNCTION_PARAMETE
3846
3840
HashTable * src , * dest ;
3847
3841
3848
3842
arg = args ;
3849
- ZVAL_DEREF (arg );
3850
3843
src = Z_ARRVAL_P (arg );
3851
3844
/* copy first array */
3852
3845
array_init_size (return_value , zend_hash_num_elements (src ));
@@ -3881,13 +3874,11 @@ static inline void php_array_merge_or_replace_wrapper(INTERNAL_FUNCTION_PARAMETE
3881
3874
if (recursive ) {
3882
3875
for (i = 1 ; i < argc ; i ++ ) {
3883
3876
arg = args + i ;
3884
- ZVAL_DEREF (arg );
3885
3877
php_array_merge_recursive (dest , Z_ARRVAL_P (arg ));
3886
3878
}
3887
3879
} else {
3888
3880
for (i = 1 ; i < argc ; i ++ ) {
3889
3881
arg = args + i ;
3890
- ZVAL_DEREF (arg );
3891
3882
php_array_merge (dest , Z_ARRVAL_P (arg ));
3892
3883
}
3893
3884
}
0 commit comments