php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-02 21:52:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

- Fix @expr

Browse Source
This commit is contained in:
Zeev Suraski
1999-12-20 20:01:19 +00:00
parent 1ad5180f28
commit a2cc070fc2
1 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Zend/zend_compile.c
View File

@@ -633,20 +633,17 @@ void do_add_variable(znode *result, znode *op1, znode *op2 CLS_DC)
void do_free(znode *op1 CLS_DC)
{
if (op1->op_type==IS_TMP_VAR) {
zend_op *last_opline = &CG(active_op_array)->opcodes[CG(active_op_array)->last-1];
zend_op *opline = get_next_op(CG(active_op_array) CLS_CC);
if ((last_opline->opcode == ZEND_DO_FCALL) || (last_opline->opcode == ZEND_DO_FCALL_BY_NAME)) {
last_opline->result.u.EA.type |= EXT_TYPE_UNUSED;
} else {
zend_op *opline = get_next_op(CG(active_op_array) CLS_CC);
opline->opcode = ZEND_FREE;
opline->op1 = *op1;
SET_UNUSED(opline->op2);
}
opline->opcode = ZEND_FREE;
opline->op1 = *op1;
SET_UNUSED(opline->op2);
} else if (op1->op_type==IS_VAR) {
zend_op *opline = &CG(active_op_array)->opcodes[CG(active_op_array)->last-1];
if (opline->opcode == ZEND_END_SILENCE) {
opline--;
}
if (opline->result.op_type == op1->op_type
&& opline->result.u.var == op1->u.var) {
opline->result.u.EA.type |= EXT_TYPE_UNUSED;
@@ -2060,13 +2057,8 @@ void do_begin_silence(znode *strudel_token CLS_DC)
void do_end_silence(znode *strudel_token CLS_DC)
{
zend_op *last_opline = &CG(active_op_array)->opcodes[CG(active_op_array)->last-1];
zend_op *opline = get_next_op(CG(active_op_array) CLS_CC);
if ((last_opline->opcode == ZEND_DO_FCALL) || (last_opline->opcode == ZEND_DO_FCALL_BY_NAME)) {
last_opline->result.u.EA.type |= EXT_TYPE_UNUSED;
}
opline->opcode = ZEND_END_SILENCE;
opline->op1 = *strudel_token;
SET_UNUSED(opline->op2);