com php-src: Use cheaper SEPARATE macros: ext/mbstring/mbstring.c ext/standard/array.c

From: Date: Thu, 07 Dec 2017 19:35:17 +0000
Subject: com php-src: Use cheaper SEPARATE macros: ext/mbstring/mbstring.c ext/standard/array.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-100526@lists.php.net to get a copy of this message
Commit: 185478d07e64630fcbc24609aad12a84bce87ec9 Author: Dmitry Stogov <dmitry@zend.com> Thu, 7 Dec 2017 22:35:17 +0300 Parents: 583050eda31d6ef0fa52e1e534fffbe8973c7120 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=185478d07e64630fcbc24609aad12a84bce87ec9 Log: Use cheaper SEPARATE macros Changed paths: M ext/mbstring/mbstring.c M ext/standard/array.c Diff: diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c index e9b6d4a..7b3297b 100644 --- a/ext/mbstring/mbstring.c +++ b/ext/mbstring/mbstring.c @@ -3734,7 +3734,9 @@ static int mb_recursive_convert_variable(mbfl_buffer_converter *convd, zval *var efree(ret->val); } } else if (Z_TYPE_P(var) == IS_ARRAY || Z_TYPE_P(var) == IS_OBJECT) { - SEPARATE_ZVAL_NOREF(var); + if (Z_TYPE_P(var) == IS_ARRAY) { + SEPARATE_ARRAY(var); + } if (Z_REFCOUNTED_P(var)) { if (Z_IS_RECURSIVE_P(var)) { return 1; diff --git a/ext/standard/array.c b/ext/standard/array.c index 7e927d8..dfeaef8 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -2467,7 +2467,7 @@ PHP_FUNCTION(extract) extract_refs = (extract_type & EXTR_REFS); if (extract_refs) { - SEPARATE_ZVAL(var_array_param); + SEPARATE_ZVAL_NOREF(var_array_param); } extract_type &= 0xff;

« previous php.cvs (#100526) next »