Handle ASSIGN_STATIC_PROP compound assign in SCCP

nikic · nikic · commit 882aabab2c07 · 2019-01-07T11:19:28.000+01:00
diff --git a/ext/opcache/Optimizer/sccp.c b/ext/opcache/Optimizer/sccp.c
@@ -1400,7 +1400,7 @@ static void sccp_visit_instr(scdf_ctx *scdf, zend_op *opline, zend_ssa_op *ssa_o
 			if (op2) {
 				SKIP_IF_TOP(op2);
 			}
-			if (!opline->extended_value) {
+			if (opline->extended_value == 0) {
 				if (zend_optimizer_eval_binary_op(&zv, zend_compound_assign_to_binary_op(opline->opcode), op1, op2) == SUCCESS) {
 					SET_RESULT(op1, &zv);
 					SET_RESULT(result, &zv);
@@ -1482,6 +1482,11 @@ static void sccp_visit_instr(scdf_ctx *scdf, zend_op *opline, zend_ssa_op *ssa_o
 						zval_ptr_dtor_nogc(&zv);
 					}
 				}
+			} else if (opline->extended_value == ZEND_ASSIGN_STATIC_PROP) {
+				SET_RESULT_BOT(result);
+				break;
+			} else {
+				ZEND_ASSERT(0 && "Invalid compound assignment kind");
 			}
 			SET_RESULT_BOT(result);
 			SET_RESULT_BOT(op1);

Original file line number	Diff line number	Diff line change
`@@ -1400,7 +1400,7 @@ static void sccp_visit_instr(scdf_ctx scdf, zend_op opline, zend_ssa_op *ssa_o`
`1400`	`1400`	`if (op2) {`
`1401`	`1401`	`SKIP_IF_TOP(op2);`
`1402`	`1402`	`}`
`1403`		`- if (!opline->extended_value) {`
	`1403`	`+ if (opline->extended_value == 0) {`
`1404`	`1404`	`if (zend_optimizer_eval_binary_op(&zv, zend_compound_assign_to_binary_op(opline->opcode), op1, op2) == SUCCESS) {`
`1405`	`1405`	`SET_RESULT(op1, &zv);`
`1406`	`1406`	`SET_RESULT(result, &zv);`
`@@ -1482,6 +1482,11 @@ static void sccp_visit_instr(scdf_ctx scdf, zend_op opline, zend_ssa_op *ssa_o`
`1482`	`1482`	`zval_ptr_dtor_nogc(&zv);`
`1483`	`1483`	`}`
`1484`	`1484`	`}`
	`1485`	`+ } else if (opline->extended_value == ZEND_ASSIGN_STATIC_PROP) {`
	`1486`	`+ SET_RESULT_BOT(result);`
	`1487`	`+ break;`
	`1488`	`+ } else {`
	`1489`	`+ ZEND_ASSERT(0 && "Invalid compound assignment kind");`
`1485`	`1490`	`}`
`1486`	`1491`	`SET_RESULT_BOT(result);`
`1487`	`1492`	`SET_RESULT_BOT(op1);`