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

Merge branch 'PHP-7.2'

Browse source 
* PHP-7.2:
  Simpler fix for #74974
This commit is contained in:
Sara Golemon 2017-07-27 10:05:16 -04:00
commit 00bed31d9f
2 changed files with 1 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Zend/zend_operators.c
View file

@ -2174,16 +2174,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) /* {{{ */ 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) { if (compare_function(result, op1, op2) == FAILURE) {
return FAILURE; return FAILURE;
} }
@ -2194,16 +2184,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) /* {{{ */ 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) { if (compare_function(result, op1, op2) == FAILURE) {
return FAILURE; return FAILURE;
} }

2
Zend/zend_portability.h
View file

@ -476,7 +476,7 @@ static zend_always_inline double _zend_get_nan(void) /* {{{ */
#define ZEND_STRL(str) (str), (sizeof(str)-1) #define ZEND_STRL(str) (str), (sizeof(str)-1)
#define ZEND_STRS(str) (str), (sizeof(str)) #define ZEND_STRS(str) (str), (sizeof(str))
#define ZEND_NORMALIZE_BOOL(n) \ #define ZEND_NORMALIZE_BOOL(n) \
((n) ? (((n)>0) ? 1 : -1) : 0) ((n) ? (((n)<0) ? -1 : 1) : 0)
#define ZEND_TRUTH(x) ((x) ? 1 : 0) #define ZEND_TRUTH(x) ((x) ? 1 : 0)
#define ZEND_LOG_XOR(a, b) (ZEND_TRUTH(a) ^ ZEND_TRUTH(b)) #define ZEND_LOG_XOR(a, b) (ZEND_TRUTH(a) ^ ZEND_TRUTH(b))