Make ZEND_SHORT_CIRCUITING_CHAIN_ consts no bit flags

Author: iluuu1994

Zend/zend_compile.h

@@ -352,8 +352,9 @@ typedef struct _zend_oparray_context {
 /* call through internal function handler. e.g. Closure::invoke() */
 #define ZEND_ACC_CALL_VIA_HANDLER     ZEND_ACC_CALL_VIA_TRAMPOLINE
 
-#define ZEND_SHORT_CIRCUITING_CHAIN_ISSET (1 << 0)
-#define ZEND_SHORT_CIRCUITING_CHAIN_EMPTY (1 << 1)
+#define ZEND_SHORT_CIRCUITING_CHAIN_EXPR 0
+#define ZEND_SHORT_CIRCUITING_CHAIN_ISSET 1
+#define ZEND_SHORT_CIRCUITING_CHAIN_EMPTY 2
 
 char *zend_visibility_string(uint32_t fn_flags);
 

Zend/zend_vm_def.h

@@ -7042,7 +7042,7 @@ ZEND_VM_HOT_NOCONST_HANDLER(195, ZEND_JMP_NULL, CONST|TMPVAR|CV, JMP_ADDR)
 	} else {
 		zval *result = EX_VAR(opline->result.var);
 
-		if (EXPECTED(opline->extended_value == 0)) {
+		if (EXPECTED(opline->extended_value == ZEND_SHORT_CIRCUITING_CHAIN_EXPR)) {
 			ZVAL_NULL(result);
 		} else if (opline->extended_value == ZEND_SHORT_CIRCUITING_CHAIN_ISSET) {
 			ZVAL_BOOL(result, 0);

Zend/zend_vm_execute.h

@@ -4295,7 +4295,7 @@ static ZEND_VM_COLD ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_JMP_NULL_SPEC_CON
 	} else {
 		zval *result = EX_VAR(opline->result.var);
 
-		if (EXPECTED(opline->extended_value == 0)) {
+		if (EXPECTED(opline->extended_value == ZEND_SHORT_CIRCUITING_CHAIN_EXPR)) {
 			ZVAL_NULL(result);
 		} else if (opline->extended_value == ZEND_SHORT_CIRCUITING_CHAIN_ISSET) {
 			ZVAL_BOOL(result, 0);
@@ -13206,7 +13206,7 @@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_JMP_NULL_SPEC_TMPV
 	} else {
 		zval *result = EX_VAR(opline->result.var);
 
-		if (EXPECTED(opline->extended_value == 0)) {
+		if (EXPECTED(opline->extended_value == ZEND_SHORT_CIRCUITING_CHAIN_EXPR)) {
 			ZVAL_NULL(result);
 		} else if (opline->extended_value == ZEND_SHORT_CIRCUITING_CHAIN_ISSET) {
 			ZVAL_BOOL(result, 0);
@@ -36591,7 +36591,7 @@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_JMP_NULL_SPEC_CV_H
 	} else {
 		zval *result = EX_VAR(opline->result.var);
 
-		if (EXPECTED(opline->extended_value == 0)) {
+		if (EXPECTED(opline->extended_value == ZEND_SHORT_CIRCUITING_CHAIN_EXPR)) {
 			ZVAL_NULL(result);
 		} else if (opline->extended_value == ZEND_SHORT_CIRCUITING_CHAIN_ISSET) {
 			ZVAL_BOOL(result, 0);

ext/opcache/Optimizer/zend_inference.c

@@ -4363,6 +4363,7 @@ int zend_may_throw(const zend_op *opline, const zend_ssa_op *ssa_op, const zend_
 		case ZEND_FUNC_GET_ARGS:
 		case ZEND_COPY_TMP:
 		case ZEND_CHECK_FUNC_ARG:
+		case ZEND_JMP_NULL:
 			return 0;
 		case ZEND_INIT_FCALL:
 			/* can't throw, because call is resolved at compile time */
@@ -4426,7 +4427,6 @@ int zend_may_throw(const zend_op *opline, const zend_ssa_op *ssa_op, const zend_
 		case ZEND_JMPNZ_EX:
 		case ZEND_BOOL:
 		case ZEND_JMP_SET:
-		case ZEND_JMP_NULL:
 			return (t1 & MAY_BE_OBJECT);
 		case ZEND_BOOL_XOR:
 			return (t1 & MAY_BE_OBJECT) || (t2 & MAY_BE_OBJECT);