Make use of direct returns in some places

nikic · nikic · commit 47ee47099201 · 2013-08-31T13:16:50.000+02:00
diff --git a/Zend/zend_closures.c b/Zend/zend_closures.c
@@ -59,14 +59,8 @@ ZEND_METHOD(Closure, __invoke) /* {{{ */
 	} else if (call_user_function_ex(CG(function_table), NULL, this_ptr, &closure_result_ptr, ZEND_NUM_ARGS(), arguments, 1, NULL TSRMLS_CC) == FAILURE) {
 		RETVAL_FALSE;
 	} else if (closure_result_ptr) {
-		if (Z_ISREF_P(closure_result_ptr) && return_value_ptr) {
-			if (return_value) {
-				zval_ptr_dtor(&return_value);
-			}
-			*return_value_ptr = closure_result_ptr;
-		} else {
-			RETVAL_ZVAL(closure_result_ptr, 1, 1);
-		}
+		zval_ptr_dtor(&return_value);
+		*return_value_ptr = closure_result_ptr;
 	}
 	efree(arguments);
 
diff --git a/Zend/zend_generators.c b/Zend/zend_generators.c
@@ -430,7 +430,7 @@ ZEND_METHOD(Generator, current)
 	zend_generator_ensure_initialized(generator TSRMLS_CC);
 
 	if (generator->value) {
-		RETURN_ZVAL(generator->value, 1, 0);
+		RETURN_ZVAL_FAST(generator->value);
 	}
 }
 /* }}} */
@@ -450,7 +450,7 @@ ZEND_METHOD(Generator, key)
 	zend_generator_ensure_initialized(generator TSRMLS_CC);
 
 	if (generator->key) {
-		RETURN_ZVAL(generator->key, 1, 0);
+		RETURN_ZVAL_FAST(generator->key);
 	}
 }
 /* }}} */
@@ -499,7 +499,7 @@ ZEND_METHOD(Generator, send)
 	zend_generator_resume(generator TSRMLS_CC);
 
 	if (generator->value) {
-		RETURN_ZVAL(generator->value, 1, 0);
+		RETURN_ZVAL_FAST(generator->value);
 	}
 }
 /* }}} */
@@ -532,7 +532,7 @@ ZEND_METHOD(Generator, throw)
 		zend_generator_resume(generator TSRMLS_CC);
 
 		if (generator->value) {
-			RETURN_ZVAL(generator->value, 1, 0);
+			RETURN_ZVAL_FAST(generator->value);
 		}
 	} else {
 		/* If the generator is already closed throw the exception in the
diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c
@@ -896,11 +896,8 @@ ZEND_API void zend_std_call_user_call(INTERNAL_FUNCTION_PARAMETERS) /* {{{ */
 	zend_call_method_with_2_params(&this_ptr, ce, &ce->__call, ZEND_CALL_FUNC_NAME, &method_result_ptr, method_name_ptr, method_args_ptr);
 
 	if (method_result_ptr) {
-		if (Z_ISREF_P(method_result_ptr) || Z_REFCOUNT_P(method_result_ptr) > 1) {
-			RETVAL_ZVAL(method_result_ptr, 1, 1);
-		} else {
-			RETVAL_ZVAL(method_result_ptr, 0, 1);
-		}
+		RETVAL_ZVAL_FAST(method_result_ptr);
+		zval_ptr_dtor(&method_result_ptr);
 	}
 
 	/* now destruct all auxiliaries */
@@ -1113,11 +1110,8 @@ ZEND_API void zend_std_callstatic_user_call(INTERNAL_FUNCTION_PARAMETERS) /* {{{
 	zend_call_method_with_2_params(NULL, ce, &ce->__callstatic, ZEND_CALLSTATIC_FUNC_NAME, &method_result_ptr, method_name_ptr, method_args_ptr);
 
 	if (method_result_ptr) {
-		if (Z_ISREF_P(method_result_ptr) || Z_REFCOUNT_P(method_result_ptr) > 1) {
-			RETVAL_ZVAL(method_result_ptr, 1, 1);
-		} else {
-			RETVAL_ZVAL(method_result_ptr, 0, 1);
-		}
+		RETVAL_ZVAL_FAST(method_result_ptr);
+		zval_ptr_dtor(&method_result_ptr);
 	}
 
 	/* now destruct all auxiliaries */
diff --git a/ext/standard/array.c b/ext/standard/array.c
@@ -830,7 +830,7 @@ PHP_FUNCTION(end)
 			RETURN_FALSE;
 		}
 
-		RETURN_ZVAL(*entry, 1, 0);
+		RETURN_ZVAL_FAST(*entry);
 	}
 }
 /* }}} */
@@ -853,7 +853,7 @@ PHP_FUNCTION(prev)
 			RETURN_FALSE;
 		}
 
-		RETURN_ZVAL(*entry, 1, 0);
+		RETURN_ZVAL_FAST(*entry);
 	}
 }
 /* }}} */
@@ -876,7 +876,7 @@ PHP_FUNCTION(next)
 			RETURN_FALSE;
 		}
 
-		RETURN_ZVAL(*entry, 1, 0);
+		RETURN_ZVAL_FAST(*entry);
 	}
 }
 /* }}} */
@@ -899,7 +899,7 @@ PHP_FUNCTION(reset)
 			RETURN_FALSE;
 		}
 
-		RETURN_ZVAL(*entry, 1, 0);
+		RETURN_ZVAL_FAST(*entry);
 	}
 }
 /* }}} */
@@ -918,7 +918,8 @@ PHP_FUNCTION(current)
 	if (zend_hash_get_current_data(array, (void **) &entry) == FAILURE) {
 		RETURN_FALSE;
 	}
-	RETURN_ZVAL(*entry, 1, 0);
+
+	RETURN_ZVAL_FAST(*entry);
 }
 /* }}} */
 
@@ -958,7 +959,7 @@ PHP_FUNCTION(min)
 			RETVAL_NULL();
 		} else {
 			if (zend_hash_minmax(Z_ARRVAL_PP(args[0]), php_array_data_compare, 0, (void **) &result TSRMLS_CC) == SUCCESS) {
-				RETVAL_ZVAL(*result, 1, 0);
+				RETVAL_ZVAL_FAST(*result);
 			} else {
 				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Array must contain at least one element");
 				RETVAL_FALSE;
@@ -978,7 +979,7 @@ PHP_FUNCTION(min)
 			}
 		}
 
-		RETVAL_ZVAL(*min, 1, 0);	
+		RETVAL_ZVAL_FAST(*min);
 	}
 
 	if (args) {
@@ -1009,7 +1010,7 @@ PHP_FUNCTION(max)
 			RETVAL_NULL();
 		} else {
 			if (zend_hash_minmax(Z_ARRVAL_PP(args[0]), php_array_data_compare, 1, (void **) &result TSRMLS_CC) == SUCCESS) {
-				RETVAL_ZVAL(*result, 1, 0);
+				RETVAL_ZVAL_FAST(*result);
 			} else {
 				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Array must contain at least one element");
 				RETVAL_FALSE;
@@ -1029,7 +1030,7 @@ PHP_FUNCTION(max)
 			}
 		}
 
-		RETVAL_ZVAL(*max, 1, 0);
+		RETVAL_ZVAL_FAST(*max);
 	}
 	
 	if (args) {
@@ -1955,7 +1956,7 @@ static void _phpi_pop(INTERNAL_FUNCTION_PARAMETERS, int off_the_end)
 		zend_hash_internal_pointer_reset(Z_ARRVAL_P(stack));
 	}
 	zend_hash_get_current_data(Z_ARRVAL_P(stack), (void **)&val);
-	RETVAL_ZVAL(*val, 1, 0);
+	RETVAL_ZVAL_FAST(*val);
 
 	/* Delete the first or last value */
 	zend_hash_get_current_key_ex(Z_ARRVAL_P(stack), &key, &key_len, &index, 0, NULL);

Original file line number	Diff line number	Diff line change
`@@ -430,7 +430,7 @@ ZEND_METHOD(Generator, current)`
`430`	`430`	`zend_generator_ensure_initialized(generator TSRMLS_CC);`
`431`	`431`
`432`	`432`	`if (generator->value) {`
`433`		`- RETURN_ZVAL(generator->value, 1, 0);`
	`433`	`+ RETURN_ZVAL_FAST(generator->value);`
`434`	`434`	`}`
`435`	`435`	`}`
`436`	`436`	`/* }}} */`
`@@ -450,7 +450,7 @@ ZEND_METHOD(Generator, key)`
`450`	`450`	`zend_generator_ensure_initialized(generator TSRMLS_CC);`
`451`	`451`
`452`	`452`	`if (generator->key) {`
`453`		`- RETURN_ZVAL(generator->key, 1, 0);`
	`453`	`+ RETURN_ZVAL_FAST(generator->key);`
`454`	`454`	`}`
`455`	`455`	`}`
`456`	`456`	`/* }}} */`
`@@ -499,7 +499,7 @@ ZEND_METHOD(Generator, send)`
`499`	`499`	`zend_generator_resume(generator TSRMLS_CC);`
`500`	`500`
`501`	`501`	`if (generator->value) {`
`502`		`- RETURN_ZVAL(generator->value, 1, 0);`
	`502`	`+ RETURN_ZVAL_FAST(generator->value);`
`503`	`503`	`}`
`504`	`504`	`}`
`505`	`505`	`/* }}} */`
`@@ -532,7 +532,7 @@ ZEND_METHOD(Generator, throw)`
`532`	`532`	`zend_generator_resume(generator TSRMLS_CC);`
`533`	`533`
`534`	`534`	`if (generator->value) {`
`535`		`- RETURN_ZVAL(generator->value, 1, 0);`
	`535`	`+ RETURN_ZVAL_FAST(generator->value);`
`536`	`536`	`}`
`537`	`537`	`} else {`
`538`	`538`	`/* If the generator is already closed throw the exception in the`
Original file line number	Diff line number	Diff line change
`@@ -830,7 +830,7 @@ PHP_FUNCTION(end)`
`830`	`830`	`RETURN_FALSE;`
`831`	`831`	`}`
`832`	`832`
`833`		`- RETURN_ZVAL(*entry, 1, 0);`
	`833`	`+ RETURN_ZVAL_FAST(*entry);`
`834`	`834`	`}`
`835`	`835`	`}`
`836`	`836`	`/* }}} */`
`@@ -853,7 +853,7 @@ PHP_FUNCTION(prev)`
`853`	`853`	`RETURN_FALSE;`
`854`	`854`	`}`
`855`	`855`
`856`		`- RETURN_ZVAL(*entry, 1, 0);`
	`856`	`+ RETURN_ZVAL_FAST(*entry);`
`857`	`857`	`}`
`858`	`858`	`}`
`859`	`859`	`/* }}} */`
`@@ -876,7 +876,7 @@ PHP_FUNCTION(next)`
`876`	`876`	`RETURN_FALSE;`
`877`	`877`	`}`
`878`	`878`
`879`		`- RETURN_ZVAL(*entry, 1, 0);`
	`879`	`+ RETURN_ZVAL_FAST(*entry);`
`880`	`880`	`}`
`881`	`881`	`}`
`882`	`882`	`/* }}} */`
`@@ -899,7 +899,7 @@ PHP_FUNCTION(reset)`
`899`	`899`	`RETURN_FALSE;`
`900`	`900`	`}`
`901`	`901`
`902`		`- RETURN_ZVAL(*entry, 1, 0);`
	`902`	`+ RETURN_ZVAL_FAST(*entry);`
`903`	`903`	`}`
`904`	`904`	`}`
`905`	`905`	`/* }}} */`
`@@ -918,7 +918,8 @@ PHP_FUNCTION(current)`
`918`	`918`	`if (zend_hash_get_current_data(array, (void **) &entry) == FAILURE) {`
`919`	`919`	`RETURN_FALSE;`
`920`	`920`	`}`
`921`		`- RETURN_ZVAL(*entry, 1, 0);`
	`921`	`+`
	`922`	`+ RETURN_ZVAL_FAST(*entry);`
`922`	`923`	`}`
`923`	`924`	`/* }}} */`
`924`	`925`
`@@ -958,7 +959,7 @@ PHP_FUNCTION(min)`
`958`	`959`	`RETVAL_NULL();`
`959`	`960`	`} else {`
`960`	`961`	`if (zend_hash_minmax(Z_ARRVAL_PP(args[0]), php_array_data_compare, 0, (void **) &result TSRMLS_CC) == SUCCESS) {`
`961`		`- RETVAL_ZVAL(*result, 1, 0);`
	`962`	`+ RETVAL_ZVAL_FAST(*result);`
`962`	`963`	`} else {`
`963`	`964`	`php_error_docref(NULL TSRMLS_CC, E_WARNING, "Array must contain at least one element");`
`964`	`965`	`RETVAL_FALSE;`
`@@ -978,7 +979,7 @@ PHP_FUNCTION(min)`
`978`	`979`	`}`
`979`	`980`	`}`
`980`	`981`
`981`		`- RETVAL_ZVAL(*min, 1, 0);`
	`982`	`+ RETVAL_ZVAL_FAST(*min);`
`982`	`983`	`}`
`983`	`984`
`984`	`985`	`if (args) {`
`@@ -1009,7 +1010,7 @@ PHP_FUNCTION(max)`
`1009`	`1010`	`RETVAL_NULL();`
`1010`	`1011`	`} else {`
`1011`	`1012`	`if (zend_hash_minmax(Z_ARRVAL_PP(args[0]), php_array_data_compare, 1, (void **) &result TSRMLS_CC) == SUCCESS) {`
`1012`		`- RETVAL_ZVAL(*result, 1, 0);`
	`1013`	`+ RETVAL_ZVAL_FAST(*result);`
`1013`	`1014`	`} else {`
`1014`	`1015`	`php_error_docref(NULL TSRMLS_CC, E_WARNING, "Array must contain at least one element");`
`1015`	`1016`	`RETVAL_FALSE;`
`@@ -1029,7 +1030,7 @@ PHP_FUNCTION(max)`
`1029`	`1030`	`}`
`1030`	`1031`	`}`
`1031`	`1032`
`1032`		`- RETVAL_ZVAL(*max, 1, 0);`
	`1033`	`+ RETVAL_ZVAL_FAST(*max);`
`1033`	`1034`	`}`
`1034`	`1035`
`1035`	`1036`	`if (args) {`
`@@ -1955,7 +1956,7 @@ static void _phpi_pop(INTERNAL_FUNCTION_PARAMETERS, int off_the_end)`
`1955`	`1956`	`zend_hash_internal_pointer_reset(Z_ARRVAL_P(stack));`
`1956`	`1957`	`}`
`1957`	`1958`	`zend_hash_get_current_data(Z_ARRVAL_P(stack), (void **)&val);`
`1958`		`- RETVAL_ZVAL(*val, 1, 0);`
	`1959`	`+ RETVAL_ZVAL_FAST(*val);`
`1959`	`1960`
`1960`	`1961`	`/* Delete the first or last value */`
`1961`	`1962`	`zend_hash_get_current_key_ex(Z_ARRVAL_P(stack), &key, &key_len, &index, 0, NULL);`