objects may be nested in array operands

dstogov · dstogov · commit 0972a2163643 · 2017-07-14T11:22:36.000+03:00
diff --git a/ext/opcache/Optimizer/zend_inference.c b/ext/opcache/Optimizer/zend_inference.c
@@ -4100,7 +4100,7 @@ int zend_may_throw(const zend_op *opline, zend_op_array *op_array, zend_ssa *ssa
 			 || (t2 & MAY_BE_ANY) == MAY_BE_NULL) {
 				return 0;
 			}
-			return (t1 & MAY_BE_OBJECT) || (t2 & MAY_BE_OBJECT);
+			return (t1 & (MAY_BE_OBJECT|MAY_BE_ARRAY_OF_ARRAY|MAY_BE_ARRAY_OF_OBJECT)) || (t2 & (MAY_BE_OBJECT|MAY_BE_ARRAY_OF_ARRAY|MAY_BE_ARRAY_OF_OBJECT));
 		case ZEND_ASSIGN_ADD:
 			if (opline->extended_value != 0) {
 				return 1;

Original file line number	Diff line number	Diff line change
`@@ -4100,7 +4100,7 @@ int zend_may_throw(const zend_op opline, zend_op_array op_array, zend_ssa *ssa`
`4100`	`4100`	`\|\| (t2 & MAY_BE_ANY) == MAY_BE_NULL) {`
`4101`	`4101`	`return 0;`
`4102`	`4102`	`}`
`4103`		`- return (t1 & MAY_BE_OBJECT) \|\| (t2 & MAY_BE_OBJECT);`
	`4103`	`+ return (t1 & (MAY_BE_OBJECT\|MAY_BE_ARRAY_OF_ARRAY\|MAY_BE_ARRAY_OF_OBJECT)) \|\| (t2 & (MAY_BE_OBJECT\|MAY_BE_ARRAY_OF_ARRAY\|MAY_BE_ARRAY_OF_OBJECT));`
`4104`	`4104`	`case ZEND_ASSIGN_ADD:`
`4105`	`4105`	`if (opline->extended_value != 0) {`
`4106`	`4106`	`return 1;`