diff options
| author | Sara Golemon <pollita@php.net> | 2017-07-27 10:04:14 -0400 |
|---|---|---|
| committer | Sara Golemon <pollita@php.net> | 2017-07-27 10:04:14 -0400 |
| commit | b62fb3aa0c7968b9f478df355b18b7343efe87e0 (patch) | |
| tree | 6f1ab91e506a809c45561943dd6b9ac615dcadbd /Zend/zend_operators.c | |
| parent | 0ddda0dcb73502d33bc89696f0a625cbae35d2a3 (diff) | |
| parent | 34e5d3a87d0b0a01578754b646f50d01a087ba7c (diff) | |
| download | php-git-b62fb3aa0c7968b9f478df355b18b7343efe87e0.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Simpler fix for #74974
Diffstat (limited to 'Zend/zend_operators.c')
| -rw-r--r-- | Zend/zend_operators.c | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c index c08622084d..418d2f03ea 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -2166,16 +2166,6 @@ ZEND_API int ZEND_FASTCALL is_not_equal_function(zval *result, zval *op1, zval * ZEND_API int ZEND_FASTCALL is_smaller_function(zval *result, zval *op1, zval *op2) /* {{{ */ { - if (UNEXPECTED((Z_TYPE_P(op1) == IS_DOUBLE) && zend_isnan(Z_DVAL_P(op1)))) { - ZVAL_FALSE(result); - return SUCCESS; - } - - if (UNEXPECTED((Z_TYPE_P(op2) == IS_DOUBLE) && zend_isnan(Z_DVAL_P(op2)))) { - ZVAL_FALSE(result); - return SUCCESS; - } - if (compare_function(result, op1, op2) == FAILURE) { return FAILURE; } @@ -2186,16 +2176,6 @@ ZEND_API int ZEND_FASTCALL is_smaller_function(zval *result, zval *op1, zval *op ZEND_API int ZEND_FASTCALL is_smaller_or_equal_function(zval *result, zval *op1, zval *op2) /* {{{ */ { - if (UNEXPECTED((Z_TYPE_P(op1) == IS_DOUBLE) && isnan(Z_DVAL_P(op1)))) { - ZVAL_FALSE(result); - return SUCCESS; - } - - if (UNEXPECTED((Z_TYPE_P(op2) == IS_DOUBLE) && isnan(Z_DVAL_P(op2)))) { - ZVAL_FALSE(result); - return SUCCESS; - } - if (compare_function(result, op1, op2) == FAILURE) { return FAILURE; } |