Fix FE_FETCH_R_SIMPLE specialization

nikic · nikic · commit 48e31be7a335 · 2020-09-01T14:43:06.000+02:00
After a99d08b the type can include UNDEF. However, UNDEF can only reach FE_FREE, not FE_FETCH. As such, simply ignore this type.
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
@@ -9571,7 +9571,7 @@ ZEND_VM_HOT_TYPE_SPEC_HANDLER(ZEND_SEND_VAL_EX, op->op2_type == IS_UNUSED && op-
 	ZEND_VM_NEXT_OPCODE();
 }
 
-ZEND_VM_HOT_TYPE_SPEC_HANDLER(ZEND_FE_FETCH_R, op->op2_type == IS_CV && (op1_info & (MAY_BE_UNDEF|MAY_BE_ANY|MAY_BE_REF)) == MAY_BE_ARRAY, ZEND_FE_FETCH_R_SIMPLE, VAR, CV, JMP_ADDR, SPEC(RETVAL))
+ZEND_VM_HOT_TYPE_SPEC_HANDLER(ZEND_FE_FETCH_R, op->op2_type == IS_CV && (op1_info & (MAY_BE_ANY|MAY_BE_REF)) == MAY_BE_ARRAY, ZEND_FE_FETCH_R_SIMPLE, VAR, CV, JMP_ADDR, SPEC(RETVAL))
 {
 	USE_OPLINE
 	zval *array;
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
@@ -61967,7 +61967,7 @@ ZEND_API void ZEND_FASTCALL zend_vm_set_opcode_handler_ex(zend_op* op, uint32_t
 			}
 			break;
 		case ZEND_FE_FETCH_R:
-			if (op->op2_type == IS_CV && (op1_info & (MAY_BE_UNDEF|MAY_BE_ANY|MAY_BE_REF)) == MAY_BE_ARRAY) {
+			if (op->op2_type == IS_CV && (op1_info & (MAY_BE_ANY|MAY_BE_REF)) == MAY_BE_ARRAY) {
 				spec = 3421 | SPEC_RULE_RETVAL;
 			}
 			break;

Original file line number	Diff line number	Diff line change
`@@ -9571,7 +9571,7 @@ ZEND_VM_HOT_TYPE_SPEC_HANDLER(ZEND_SEND_VAL_EX, op->op2_type == IS_UNUSED && op-`
`9571`	`9571`	`ZEND_VM_NEXT_OPCODE();`
`9572`	`9572`	`}`
`9573`	`9573`
`9574`		`-ZEND_VM_HOT_TYPE_SPEC_HANDLER(ZEND_FE_FETCH_R, op->op2_type == IS_CV && (op1_info & (MAY_BE_UNDEF\|MAY_BE_ANY\|MAY_BE_REF)) == MAY_BE_ARRAY, ZEND_FE_FETCH_R_SIMPLE, VAR, CV, JMP_ADDR, SPEC(RETVAL))`
	`9574`	`+ZEND_VM_HOT_TYPE_SPEC_HANDLER(ZEND_FE_FETCH_R, op->op2_type == IS_CV && (op1_info & (MAY_BE_ANY\|MAY_BE_REF)) == MAY_BE_ARRAY, ZEND_FE_FETCH_R_SIMPLE, VAR, CV, JMP_ADDR, SPEC(RETVAL))`
`9575`	`9575`	`{`
`9576`	`9576`	`USE_OPLINE`
`9577`	`9577`	`zval *array;`
Original file line number	Diff line number	Diff line change
`@@ -61967,7 +61967,7 @@ ZEND_API void ZEND_FASTCALL zend_vm_set_opcode_handler_ex(zend_op* op, uint32_t`
`61967`	`61967`	`}`
`61968`	`61968`	`break;`
`61969`	`61969`	`case ZEND_FE_FETCH_R:`
`61970`		`- if (op->op2_type == IS_CV && (op1_info & (MAY_BE_UNDEF\|MAY_BE_ANY\|MAY_BE_REF)) == MAY_BE_ARRAY) {`
	`61970`	`+ if (op->op2_type == IS_CV && (op1_info & (MAY_BE_ANY\|MAY_BE_REF)) == MAY_BE_ARRAY) {`
`61971`	`61971`	`spec = 3421 \| SPEC_RULE_RETVAL;`
`61972`	`61972`	`}`
`61973`	`61973`	`break;`