Micro optimization

laruence · laruence · commit f75308eda1b4 · 2015-06-20T10:52:58.000+08:00
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -2750,7 +2750,7 @@ PHPAPI int php_array_replace_recursive(HashTable dest, HashTable src) /* {{{ *`
`2750`	`2750`	`}`
`2751`	`2751`	`/* }}} */`
`2752`	`2752`
`2753`		`-static void php_array_merge_or_replace_wrapper(INTERNAL_FUNCTION_PARAMETERS, int recursive, int replace) /* {{{ */`
	`2753`	`+static inline void php_array_merge_or_replace_wrapper(INTERNAL_FUNCTION_PARAMETERS, int recursive, int replace) /* {{{ */`
`2754`	`2754`	`{`
`2755`	`2755`	`zval *args = NULL;`
`2756`	`2756`	`zval *arg;`
`@@ -2989,7 +2989,7 @@ PHP_FUNCTION(array_values)`
`2989`	`2989`	`/* Go through input array and add values to the return array */`
`2990`	`2990`	`ZEND_HASH_FILL_PACKED(Z_ARRVAL_P(return_value)) {`
`2991`	`2991`	`ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(input), entry) {`
`2992`		`- if (Z_ISREF_P(entry) && Z_REFCOUNT_P(entry) == 1) {`
	`2992`	`+ if (UNEXPECTED(Z_ISREF_P(entry) && Z_REFCOUNT_P(entry) == 1)) {`
`2993`	`2993`	`entry = Z_REFVAL_P(entry);`
`2994`	`2994`	`}`
`2995`	`2995`	`Z_TRY_ADDREF_P(entry);`