archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Improve "unsupported operands" error

Browse source 
By mentioning the operand types. We can do that now, as the
original operand types now remain available.

Closes GH-5330.
This commit is contained in:
Nikita Popov 2020-04-01 10:05:26 +02:00
parent 9c0afc859c
commit cdaf35033d
16 changed files with 50 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Zend/zend_operators.c
View file

@ -939,6 +939,16 @@ ZEND_API zend_string* ZEND_FASTCALL zval_try_get_string_func(zval *op) /* {{{ */
}
/* }}} */
static ZEND_COLD zend_never_inline void ZEND_FASTCALL zend_binop_error(
const char *operator, zval *op1, zval *op2) {
if (EG(exception)) {
return;
}
zend_type_error("Unsupported operand types: %s %s %s",
zend_get_type_by_const(Z_TYPE_P(op1)), operator, zend_get_type_by_const(Z_TYPE_P(op2)));
}
static zend_never_inline void ZEND_FASTCALL add_function_array(zval *result, zval *op1, zval *op2) /* {{{ */
{
if ((result == op1) && (result == op2)) {
@ -991,9 +1001,7 @@ static zend_never_inline int ZEND_FASTCALL add_function_slow(zval *result, zval
zval op1_copy, op2_copy;
if (UNEXPECTED(zendi_try_convert_scalar_to_number(op1, &op1_copy) == FAILURE)
|| UNEXPECTED(zendi_try_convert_scalar_to_number(op2, &op2_copy) == FAILURE)) {
if (!EG(exception)) {
zend_throw_error(NULL, "Unsupported operand types");
}
zend_binop_error("+", op1, op2);
if (result != op1) {
ZVAL_UNDEF(result);
}
@ -1056,9 +1064,7 @@ static zend_never_inline int ZEND_FASTCALL sub_function_slow(zval *result, zval
zval op1_copy, op2_copy;
if (UNEXPECTED(zendi_try_convert_scalar_to_number(op1, &op1_copy) == FAILURE)
|| UNEXPECTED(zendi_try_convert_scalar_to_number(op2, &op2_copy) == FAILURE)) {
if (!EG(exception)) {
zend_throw_error(NULL, "Unsupported operand types");
}
zend_binop_error("-", op1, op2);
if (result != op1) {
ZVAL_UNDEF(result);
}
@ -1125,9 +1131,7 @@ static zend_never_inline int ZEND_FASTCALL mul_function_slow(zval *result, zval
zval op1_copy, op2_copy;
if (UNEXPECTED(zendi_try_convert_scalar_to_number(op1, &op1_copy) == FAILURE)
|| UNEXPECTED(zendi_try_convert_scalar_to_number(op2, &op2_copy) == FAILURE)) {
if (!EG(exception)) {
zend_throw_error(NULL, "Unsupported operand types");
}
zend_binop_error("*", op1, op2);
if (result != op1) {
ZVAL_UNDEF(result);
}
@ -1226,9 +1230,7 @@ ZEND_API int ZEND_FASTCALL pow_function(zval *result, zval *op1, zval *op2) /* {
zval op1_copy, op2_copy;
if (UNEXPECTED(zendi_try_convert_scalar_to_number(op1, &op1_copy) == FAILURE)
|| UNEXPECTED(zendi_try_convert_scalar_to_number(op2, &op2_copy) == FAILURE)) {
if (!EG(exception)) {
zend_throw_error(NULL, "Unsupported operand types");
}
zend_binop_error("**", op1, op2);
if (result != op1) {
ZVAL_UNDEF(result);
}
@ -1306,9 +1308,7 @@ ZEND_API int ZEND_FASTCALL div_function(zval *result, zval *op1, zval *op2) /* {
zval op1_copy, op2_copy;
if (UNEXPECTED(zendi_try_convert_scalar_to_number(op1, &op1_copy) == FAILURE)
|| UNEXPECTED(zendi_try_convert_scalar_to_number(op2, &op2_copy) == FAILURE)) {
if (!EG(exception)) {
zend_throw_error(NULL, "Unsupported operand types");
}
zend_binop_error("/", op1, op2);
if (result != op1) {
ZVAL_UNDEF(result);
}