diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-04-01 10:05:26 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-04-01 11:26:43 +0200 |
| commit | cdaf35033d29cdccbe8933afaa9f507b5c3176b6 (patch) | |
| tree | 23188bd41e6701709ea435528934cc4c766a4cf1 /Zend/zend_operators.c | |
| parent | 9c0afc859c9c678e6aaaed85ace6d11a1a0a2c5b (diff) | |
| download | php-git-cdaf35033d29cdccbe8933afaa9f507b5c3176b6.tar.gz | |
Improve "unsupported operands" error
By mentioning the operand types. We can do that now, as the
original operand types now remain available.
Closes GH-5330.
Diffstat (limited to 'Zend/zend_operators.c')
| -rw-r--r-- | Zend/zend_operators.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c index f3751ecb0d..b4be563bac 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -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); } |