Merge branch 'master' into jit-dynasm

dstogov · dstogov · commit 2eb6e02e5b71 · 2017-08-17T20:04:53.000+03:00
* master:
  More accurate reference counting inference
diff --git a/ext/opcache/Optimizer/zend_inference.c b/ext/opcache/Optimizer/zend_inference.c
@@ -2978,13 +2978,10 @@ static int zend_update_type_info(const zend_op_array *op_array,
 						}
 						tmp |= MAY_BE_ARRAY | MAY_BE_RC1;
 					}
-					if (t1 & MAY_BE_STRING) {
-						tmp |= MAY_BE_RC1;
-					}
-					if (t1 & MAY_BE_ARRAY) {
+					if (t1 & (MAY_BE_STRING|MAY_BE_ARRAY)) {
 						tmp |= MAY_BE_RC1;
 						if (opline->opcode == ZEND_FETCH_DIM_FUNC_ARG) {
-							tmp |= MAY_BE_RCN;
+							tmp |= t1 & MAY_BE_RCN;
 						}
 					}
 					if (t1 & (MAY_BE_OBJECT|MAY_BE_RESOURCE)) {

Original file line number	Diff line number	Diff line change
`@@ -2978,13 +2978,10 @@ static int zend_update_type_info(const zend_op_array *op_array,`
`2978`	`2978`	`}`
`2979`	`2979`	`tmp \|= MAY_BE_ARRAY \| MAY_BE_RC1;`
`2980`	`2980`	`}`
`2981`		`- if (t1 & MAY_BE_STRING) {`
`2982`		`- tmp \|= MAY_BE_RC1;`
`2983`		`- }`
`2984`		`- if (t1 & MAY_BE_ARRAY) {`
	`2981`	`+ if (t1 & (MAY_BE_STRING\|MAY_BE_ARRAY)) {`
`2985`	`2982`	`tmp \|= MAY_BE_RC1;`
`2986`	`2983`	`if (opline->opcode == ZEND_FETCH_DIM_FUNC_ARG) {`
`2987`		`- tmp \|= MAY_BE_RCN;`
	`2984`	`+ tmp \|= t1 & MAY_BE_RCN;`
`2988`	`2985`	`}`
`2989`	`2986`	`}`
`2990`	`2987`	`if (t1 & (MAY_BE_OBJECT\|MAY_BE_RESOURCE)) {`