Skip to content

Commit 03846af

Browse files
committed
Fix clang build
1 parent 1e06a8e commit 03846af

File tree

2 files changed

+78
-78
lines changed

2 files changed

+78
-78
lines changed

Zend/zend_vm_def.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2007,7 +2007,7 @@ ZEND_VM_HOT_OBJ_HANDLER(82, ZEND_FETCH_OBJ_R, CONST|TMPVAR|UNUSED|THIS|CV, CONST
20072007
if (EXPECTED(IS_VALID_PROPERTY_OFFSET(prop_offset))) {
20082008
retval = OBJ_PROP(zobj, prop_offset);
20092009
if (EXPECTED(Z_TYPE_INFO_P(retval) != IS_UNDEF)) {
2010-
if (!ZEND_VM_SPEC || (OP1_TYPE & (IS_TMP_VAR|IS_VAR))) {
2010+
if (!ZEND_VM_SPEC || (OP1_TYPE & (IS_TMP_VAR|IS_VAR)) != 0) {
20112011
ZEND_VM_C_GOTO(fetch_obj_r_copy);
20122012
} else {
20132013
ZEND_VM_C_LABEL(fetch_obj_r_fast_copy):
@@ -2028,7 +2028,7 @@ ZEND_VM_C_LABEL(fetch_obj_r_fast_copy):
20282028
EXPECTED(p->key != NULL) &&
20292029
EXPECTED(zend_string_equal_content(p->key, Z_STR_P(offset)))))) {
20302030
retval = &p->val;
2031-
if (!ZEND_VM_SPEC || (OP1_TYPE & (IS_TMP_VAR|IS_VAR))) {
2031+
if (!ZEND_VM_SPEC || (OP1_TYPE & (IS_TMP_VAR|IS_VAR)) != 0) {
20322032
ZEND_VM_C_GOTO(fetch_obj_r_copy);
20332033
} else {
20342034
ZEND_VM_C_GOTO(fetch_obj_r_fast_copy);
@@ -2041,7 +2041,7 @@ ZEND_VM_C_LABEL(fetch_obj_r_fast_copy):
20412041
if (EXPECTED(retval)) {
20422042
uintptr_t idx = (char*)retval - (char*)zobj->properties->arData;
20432043
CACHE_PTR_EX(cache_slot + 1, (void*)ZEND_ENCODE_DYN_PROP_OFFSET(idx));
2044-
if (!ZEND_VM_SPEC || (OP1_TYPE & (IS_TMP_VAR|IS_VAR))) {
2044+
if (!ZEND_VM_SPEC || (OP1_TYPE & (IS_TMP_VAR|IS_VAR)) != 0) {
20452045
ZEND_VM_C_GOTO(fetch_obj_r_copy);
20462046
} else {
20472047
ZEND_VM_C_GOTO(fetch_obj_r_fast_copy);
@@ -2163,7 +2163,7 @@ ZEND_VM_COLD_CONST_HANDLER(91, ZEND_FETCH_OBJ_IS, CONST|TMPVAR|UNUSED|THIS|CV, C
21632163
if (EXPECTED(IS_VALID_PROPERTY_OFFSET(prop_offset))) {
21642164
retval = OBJ_PROP(zobj, prop_offset);
21652165
if (EXPECTED(Z_TYPE_P(retval) != IS_UNDEF)) {
2166-
if (!ZEND_VM_SPEC || (OP1_TYPE & (IS_TMP_VAR|IS_VAR))) {
2166+
if (!ZEND_VM_SPEC || (OP1_TYPE & (IS_TMP_VAR|IS_VAR)) != 0) {
21672167
ZEND_VM_C_GOTO(fetch_obj_is_copy);
21682168
} else {
21692169
ZEND_VM_C_LABEL(fetch_obj_is_fast_copy):
@@ -2184,7 +2184,7 @@ ZEND_VM_C_LABEL(fetch_obj_is_fast_copy):
21842184
EXPECTED(p->key != NULL) &&
21852185
EXPECTED(zend_string_equal_content(p->key, Z_STR_P(offset)))))) {
21862186
retval = &p->val;
2187-
if (!ZEND_VM_SPEC || (OP1_TYPE & (IS_TMP_VAR|IS_VAR))) {
2187+
if (!ZEND_VM_SPEC || (OP1_TYPE & (IS_TMP_VAR|IS_VAR)) != 0) {
21882188
ZEND_VM_C_GOTO(fetch_obj_is_copy);
21892189
} else {
21902190
ZEND_VM_C_GOTO(fetch_obj_is_fast_copy);
@@ -2197,7 +2197,7 @@ ZEND_VM_C_LABEL(fetch_obj_is_fast_copy):
21972197
if (EXPECTED(retval)) {
21982198
uintptr_t idx = (char*)retval - (char*)zobj->properties->arData;
21992199
CACHE_PTR_EX(cache_slot + 1, (void*)ZEND_ENCODE_DYN_PROP_OFFSET(idx));
2200-
if (!ZEND_VM_SPEC || (OP1_TYPE & (IS_TMP_VAR|IS_VAR))) {
2200+
if (!ZEND_VM_SPEC || (OP1_TYPE & (IS_TMP_VAR|IS_VAR)) != 0) {
22012201
ZEND_VM_C_GOTO(fetch_obj_is_copy);
22022202
} else {
22032203
ZEND_VM_C_GOTO(fetch_obj_is_fast_copy);

0 commit comments

Comments
 (0)