From: Dmitry Stogov <dmitry@zend.com>
Date: Mon, 8 Jul 2019 11:13:02 +0000 (+0300)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0e5ecc7a8fec52ec6eb67b150b5bc7e4e3fd79b1;p=php

Merge branch 'PHP-7.4'

* PHP-7.4:
  Delay EG(exception) check on slow path
---

0e5ecc7a8fec52ec6eb67b150b5bc7e4e3fd79b1
diff --cc Zend/zend_API.c
index 1d33de34fe,2e8fabfcc6..45259d3f2c
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@@ -213,17 -254,57 +213,25 @@@ ZEND_API ZEND_COLD void ZEND_FASTCALL z
  		NULL
  	};
  
+ 	if (EG(exception)) {
+ 		return;
+ 	}
+ 	class_name = get_active_class_name(&space);
 -	zend_internal_type_error(ZEND_ARG_USES_STRICT_TYPES(), "%s%s%s() expects parameter %d to be %s, %s given",
 -		class_name, space, get_active_function_name(), num, expected_error[expected_type], zend_zval_type_name(arg));
 -}
 -/* }}} */
 -
 -ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameter_type_exception(int num, zend_expected_type expected_type, zval *arg) /* {{{ */
 -{
 -	const char *space;
 -	const char *class_name;
 -	static const char * const expected_error[] = {
 -		Z_EXPECTED_TYPES(Z_EXPECTED_TYPE_STR)
 -		NULL
 -	};
 -
 -	if (EG(exception)) {
 -		return;
 -	}
 -	class_name = get_active_class_name(&space);
 -	zend_internal_type_error(1, "%s%s%s() expects parameter %d to be %s, %s given",
 +	zend_type_error("%s%s%s() expects parameter %d to be %s, %s given",
  		class_name, space, get_active_function_name(), num, expected_error[expected_type], zend_zval_type_name(arg));
  }
  /* }}} */
  
 -ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameter_class_error(int num, char *name, zval *arg) /* {{{ */
 -{
 -	const char *space;
 -	const char *class_name;
 -
 -	if (EG(exception)) {
 -		return;
 -	}
 -	class_name = get_active_class_name(&space);
 -	zend_internal_type_error(ZEND_ARG_USES_STRICT_TYPES(), "%s%s%s() expects parameter %d to be %s, %s given",
 -		class_name, space, get_active_function_name(), num, name, zend_zval_type_name(arg));
 -}
 -/* }}} */
 -
 -ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameter_class_exception(int num, char *name, zval *arg) /* {{{ */
 +ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameter_class_error(int num, const char *name, zval *arg) /* {{{ */
  {
  	const char *space;
- 	const char *class_name = get_active_class_name(&space);
+ 	const char *class_name;
  
+ 	if (EG(exception)) {
+ 		return;
+ 	}
+ 	class_name = get_active_class_name(&space);
 -	zend_internal_type_error(1, "%s%s%s() expects parameter %d to be %s, %s given",
 +	zend_type_error("%s%s%s() expects parameter %d to be %s, %s given",
  		class_name, space, get_active_function_name(), num, name, zend_zval_type_name(arg));
  }
  /* }}} */
@@@ -231,9 -312,39 +239,13 @@@
  ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_callback_error(int num, char *error) /* {{{ */
  {
  	const char *space;
- 	const char *class_name = get_active_class_name(&space);
+ 	const char *class_name;
  
+ 	if (EG(exception)) {
+ 		return;
+ 	}
+ 	class_name = get_active_class_name(&space);
 -	zend_internal_type_error(ZEND_ARG_USES_STRICT_TYPES(), "%s%s%s() expects parameter %d to be a valid callback, %s",
 -		class_name, space, get_active_function_name(), num, error);
 -	efree(error);
 -}
 -/* }}} */
 -
 -ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_callback_exception(int num, char *error) /* {{{ */
 -{
 -	const char *space;
 -	const char *class_name;
 -
 -	if (EG(exception)) {
 -		return;
 -	}
 -	class_name = get_active_class_name(&space);
 -	zend_internal_type_error(1, "%s%s%s() expects parameter %d to be a valid callback, %s",
 -		class_name, space, get_active_function_name(), num, error);
 -	efree(error);
 -}
 -/* }}} */
 -
 -ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_callback_deprecated(int num, char *error) /* {{{ */
 -{
 -	const char *space;
 -	const char *class_name = get_active_class_name(&space);
 -
 -	zend_error(E_DEPRECATED, "%s%s%s() expects parameter %d to be a valid callback, %s",
 +	zend_type_error("%s%s%s() expects parameter %d to be a valid callback, %s",
  		class_name, space, get_active_function_name(), num, error);
  	efree(error);
  }
diff --cc Zend/zend_API.h
index f77a8e6748,e78ba92595..18c06158e1
--- a/Zend/zend_API.h
+++ b/Zend/zend_API.h
@@@ -1171,13 -1184,25 +1171,13 @@@ ZEND_API ZEND_COLD void ZEND_FASTCALL z
  #define ZEND_PARSE_PARAMETERS_END_EX(failure) \
  		} while (0); \
  		if (UNEXPECTED(_error_code != ZPP_ERROR_OK)) { \
- 			if (!(_flags & ZEND_PARSE_PARAMS_QUIET) && !EG(exception)) { \
+ 			if (!(_flags & ZEND_PARSE_PARAMS_QUIET)) { \
  				if (_error_code == ZPP_ERROR_WRONG_CALLBACK) { \
 -					if (_flags & ZEND_PARSE_PARAMS_THROW) { \
 -						zend_wrong_callback_exception(_i, _error); \
 -					} else { \
 -						zend_wrong_callback_error(_i, _error); \
 -					} \
 +					zend_wrong_callback_error(_i, _error); \
  				} else if (_error_code == ZPP_ERROR_WRONG_CLASS) { \
 -					if (_flags & ZEND_PARSE_PARAMS_THROW) { \
 -						zend_wrong_parameter_class_exception(_i, _error, _arg); \
 -					} else { \
 -						zend_wrong_parameter_class_error(_i, _error, _arg); \
 -					} \
 +					zend_wrong_parameter_class_error(_i, _error, _arg); \
  				} else if (_error_code == ZPP_ERROR_WRONG_ARG) { \
 -					if (_flags & ZEND_PARSE_PARAMS_THROW) { \
 -						zend_wrong_parameter_type_exception(_i, _expected_type, _arg); \
 -					} else { \
 -						zend_wrong_parameter_type_error(_i, _expected_type, _arg); \
 -					} \
 +					zend_wrong_parameter_type_error(_i, _expected_type, _arg); \
  				} \
  			} \
  			failure; \