diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2019-04-02 21:54:32 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2019-04-02 21:54:32 +0300 |
| commit | 672d80f5dcb12a06d200969b8159badd45a57c0d (patch) | |
| tree | 3d928624c0c206c84147c832ec0dabb9730cc787 | |
| parent | eb8a19c8adb4a2a864608235aa753cb21ad5971f (diff) | |
| download | php-git-672d80f5dcb12a06d200969b8159badd45a57c0d.tar.gz | |
Fixed clang compiler warnings
| -rw-r--r-- | ext/opcache/jit/zend_jit_x86.dasc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/ext/opcache/jit/zend_jit_x86.dasc b/ext/opcache/jit/zend_jit_x86.dasc index ab6a2de443..dbdaeda4d8 100644 --- a/ext/opcache/jit/zend_jit_x86.dasc +++ b/ext/opcache/jit/zend_jit_x86.dasc @@ -977,7 +977,7 @@ static void* dasm_labels[zend_lb_MAX]; || } || } || if (Z_MODE(dst_addr) == IS_MEM_ZVAL) { -|| if (((dst_info & MAY_BE_ANY) != (1<<Z_TYPE_P(zv))) || (dst_info & (MAY_BE_STRING|MAY_BE_ARRAY))) { +|| if (((dst_info & MAY_BE_ANY) != (1<<Z_TYPE_P(zv))) || (dst_info & (MAY_BE_STRING|MAY_BE_ARRAY)) != 0) { | SET_ZVAL_TYPE_INFO dst_addr, Z_TYPE_INFO_P(zv) || } || } @@ -1070,7 +1070,7 @@ static void* dasm_labels[zend_lb_MAX]; || } || } || if (Z_MODE(dst_addr) == IS_MEM_ZVAL) { -|| if (((dst_info & MAY_BE_ANY) != (1<<Z_TYPE_P(zv))) || (dst_info & (MAY_BE_STRING|MAY_BE_ARRAY))) { +|| if (((dst_info & MAY_BE_ANY) != (1<<Z_TYPE_P(zv))) || (dst_info & (MAY_BE_STRING|MAY_BE_ARRAY)) != 0) { | SET_ZVAL_TYPE_INFO dst_addr, Z_TYPE_INFO_P(zv) || } || } @@ -1133,7 +1133,7 @@ static void* dasm_labels[zend_lb_MAX]; || has_concrete_type(src_info & MAY_BE_ANY)) { || zend_uchar type = concrete_type(src_info); || if (Z_MODE(dst_addr) == IS_MEM_ZVAL) { -|| if (((dst_info & MAY_BE_ANY) != (1<<type)) || (dst_info & (MAY_BE_STRING|MAY_BE_ARRAY))) { +|| if (((dst_info & MAY_BE_ANY) != (1<<type)) || (dst_info & (MAY_BE_STRING|MAY_BE_ARRAY)) != 0) { | SET_ZVAL_TYPE_INFO dst_addr, type || } || } @@ -1220,7 +1220,7 @@ static void* dasm_labels[zend_lb_MAX]; || has_concrete_type(src_info & MAY_BE_ANY)) { || zend_uchar type = concrete_type(src_info); || if (Z_MODE(dst_addr) == IS_MEM_ZVAL) { -|| if (((dst_info & MAY_BE_ANY) != (1<<type)) || (dst_info & (MAY_BE_STRING|MAY_BE_ARRAY))) { +|| if (((dst_info & MAY_BE_ANY) != (1<<type)) || (dst_info & (MAY_BE_STRING|MAY_BE_ARRAY)) != 0) { | SET_ZVAL_TYPE_INFO dst_addr, type || } || } @@ -1427,7 +1427,7 @@ static void* dasm_labels[zend_lb_MAX]; | GC_DELREF FCARG1a || if (RC_MAY_BE_1(op_info)) { || if (RC_MAY_BE_N(op_info)) { -|| if (gc && RC_MAY_BE_N(op_info) && ((op_info) & (MAY_BE_REF|MAY_BE_ARRAY|MAY_BE_OBJECT))) { +|| if (gc && RC_MAY_BE_N(op_info) && ((op_info) & (MAY_BE_REF|MAY_BE_ARRAY|MAY_BE_OBJECT)) != 0) { | jnz >3 || } else { | jnz >4 @@ -1439,12 +1439,12 @@ static void* dasm_labels[zend_lb_MAX]; || } | // zval_dtor_func(r); | ZVAL_DTOR_FUNC op_info, opline -|| if (gc && RC_MAY_BE_N(op_info) && ((op_info) & (MAY_BE_REF|MAY_BE_ARRAY|MAY_BE_OBJECT))) { +|| if (gc && RC_MAY_BE_N(op_info) && ((op_info) & (MAY_BE_REF|MAY_BE_ARRAY|MAY_BE_OBJECT)) != 0) { | jmp >4 || } |3: || } -|| if (gc && RC_MAY_BE_N(op_info) && ((op_info) & (MAY_BE_REF|MAY_BE_ARRAY|MAY_BE_OBJECT))) { +|| if (gc && RC_MAY_BE_N(op_info) && ((op_info) & (MAY_BE_REF|MAY_BE_ARRAY|MAY_BE_OBJECT)) != 0) { || if ((op_info) & MAY_BE_REF) { || zend_jit_addr ref_addr = ZEND_ADDR_MEM_ZVAL(ZREG_FCARG1a, offsetof(zend_reference, val)); | IF_NOT_ZVAL_TYPE addr, IS_REFERENCE, >1 @@ -1455,11 +1455,11 @@ static void* dasm_labels[zend_lb_MAX]; | IF_GC_MAY_NOT_LEAK FCARG1a, eax, >4 | // gc_possible_root(Z_COUNTED_P(z)) | EXT_CALL gc_possible_root, r0 -|| if (cold && ((op_info) & ((MAY_BE_ANY|MAY_BE_UNDEF)-(MAY_BE_OBJECT|MAY_BE_RESOURCE)))) { +|| if (cold && ((op_info) & ((MAY_BE_ANY|MAY_BE_UNDEF)-(MAY_BE_OBJECT|MAY_BE_RESOURCE))) != 0) { | jmp >4 |.code || } -|| } else if (cold && ((op_info) & ((MAY_BE_ANY|MAY_BE_UNDEF)-(MAY_BE_OBJECT|MAY_BE_RESOURCE)))) { +|| } else if (cold && ((op_info) & ((MAY_BE_ANY|MAY_BE_UNDEF)-(MAY_BE_OBJECT|MAY_BE_RESOURCE))) != 0) { | jmp >4 |.code || } |