- In any case create the free opcode. Need to allow the functions to

  create a hint.

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 8e37655b6ab9fdc2dd7ba7ba383b87358b7982a9..9955453190aa24cee57cca18fb3135ee525945a6 100644 (file)
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -622,17 +622,16 @@ 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 *opline = &CG(active_op_array)->opcodes[CG(active_op_array)->last-1];
-
-               if ((opline->opcode == ZEND_DO_FCALL) || (opline->opcode == ZEND_DO_FCALL_BY_NAME)) {
-                       opline->result.u.EA.type |= EXT_TYPE_UNUSED;
-               } else {
-                       zend_op *opline = get_next_op(CG(active_op_array) CLS_CC);
+               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);
 
-                       opline->opcode = ZEND_FREE;
-                       opline->op1 = *op1;
-                       SET_UNUSED(opline->op2);
+               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_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];