Merge branch 'master' into jit-dynasm

dstogov · dstogov · commit 238e18940b3e · 2017-05-24T23:38:16.000+03:00
* master:
  Optimizer support for ZEND_IN_ARRAY
diff --git a/ext/opcache/Optimizer/block_pass.c b/ext/opcache/Optimizer/block_pass.c
@@ -532,6 +532,7 @@ static void zend_optimize_block(zend_basic_block *block, zend_op_array *op_array
 							case ZEND_INSTANCEOF:
 							case ZEND_TYPE_CHECK:
 							case ZEND_DEFINED:
+							case ZEND_IN_ARRAY:
 								if (opline->opcode == ZEND_BOOL_NOT) {
 									break;
 								}
diff --git a/ext/opcache/Optimizer/zend_inference.c b/ext/opcache/Optimizer/zend_inference.c
@@ -2185,6 +2185,7 @@ static void zend_update_type_info(const zend_op_array *op_array,
 		case ZEND_ISSET_ISEMPTY_PROP_OBJ:
 		case ZEND_ISSET_ISEMPTY_STATIC_PROP:
 		case ZEND_ASSERT_CHECK:
+		case ZEND_IN_ARRAY:
 			UPDATE_SSA_TYPE(MAY_BE_FALSE|MAY_BE_TRUE, ssa_ops[i].result_def);
 			break;
 		case ZEND_CAST:

Original file line number	Diff line number	Diff line change
`@@ -532,6 +532,7 @@ static void zend_optimize_block(zend_basic_block block, zend_op_array op_array`
`532`	`532`	`case ZEND_INSTANCEOF:`
`533`	`533`	`case ZEND_TYPE_CHECK:`
`534`	`534`	`case ZEND_DEFINED:`
	`535`	`+ case ZEND_IN_ARRAY:`
`535`	`536`	`if (opline->opcode == ZEND_BOOL_NOT) {`
`536`	`537`	`break;`
`537`	`538`	`}`