From: Xinchen Hui <laruence@php.net>
Date: Sat, 20 Jun 2015 02:48:18 +0000 (+0800)
Subject: Micro optimization
X-Git-Tag: php-7.0.0alpha2~2^2~56
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f75308eda1b432ddf3d81e5378eceebf44658ffb;p=php

Micro optimization
---

diff --git a/ext/standard/array.c b/ext/standard/array.c
index a8e56c07cd..fdfb9107d9 100644
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -2750,7 +2750,7 @@ PHPAPI int php_array_replace_recursive(HashTable *dest, HashTable *src) /* {{{ *
 }
 /* }}} */
 
-static void php_array_merge_or_replace_wrapper(INTERNAL_FUNCTION_PARAMETERS, int recursive, int replace) /* {{{ */
+static inline void php_array_merge_or_replace_wrapper(INTERNAL_FUNCTION_PARAMETERS, int recursive, int replace) /* {{{ */
 {
 	zval *args = NULL;
 	zval *arg;
@@ -2989,7 +2989,7 @@ PHP_FUNCTION(array_values)
 	/* Go through input array and add values to the return array */
 	ZEND_HASH_FILL_PACKED(Z_ARRVAL_P(return_value)) {
 		ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(input), entry) {
-			if (Z_ISREF_P(entry) && Z_REFCOUNT_P(entry) == 1) {
+			if (UNEXPECTED(Z_ISREF_P(entry) && Z_REFCOUNT_P(entry) == 1)) {
 				entry = Z_REFVAL_P(entry);
 			}
 			Z_TRY_ADDREF_P(entry);