com php-src: Merge branch 'PHP-7.0': Zend/zend_compile.c ext/standard/array.c
| From: | Xinchen Hui | Date: | Thu, 17 Mar 2016 14:51:26 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.0': Zend/zend_compile.c ext/standard/array.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-91401@lists.php.net to get a copy of this message | ||
Commit: f2b6b261893f5b3448afb7cff6cf859a4d82a0de
Author: Xinchen Hui <laruence@gmail.com> Thu, 17 Mar 2016 07:45:19 -0700
Parents: e8e9ffdeb201659f63af48eb4a192b4f5e0eaf44 345ecd9822820a54134bd53a6e449e1f22612e19
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f2b6b261893f5b3448afb7cff6cf859a4d82a0de
Log:
Merge branch 'PHP-7.0'
Conflicts:
Zend/zend_compile.c
Changed paths:
MM Zend/zend_compile.c
MM ext/standard/array.c
Diff:
diff --cc Zend/zend_compile.c
index af3427b,1d7cd36..d05872e
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@@ -750,13 -656,22 +767,13 @@@ void zend_do_free(znode *op1) /* {{{ *
if (opline->opcode == ZEND_FETCH_LIST &&
opline->op1_type == IS_VAR &&
opline->op1.var == op1->u.op.var) {
- opline = get_next_op(CG(active_op_array));
-
- opline->opcode = ZEND_FREE;
- SET_NODE(opline->op1, op1);
- SET_UNUSED(opline->op2);
+ zend_emit_op(NULL, ZEND_FREE, op1, NULL);
return;
}
- if (opline->result_type==IS_VAR
+ if (opline->result_type == IS_VAR
&& opline->result.var == op1->u.op.var) {
if (opline->opcode == ZEND_NEW) {
- opline->result_type |= EXT_TYPE_UNUSED;
- opline = &CG(active_op_array)->opcodes[CG(active_op_array)->last-1];
- while (opline->opcode != ZEND_DO_FCALL || opline->op1.num != ZEND_CALL_CTOR) {
- opline--;
- }
- opline->op1.num |= ZEND_CALL_CTOR_RESULT_UNUSED;
+ zend_emit_op(NULL, ZEND_FREE, op1, NULL);
}
break;
}
@@@ -6451,7 -6067,7 +6468,7 @@@ void zend_compile_short_circuiting(znod
zval_ptr_dtor(&right_node.u..constant);
} else {
-- zend_emit_op(result, ZEND_BOOL, &right_node, NULL);
++ zend_emit_op_tmp(result, ZEND_BOOL, &right_node, NULL);
}
}