Merge branch 'PHP-7.2'

* PHP-7.2:
  Fixed live_range removing (bug can be triggred by JIT)

Author: laruence

Zend/zend_compile.c

@@ -7844,7 +7844,7 @@ static void zend_compile_encaps_list(znode *result, zend_ast *ast) /* {{{ */
 		GET_NODE(result, opline->result);
 	} else {
 		uint32_t var;
-		uint32_t range = zend_start_live_range(CG(active_op_array), rope_init_lineno);
+		uint32_t range = zend_start_live_range(CG(active_op_array), rope_init_lineno + 1);
 
 		init_opline->extended_value = j;
 		opline->opcode = ZEND_ROPE_END;

ext/opcache/Optimizer/zend_optimizer.c

@@ -558,8 +558,8 @@ void zend_optimizer_remove_live_range_ex(zend_op_array *op_array, uint32_t var,
 	uint32_t i = 0;
 
 	while (i < op_array->last_live_range) {
-		if (op_array->live_range[i].var == var
-				&& op_array->live_range[i].start == start) {
+		if ((op_array->live_range[i].var & ~ZEND_LIVE_MASK) == var
+			&& op_array->live_range[i].start == start) {
 			op_array->last_live_range--;
 			if (i < op_array->last_live_range) {
 				memmove(&op_array->live_range[i], &op_array->live_range[i+1], (op_array->last_live_range - i) * sizeof(zend_live_range));