]> granicus.if.org Git - php/commitdiff
Removed old executor
authorDmitry Stogov <dmitry@php.net>
Tue, 14 Jun 2005 12:55:48 +0000 (12:55 +0000)
committerDmitry Stogov <dmitry@php.net>
Tue, 14 Jun 2005 12:55:48 +0000 (12:55 +0000)
Zend/zend_vm_execute.h
Zend/zend_vm_gen.php

index 599be5534f6783a149c929e3c3a877884e82983c..4fa471003a8dad48e0cd2b318c2bf609df04ece1 100644 (file)
@@ -570,7 +570,7 @@ static int ZEND_FETCH_CLASS_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
        zval *class_name;
-       zend_free_op free_op2;
+       
 
 
        if (IS_CONST == IS_UNUSED) {
@@ -592,7 +592,6 @@ static int ZEND_FETCH_CLASS_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                        break;
        }
 
-       ;
        ZEND_VM_NEXT_OPCODE();
 }
 
@@ -609,7 +608,7 @@ static int ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_A
                char *function_name_strval;
                int function_name_strlen;
                zend_bool is_const = (IS_CONST == IS_CONST);
-               zend_free_op free_op2;
+               
 
                if (is_const) {
                        function_name_strval = opline->op2.u.constant.value.str.val;
@@ -628,7 +627,7 @@ static int ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_A
 
                if (!is_const) {
                        efree(function_name_strval);
-                       ;
+
                }
        } else {
                if(!ce->constructor) {
@@ -684,7 +683,6 @@ static int ZEND_INIT_FCALL_BY_NAME_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        }
 
        efree(lcname);
-       ;
 
        EX(calling_scope) = function->common.scope;
        EX(object) = NULL;
@@ -741,26 +739,26 @@ static int ZEND_RECV_INIT_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_BRK_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op2;
+       
 
        ZEND_VM_SET_OPCODE(EX(op_array)->opcodes +
          zend_brk_cont(&opline->op2.u.constant,
            opline->op1.u.opline_num,
            EX(op_array), EX(Ts) TSRMLS_CC)->brk);
-       ;
+
        ZEND_VM_CONTINUE(); /* CHECK_ME */
 }
 
 static int ZEND_CONT_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op2;
+       
 
        ZEND_VM_SET_OPCODE(EX(op_array)->opcodes +
          zend_brk_cont(&opline->op2.u.constant,
            opline->op1.u.opline_num,
            EX(op_array), EX(Ts) TSRMLS_CC)->cont);
-       ;
+
        ZEND_VM_CONTINUE(); /* CHECK_ME */
 }
 
@@ -1078,7 +1076,7 @@ static int ZEND_FETCH_CLASS_SPEC_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
        zval *class_name;
-       zend_free_op free_op2;
+       
 
 
        if (IS_UNUSED == IS_UNUSED) {
@@ -1100,7 +1098,6 @@ static int ZEND_FETCH_CLASS_SPEC_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                        break;
        }
 
-       ;
        ZEND_VM_NEXT_OPCODE();
 }
 
@@ -1117,7 +1114,7 @@ static int ZEND_INIT_STATIC_METHOD_CALL_SPEC_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_
                char *function_name_strval;
                int function_name_strlen;
                zend_bool is_const = (IS_UNUSED == IS_CONST);
-               zend_free_op free_op2;
+               
 
                if (is_const) {
                        function_name_strval = opline->op2.u.constant.value.str.val;
@@ -1136,7 +1133,7 @@ static int ZEND_INIT_STATIC_METHOD_CALL_SPEC_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_
 
                if (!is_const) {
                        efree(function_name_strval);
-                       ;
+
                }
        } else {
                if(!ce->constructor) {
@@ -1162,7 +1159,7 @@ static int ZEND_FETCH_CLASS_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
        zval *class_name;
-       zend_free_op free_op2;
+       
 
 
        if (IS_CV == IS_UNUSED) {
@@ -1184,7 +1181,6 @@ static int ZEND_FETCH_CLASS_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                        break;
        }
 
-       ;
        ZEND_VM_NEXT_OPCODE();
 }
 
@@ -1201,7 +1197,7 @@ static int ZEND_INIT_STATIC_METHOD_CALL_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS
                char *function_name_strval;
                int function_name_strlen;
                zend_bool is_const = (IS_CV == IS_CONST);
-               zend_free_op free_op2;
+               
 
                if (is_const) {
                        function_name_strval = opline->op2.u.constant.value.str.val;
@@ -1220,7 +1216,7 @@ static int ZEND_INIT_STATIC_METHOD_CALL_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS
 
                if (!is_const) {
                        efree(function_name_strval);
-                       ;
+
                }
        } else {
                if(!ce->constructor) {
@@ -1276,7 +1272,6 @@ static int ZEND_INIT_FCALL_BY_NAME_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        }
 
        efree(lcname);
-       ;
 
        EX(calling_scope) = function->common.scope;
        EX(object) = NULL;
@@ -1290,55 +1285,55 @@ static int ZEND_INIT_FCALL_BY_NAME_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_BRK_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op2;
+       
 
        ZEND_VM_SET_OPCODE(EX(op_array)->opcodes +
          zend_brk_cont(_get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC),
            opline->op1.u.opline_num,
            EX(op_array), EX(Ts) TSRMLS_CC)->brk);
-       ;
+
        ZEND_VM_CONTINUE(); /* CHECK_ME */
 }
 
 static int ZEND_CONT_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op2;
+       
 
        ZEND_VM_SET_OPCODE(EX(op_array)->opcodes +
          zend_brk_cont(_get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC),
            opline->op1.u.opline_num,
            EX(op_array), EX(Ts) TSRMLS_CC)->cont);
-       ;
+
        ZEND_VM_CONTINUE(); /* CHECK_ME */
 }
 
 static int ZEND_BW_NOT_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1;
+       
 
        bitwise_not_function(&EX_T(opline->result.u.var).tmp_var,
                &opline->op1.u.constant TSRMLS_CC);
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_BOOL_NOT_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1;
+       
 
        boolean_not_function(&EX_T(opline->result.u.var).tmp_var,
                &opline->op1.u.constant TSRMLS_CC);
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_ECHO_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1;
+       
        zval z_copy;
        zval *z = &opline->op1.u.constant;
 
@@ -1350,7 +1345,6 @@ static int ZEND_ECHO_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                zend_print_variable(z);
        }
 
-       ;
        ZEND_VM_NEXT_OPCODE();
 }
 
@@ -1367,7 +1361,7 @@ static int ZEND_PRINT_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int zend_fetch_var_address_helper_SPEC_CONST(int type, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1;
+       
        zval *varname = &opline->op1.u.constant;
        zval **retval;
        zval tmp_varname;
@@ -1417,7 +1411,7 @@ static int zend_fetch_var_address_helper_SPEC_CONST(int type, ZEND_OPCODE_HANDLE
                switch (opline->op2.u.EA.type) {
                        case ZEND_FETCH_GLOBAL:
                        case ZEND_FETCH_LOCAL:
-                               ;
+
                                break;
                        case ZEND_FETCH_STATIC:
                                zval_update_constant(retval, (void*) 1 TSRMLS_CC);
@@ -1486,10 +1480,9 @@ static int ZEND_FETCH_IS_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_JMPZ_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1;
+       
        int ret = i_zend_is_true(&opline->op1.u.constant);
 
-       ;
        if (!ret) {
 #if DEBUG_ZEND>=2
                printf("Conditional jmp to %d\n", opline->op2.u.opline_num);
@@ -1504,10 +1497,9 @@ static int ZEND_JMPZ_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_JMPNZ_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1;
+       
        int ret = i_zend_is_true(&opline->op1.u.constant);
 
-       ;
        if (ret) {
 #if DEBUG_ZEND>=2
                printf("Conditional jmp to %d\n", opline->op2.u.opline_num);
@@ -1522,10 +1514,9 @@ static int ZEND_JMPNZ_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_JMPZNZ_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1;
+       
        int retval = i_zend_is_true(&opline->op1.u.constant);
 
-       ;
        if (retval) {
 #if DEBUG_ZEND>=2
                printf("Conditional jmp on true to %d\n", opline->extended_value);
@@ -1544,10 +1535,9 @@ static int ZEND_JMPZNZ_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_JMPZ_EX_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1;
+       
        int retval = i_zend_is_true(&opline->op1.u.constant);
 
-       ;
        EX_T(opline->result.u.var).tmp_var.value.lval = retval;
        EX_T(opline->result.u.var).tmp_var.type = IS_BOOL;
        if (!retval) {
@@ -1563,10 +1553,9 @@ static int ZEND_JMPZ_EX_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_JMPNZ_EX_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1;
+       
        int retval = i_zend_is_true(&opline->op1.u.constant);
 
-       ;
        EX_T(opline->result.u.var).tmp_var.value.lval = retval;
        EX_T(opline->result.u.var).tmp_var.type = IS_BOOL;
        if (retval) {
@@ -1582,7 +1571,7 @@ static int ZEND_JMPNZ_EX_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_DO_FCALL_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1;
+       
        zval *fname = &opline->op1.u.constant;
 
        zend_ptr_stack_3_push(&EG(arg_types_stack), EX(fbc), EX(object), EX(calling_scope));
@@ -1593,8 +1582,6 @@ static int ZEND_DO_FCALL_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        EX(object) = NULL;
        EX(calling_scope) = EX(function_state).function->common.scope;
 
-       ;
-
        return zend_do_fcall_common_helper_SPEC(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
@@ -1671,7 +1658,7 @@ return_by_value:
                        *EG(return_value_ptr_ptr) = ret;
                }
        }
-       ;
+
        ZEND_VM_RETURN_FROM_EXECUTE_LOOP();
 }
 
@@ -1685,7 +1672,7 @@ static int ZEND_SEND_VAL_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        {
                zval *valptr;
                zval *value;
-               zend_free_op free_op1;
+               
 
                value = &opline->op1.u.constant;
 
@@ -1695,7 +1682,7 @@ static int ZEND_SEND_VAL_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                        zval_copy_ctor(valptr);
                }
                zend_ptr_stack_push(&EG(argument_stack), valptr);
-               ;
+
        }
        ZEND_VM_NEXT_OPCODE();
 }
@@ -1703,12 +1690,11 @@ static int ZEND_SEND_VAL_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_BOOL_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1;
+       
 
        /* PHP 3.0 returned "" for false and 1 for true, here we use 0 and 1 for now */
        EX_T(opline->result.u.var).tmp_var.value.lval = i_zend_is_true(&opline->op1.u.constant);
        EX_T(opline->result.u.var).tmp_var.type = IS_BOOL;
-       ;
 
        ZEND_VM_NEXT_OPCODE();
 }
@@ -1716,7 +1702,7 @@ static int ZEND_BOOL_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_CLONE_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1;
+       
        zval *obj = &opline->op1.u.constant;
        zend_class_entry *ce;
        zend_function *clone;
@@ -1726,7 +1712,7 @@ static int ZEND_CLONE_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                zend_error(E_WARNING, "__clone method called on non-object");
                EX_T(opline->result.u.var).var.ptr = EG(error_zval_ptr);
                EX_T(opline->result.u.var).var.ptr->refcount++;
-               ;
+
                ZEND_VM_NEXT_OPCODE();
        }
 
@@ -1765,14 +1751,14 @@ static int ZEND_CLONE_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                EX_T(opline->result.u.var).var.ptr->refcount=1;
                EX_T(opline->result.u.var).var.ptr->is_ref=1;
        }
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_CAST_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1;
+       
        zval *expr = &opline->op1.u.constant;
        zval *result = &EX_T(opline->result.u.var).tmp_var;
 
@@ -1811,7 +1797,7 @@ static int ZEND_CAST_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                        convert_to_object(result);
                        break;
        }
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
@@ -1821,7 +1807,7 @@ static int ZEND_INCLUDE_OR_EVAL_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        zend_op_array *new_op_array=NULL;
        zval **original_return_value = EG(return_value_ptr_ptr);
        int return_value_used;
-       zend_free_op free_op1;
+       
        zval *inc_filename = &opline->op1.u.constant;
        zval tmp_inc_filename;
        zend_bool failure_retval=0;
@@ -1880,7 +1866,7 @@ static int ZEND_INCLUDE_OR_EVAL_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        if (inc_filename==&tmp_inc_filename) {
                zval_dtor(&tmp_inc_filename);
        }
-       ;
+
        EX_T(opline->result.u.var).var.ptr_ptr = &EX_T(opline->result.u.var).var.ptr;
        if (new_op_array) {
                zval *saved_object;
@@ -1939,7 +1925,7 @@ static int ZEND_UNSET_VAR_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        zend_op *opline = EX(opline);
        zval tmp, *varname;
        HashTable *target_symbol_table;
-       zend_free_op free_op1;
+       
 
        varname = &opline->op1.u.constant;
 
@@ -1977,14 +1963,14 @@ static int ZEND_UNSET_VAR_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        if (varname == &tmp) {
                zval_dtor(&tmp);
        }
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_FE_RESET_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1;
+       
        zval *array_ptr, **array_ptr_ptr;
        HashTable *fe_ht;
        zend_object_iterator *iter = NULL;
@@ -2029,9 +2015,9 @@ static int ZEND_FE_RESET_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                        array_ptr = zend_iterator_wrap(iter TSRMLS_CC);
                } else {
                        if (opline->extended_value) {
-                               ;
+
                        } else {
-                               ;
+
                        }
                        if (!EG(exception)) {
                                zend_throw_exception_ex(NULL, 0 TSRMLS_CC, "Object of type %s did not create an Iterator", ce->name);
@@ -2083,9 +2069,9 @@ static int ZEND_FE_RESET_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        }
 
        if (opline->extended_value) {
-               ;
+
        } else {
-               ;
+
        }
        if (is_empty) {
                ZEND_VM_SET_OPCODE(EX(op_array)->opcodes+opline->op2.u.opline_num);
@@ -2098,7 +2084,7 @@ static int ZEND_FE_RESET_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_ISSET_ISEMPTY_VAR_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1;
+       
        zval tmp, *varname = &opline->op1.u.constant;
        zval **value;
        zend_bool isset = 1;
@@ -2145,7 +2131,6 @@ static int ZEND_ISSET_ISEMPTY_VAR_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        if (varname == &tmp) {
                zval_dtor(&tmp);
        }
-       ;
 
        ZEND_VM_NEXT_OPCODE();
 }
@@ -2156,7 +2141,7 @@ static int ZEND_EXIT_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 
        if (IS_CONST != IS_UNUSED) {
                zval *ptr;
-               zend_free_op free_op1;
+               
 
                ptr = &opline->op1.u.constant;
                if (Z_TYPE_P(ptr) == IS_LONG) {
@@ -2164,7 +2149,7 @@ static int ZEND_EXIT_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                } else {
                        zend_print_variable(ptr);
                }
-               ;
+
        }
        zend_bailout();
        ZEND_VM_NEXT_OPCODE();
@@ -2173,14 +2158,14 @@ static int ZEND_EXIT_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_QM_ASSIGN_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1;
+       
        zval *value = &opline->op1.u.constant;
 
        EX_T(opline->result.u.var).tmp_var = *value;
        if (!0) {
                zval_copy_ctor(&EX_T(opline->result.u.var).tmp_var);
        }
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
@@ -2200,234 +2185,234 @@ static int ZEND_TICKS_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_ADD_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
 
        add_function(&EX_T(opline->result.u.var).tmp_var,
                &opline->op1.u.constant,
                &opline->op2.u.constant TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_SUB_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
 
        sub_function(&EX_T(opline->result.u.var).tmp_var,
                &opline->op1.u.constant,
                &opline->op2.u.constant TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_MUL_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
 
        mul_function(&EX_T(opline->result.u.var).tmp_var,
                &opline->op1.u.constant,
                &opline->op2.u.constant TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_DIV_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
 
        div_function(&EX_T(opline->result.u.var).tmp_var,
                &opline->op1.u.constant,
                &opline->op2.u.constant TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_MOD_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
 
        mod_function(&EX_T(opline->result.u.var).tmp_var,
                &opline->op1.u.constant,
                &opline->op2.u.constant TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_SL_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
 
        shift_left_function(&EX_T(opline->result.u.var).tmp_var,
                &opline->op1.u.constant,
                &opline->op2.u.constant TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_SR_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
 
        shift_right_function(&EX_T(opline->result.u.var).tmp_var,
                &opline->op1.u.constant,
                &opline->op2.u.constant TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_CONCAT_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
 
        concat_function(&EX_T(opline->result.u.var).tmp_var,
                &opline->op1.u.constant,
                &opline->op2.u.constant TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_IS_IDENTICAL_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
 
        is_identical_function(&EX_T(opline->result.u.var).tmp_var,
                &opline->op1.u.constant,
                &opline->op2.u.constant TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_IS_NOT_IDENTICAL_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
 
        is_not_identical_function(&EX_T(opline->result.u.var).tmp_var,
                &opline->op1.u.constant,
                &opline->op2.u.constant TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_IS_EQUAL_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
 
        is_equal_function(&EX_T(opline->result.u.var).tmp_var,
                &opline->op1.u.constant,
                &opline->op2.u.constant TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_IS_NOT_EQUAL_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
 
        is_not_equal_function(&EX_T(opline->result.u.var).tmp_var,
                &opline->op1.u.constant,
                &opline->op2.u.constant TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_IS_SMALLER_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
 
        is_smaller_function(&EX_T(opline->result.u.var).tmp_var,
                &opline->op1.u.constant,
                &opline->op2.u.constant TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_IS_SMALLER_OR_EQUAL_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
 
        is_smaller_or_equal_function(&EX_T(opline->result.u.var).tmp_var,
                &opline->op1.u.constant,
                &opline->op2.u.constant TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_BW_OR_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
 
        bitwise_or_function(&EX_T(opline->result.u.var).tmp_var,
                &opline->op1.u.constant,
                &opline->op2.u.constant TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_BW_AND_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
 
        bitwise_and_function(&EX_T(opline->result.u.var).tmp_var,
                &opline->op1.u.constant,
                &opline->op2.u.constant TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_BW_XOR_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
 
        bitwise_xor_function(&EX_T(opline->result.u.var).tmp_var,
                &opline->op1.u.constant,
                &opline->op2.u.constant TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_BOOL_XOR_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
 
        boolean_xor_function(&EX_T(opline->result.u.var).tmp_var,
                &opline->op1.u.constant,
                &opline->op2.u.constant TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
@@ -2435,7 +2420,7 @@ static int ZEND_CASE_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
        int switch_expr_is_overloaded=0;
-       zend_free_op free_op1, free_op2;
+       
 
        if (IS_CONST==IS_VAR) {
                if (EX_T(opline->op1.u.var).var.ptr_ptr) {
@@ -2449,14 +2434,13 @@ static int ZEND_CASE_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                                 &opline->op1.u.constant,
                                 &opline->op2.u.constant TSRMLS_CC);
 
-       ;
        if (switch_expr_is_overloaded) {
                /* We only free op1 if this is a string offset,
                 * Since if it is a TMP_VAR, it'll be reused by
                 * other CASE opcodes (whereas string offsets
                 * are allocated at each get_zval_ptr())
                 */
-               ;
+
                EX_T(opline->op1.u.var).var.ptr_ptr = NULL;
                AI_USE_PTR(EX_T(opline->op1.u.var).var);
        }
@@ -2507,7 +2491,7 @@ static int ZEND_FETCH_CONSTANT_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS
 static int ZEND_ADD_ARRAY_ELEMENT_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
        zval *array_ptr = &EX_T(opline->result.u.var).tmp_var;
        zval *expr_ptr, **expr_ptr_ptr = NULL;
        zval *offset=&opline->op2.u.constant;
@@ -2568,14 +2552,14 @@ static int ZEND_ADD_ARRAY_ELEMENT_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_A
                                /* do nothing */
                                break;
                }
-               ;
+
        } else {
                zend_hash_next_index_insert(array_ptr->value.ht, &expr_ptr, sizeof(zval *), NULL);
        }
        if (opline->extended_value) {
-               ;
+
        } else {
-               ;
+
        }
        ZEND_VM_NEXT_OPCODE();
 }
@@ -2588,12 +2572,12 @@ static int ZEND_INIT_ARRAY_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_ADD_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        add_function(&EX_T(opline->result.u.var).tmp_var,
                &opline->op1.u.constant,
                _get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC) TSRMLS_CC);
-       ;
+
        zval_dtor(free_op2.var);
        ZEND_VM_NEXT_OPCODE();
 }
@@ -2601,12 +2585,12 @@ static int ZEND_ADD_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_SUB_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        sub_function(&EX_T(opline->result.u.var).tmp_var,
                &opline->op1.u.constant,
                _get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC) TSRMLS_CC);
-       ;
+
        zval_dtor(free_op2.var);
        ZEND_VM_NEXT_OPCODE();
 }
@@ -2614,12 +2598,12 @@ static int ZEND_SUB_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_MUL_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        mul_function(&EX_T(opline->result.u.var).tmp_var,
                &opline->op1.u.constant,
                _get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC) TSRMLS_CC);
-       ;
+
        zval_dtor(free_op2.var);
        ZEND_VM_NEXT_OPCODE();
 }
@@ -2627,12 +2611,12 @@ static int ZEND_MUL_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_DIV_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        div_function(&EX_T(opline->result.u.var).tmp_var,
                &opline->op1.u.constant,
                _get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC) TSRMLS_CC);
-       ;
+
        zval_dtor(free_op2.var);
        ZEND_VM_NEXT_OPCODE();
 }
@@ -2640,12 +2624,12 @@ static int ZEND_DIV_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_MOD_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        mod_function(&EX_T(opline->result.u.var).tmp_var,
                &opline->op1.u.constant,
                _get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC) TSRMLS_CC);
-       ;
+
        zval_dtor(free_op2.var);
        ZEND_VM_NEXT_OPCODE();
 }
@@ -2653,12 +2637,12 @@ static int ZEND_MOD_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_SL_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        shift_left_function(&EX_T(opline->result.u.var).tmp_var,
                &opline->op1.u.constant,
                _get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC) TSRMLS_CC);
-       ;
+
        zval_dtor(free_op2.var);
        ZEND_VM_NEXT_OPCODE();
 }
@@ -2666,12 +2650,12 @@ static int ZEND_SL_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_SR_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        shift_right_function(&EX_T(opline->result.u.var).tmp_var,
                &opline->op1.u.constant,
                _get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC) TSRMLS_CC);
-       ;
+
        zval_dtor(free_op2.var);
        ZEND_VM_NEXT_OPCODE();
 }
@@ -2679,12 +2663,12 @@ static int ZEND_SR_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_CONCAT_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        concat_function(&EX_T(opline->result.u.var).tmp_var,
                &opline->op1.u.constant,
                _get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC) TSRMLS_CC);
-       ;
+
        zval_dtor(free_op2.var);
        ZEND_VM_NEXT_OPCODE();
 }
@@ -2692,12 +2676,12 @@ static int ZEND_CONCAT_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_IS_IDENTICAL_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        is_identical_function(&EX_T(opline->result.u.var).tmp_var,
                &opline->op1.u.constant,
                _get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC) TSRMLS_CC);
-       ;
+
        zval_dtor(free_op2.var);
        ZEND_VM_NEXT_OPCODE();
 }
@@ -2705,12 +2689,12 @@ static int ZEND_IS_IDENTICAL_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_IS_NOT_IDENTICAL_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        is_not_identical_function(&EX_T(opline->result.u.var).tmp_var,
                &opline->op1.u.constant,
                _get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC) TSRMLS_CC);
-       ;
+
        zval_dtor(free_op2.var);
        ZEND_VM_NEXT_OPCODE();
 }
@@ -2718,12 +2702,12 @@ static int ZEND_IS_NOT_IDENTICAL_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS
 static int ZEND_IS_EQUAL_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        is_equal_function(&EX_T(opline->result.u.var).tmp_var,
                &opline->op1.u.constant,
                _get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC) TSRMLS_CC);
-       ;
+
        zval_dtor(free_op2.var);
        ZEND_VM_NEXT_OPCODE();
 }
@@ -2731,12 +2715,12 @@ static int ZEND_IS_EQUAL_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_IS_NOT_EQUAL_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        is_not_equal_function(&EX_T(opline->result.u.var).tmp_var,
                &opline->op1.u.constant,
                _get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC) TSRMLS_CC);
-       ;
+
        zval_dtor(free_op2.var);
        ZEND_VM_NEXT_OPCODE();
 }
@@ -2744,12 +2728,12 @@ static int ZEND_IS_NOT_EQUAL_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_IS_SMALLER_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        is_smaller_function(&EX_T(opline->result.u.var).tmp_var,
                &opline->op1.u.constant,
                _get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC) TSRMLS_CC);
-       ;
+
        zval_dtor(free_op2.var);
        ZEND_VM_NEXT_OPCODE();
 }
@@ -2757,12 +2741,12 @@ static int ZEND_IS_SMALLER_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_IS_SMALLER_OR_EQUAL_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        is_smaller_or_equal_function(&EX_T(opline->result.u.var).tmp_var,
                &opline->op1.u.constant,
                _get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC) TSRMLS_CC);
-       ;
+
        zval_dtor(free_op2.var);
        ZEND_VM_NEXT_OPCODE();
 }
@@ -2770,12 +2754,12 @@ static int ZEND_IS_SMALLER_OR_EQUAL_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_A
 static int ZEND_BW_OR_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        bitwise_or_function(&EX_T(opline->result.u.var).tmp_var,
                &opline->op1.u.constant,
                _get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC) TSRMLS_CC);
-       ;
+
        zval_dtor(free_op2.var);
        ZEND_VM_NEXT_OPCODE();
 }
@@ -2783,12 +2767,12 @@ static int ZEND_BW_OR_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_BW_AND_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        bitwise_and_function(&EX_T(opline->result.u.var).tmp_var,
                &opline->op1.u.constant,
                _get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC) TSRMLS_CC);
-       ;
+
        zval_dtor(free_op2.var);
        ZEND_VM_NEXT_OPCODE();
 }
@@ -2796,12 +2780,12 @@ static int ZEND_BW_AND_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_BW_XOR_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        bitwise_xor_function(&EX_T(opline->result.u.var).tmp_var,
                &opline->op1.u.constant,
                _get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC) TSRMLS_CC);
-       ;
+
        zval_dtor(free_op2.var);
        ZEND_VM_NEXT_OPCODE();
 }
@@ -2809,12 +2793,12 @@ static int ZEND_BW_XOR_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_BOOL_XOR_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        boolean_xor_function(&EX_T(opline->result.u.var).tmp_var,
                &opline->op1.u.constant,
                _get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC) TSRMLS_CC);
-       ;
+
        zval_dtor(free_op2.var);
        ZEND_VM_NEXT_OPCODE();
 }
@@ -2823,7 +2807,7 @@ static int ZEND_CASE_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
        int switch_expr_is_overloaded=0;
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        if (IS_CONST==IS_VAR) {
                if (EX_T(opline->op1.u.var).var.ptr_ptr) {
@@ -2844,7 +2828,7 @@ static int ZEND_CASE_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                 * other CASE opcodes (whereas string offsets
                 * are allocated at each get_zval_ptr())
                 */
-               ;
+
                EX_T(opline->op1.u.var).var.ptr_ptr = NULL;
                AI_USE_PTR(EX_T(opline->op1.u.var).var);
        }
@@ -2854,7 +2838,7 @@ static int ZEND_CASE_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_ADD_ARRAY_ELEMENT_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
        zval *array_ptr = &EX_T(opline->result.u.var).tmp_var;
        zval *expr_ptr, **expr_ptr_ptr = NULL;
        zval *offset=_get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
@@ -2920,9 +2904,9 @@ static int ZEND_ADD_ARRAY_ELEMENT_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARG
                zend_hash_next_index_insert(array_ptr->value.ht, &expr_ptr, sizeof(zval *), NULL);
        }
        if (opline->extended_value) {
-               ;
+
        } else {
-               ;
+
        }
        ZEND_VM_NEXT_OPCODE();
 }
@@ -2935,12 +2919,12 @@ static int ZEND_INIT_ARRAY_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_ADD_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        add_function(&EX_T(opline->result.u.var).tmp_var,
                &opline->op1.u.constant,
                _get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC) TSRMLS_CC);
-       ;
+
        if (free_op2.var) {zval_ptr_dtor(&free_op2.var);};
        ZEND_VM_NEXT_OPCODE();
 }
@@ -2948,12 +2932,12 @@ static int ZEND_ADD_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_SUB_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        sub_function(&EX_T(opline->result.u.var).tmp_var,
                &opline->op1.u.constant,
                _get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC) TSRMLS_CC);
-       ;
+
        if (free_op2.var) {zval_ptr_dtor(&free_op2.var);};
        ZEND_VM_NEXT_OPCODE();
 }
@@ -2961,12 +2945,12 @@ static int ZEND_SUB_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_MUL_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        mul_function(&EX_T(opline->result.u.var).tmp_var,
                &opline->op1.u.constant,
                _get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC) TSRMLS_CC);
-       ;
+
        if (free_op2.var) {zval_ptr_dtor(&free_op2.var);};
        ZEND_VM_NEXT_OPCODE();
 }
@@ -2974,12 +2958,12 @@ static int ZEND_MUL_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_DIV_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        div_function(&EX_T(opline->result.u.var).tmp_var,
                &opline->op1.u.constant,
                _get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC) TSRMLS_CC);
-       ;
+
        if (free_op2.var) {zval_ptr_dtor(&free_op2.var);};
        ZEND_VM_NEXT_OPCODE();
 }
@@ -2987,12 +2971,12 @@ static int ZEND_DIV_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_MOD_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        mod_function(&EX_T(opline->result.u.var).tmp_var,
                &opline->op1.u.constant,
                _get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC) TSRMLS_CC);
-       ;
+
        if (free_op2.var) {zval_ptr_dtor(&free_op2.var);};
        ZEND_VM_NEXT_OPCODE();
 }
@@ -3000,12 +2984,12 @@ static int ZEND_MOD_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_SL_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        shift_left_function(&EX_T(opline->result.u.var).tmp_var,
                &opline->op1.u.constant,
                _get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC) TSRMLS_CC);
-       ;
+
        if (free_op2.var) {zval_ptr_dtor(&free_op2.var);};
        ZEND_VM_NEXT_OPCODE();
 }
@@ -3013,12 +2997,12 @@ static int ZEND_SL_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_SR_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        shift_right_function(&EX_T(opline->result.u.var).tmp_var,
                &opline->op1.u.constant,
                _get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC) TSRMLS_CC);
-       ;
+
        if (free_op2.var) {zval_ptr_dtor(&free_op2.var);};
        ZEND_VM_NEXT_OPCODE();
 }
@@ -3026,12 +3010,12 @@ static int ZEND_SR_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_CONCAT_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        concat_function(&EX_T(opline->result.u.var).tmp_var,
                &opline->op1.u.constant,
                _get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC) TSRMLS_CC);
-       ;
+
        if (free_op2.var) {zval_ptr_dtor(&free_op2.var);};
        ZEND_VM_NEXT_OPCODE();
 }
@@ -3039,12 +3023,12 @@ static int ZEND_CONCAT_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_IS_IDENTICAL_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        is_identical_function(&EX_T(opline->result.u.var).tmp_var,
                &opline->op1.u.constant,
                _get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC) TSRMLS_CC);
-       ;
+
        if (free_op2.var) {zval_ptr_dtor(&free_op2.var);};
        ZEND_VM_NEXT_OPCODE();
 }
@@ -3052,12 +3036,12 @@ static int ZEND_IS_IDENTICAL_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_IS_NOT_IDENTICAL_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        is_not_identical_function(&EX_T(opline->result.u.var).tmp_var,
                &opline->op1.u.constant,
                _get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC) TSRMLS_CC);
-       ;
+
        if (free_op2.var) {zval_ptr_dtor(&free_op2.var);};
        ZEND_VM_NEXT_OPCODE();
 }
@@ -3065,12 +3049,12 @@ static int ZEND_IS_NOT_IDENTICAL_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS
 static int ZEND_IS_EQUAL_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        is_equal_function(&EX_T(opline->result.u.var).tmp_var,
                &opline->op1.u.constant,
                _get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC) TSRMLS_CC);
-       ;
+
        if (free_op2.var) {zval_ptr_dtor(&free_op2.var);};
        ZEND_VM_NEXT_OPCODE();
 }
@@ -3078,12 +3062,12 @@ static int ZEND_IS_EQUAL_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_IS_NOT_EQUAL_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        is_not_equal_function(&EX_T(opline->result.u.var).tmp_var,
                &opline->op1.u.constant,
                _get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC) TSRMLS_CC);
-       ;
+
        if (free_op2.var) {zval_ptr_dtor(&free_op2.var);};
        ZEND_VM_NEXT_OPCODE();
 }
@@ -3091,12 +3075,12 @@ static int ZEND_IS_NOT_EQUAL_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_IS_SMALLER_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        is_smaller_function(&EX_T(opline->result.u.var).tmp_var,
                &opline->op1.u.constant,
                _get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC) TSRMLS_CC);
-       ;
+
        if (free_op2.var) {zval_ptr_dtor(&free_op2.var);};
        ZEND_VM_NEXT_OPCODE();
 }
@@ -3104,12 +3088,12 @@ static int ZEND_IS_SMALLER_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_IS_SMALLER_OR_EQUAL_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        is_smaller_or_equal_function(&EX_T(opline->result.u.var).tmp_var,
                &opline->op1.u.constant,
                _get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC) TSRMLS_CC);
-       ;
+
        if (free_op2.var) {zval_ptr_dtor(&free_op2.var);};
        ZEND_VM_NEXT_OPCODE();
 }
@@ -3117,12 +3101,12 @@ static int ZEND_IS_SMALLER_OR_EQUAL_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_A
 static int ZEND_BW_OR_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        bitwise_or_function(&EX_T(opline->result.u.var).tmp_var,
                &opline->op1.u.constant,
                _get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC) TSRMLS_CC);
-       ;
+
        if (free_op2.var) {zval_ptr_dtor(&free_op2.var);};
        ZEND_VM_NEXT_OPCODE();
 }
@@ -3130,12 +3114,12 @@ static int ZEND_BW_OR_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_BW_AND_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        bitwise_and_function(&EX_T(opline->result.u.var).tmp_var,
                &opline->op1.u.constant,
                _get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC) TSRMLS_CC);
-       ;
+
        if (free_op2.var) {zval_ptr_dtor(&free_op2.var);};
        ZEND_VM_NEXT_OPCODE();
 }
@@ -3143,12 +3127,12 @@ static int ZEND_BW_AND_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_BW_XOR_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        bitwise_xor_function(&EX_T(opline->result.u.var).tmp_var,
                &opline->op1.u.constant,
                _get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC) TSRMLS_CC);
-       ;
+
        if (free_op2.var) {zval_ptr_dtor(&free_op2.var);};
        ZEND_VM_NEXT_OPCODE();
 }
@@ -3156,12 +3140,12 @@ static int ZEND_BW_XOR_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_BOOL_XOR_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        boolean_xor_function(&EX_T(opline->result.u.var).tmp_var,
                &opline->op1.u.constant,
                _get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC) TSRMLS_CC);
-       ;
+
        if (free_op2.var) {zval_ptr_dtor(&free_op2.var);};
        ZEND_VM_NEXT_OPCODE();
 }
@@ -3170,7 +3154,7 @@ static int ZEND_CASE_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
        int switch_expr_is_overloaded=0;
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        if (IS_CONST==IS_VAR) {
                if (EX_T(opline->op1.u.var).var.ptr_ptr) {
@@ -3191,7 +3175,7 @@ static int ZEND_CASE_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                 * other CASE opcodes (whereas string offsets
                 * are allocated at each get_zval_ptr())
                 */
-               ;
+
                EX_T(opline->op1.u.var).var.ptr_ptr = NULL;
                AI_USE_PTR(EX_T(opline->op1.u.var).var);
        }
@@ -3201,7 +3185,7 @@ static int ZEND_CASE_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_ADD_ARRAY_ELEMENT_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
        zval *array_ptr = &EX_T(opline->result.u.var).tmp_var;
        zval *expr_ptr, **expr_ptr_ptr = NULL;
        zval *offset=_get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
@@ -3267,9 +3251,9 @@ static int ZEND_ADD_ARRAY_ELEMENT_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARG
                zend_hash_next_index_insert(array_ptr->value.ht, &expr_ptr, sizeof(zval *), NULL);
        }
        if (opline->extended_value) {
-               ;
+
        } else {
-               ;
+
        }
        ZEND_VM_NEXT_OPCODE();
 }
@@ -3282,7 +3266,7 @@ static int ZEND_INIT_ARRAY_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_ADD_ARRAY_ELEMENT_SPEC_CONST_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
        zval *array_ptr = &EX_T(opline->result.u.var).tmp_var;
        zval *expr_ptr, **expr_ptr_ptr = NULL;
        zval *offset=NULL;
@@ -3343,14 +3327,14 @@ static int ZEND_ADD_ARRAY_ELEMENT_SPEC_CONST_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_
                                /* do nothing */
                                break;
                }
-               ;
+
        } else {
                zend_hash_next_index_insert(array_ptr->value.ht, &expr_ptr, sizeof(zval *), NULL);
        }
        if (opline->extended_value) {
-               ;
+
        } else {
-               ;
+
        }
        ZEND_VM_NEXT_OPCODE();
 }
@@ -3363,234 +3347,234 @@ static int ZEND_INIT_ARRAY_SPEC_CONST_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_ADD_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
 
        add_function(&EX_T(opline->result.u.var).tmp_var,
                &opline->op1.u.constant,
                _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_SUB_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
 
        sub_function(&EX_T(opline->result.u.var).tmp_var,
                &opline->op1.u.constant,
                _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_MUL_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
 
        mul_function(&EX_T(opline->result.u.var).tmp_var,
                &opline->op1.u.constant,
                _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_DIV_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
 
        div_function(&EX_T(opline->result.u.var).tmp_var,
                &opline->op1.u.constant,
                _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_MOD_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
 
        mod_function(&EX_T(opline->result.u.var).tmp_var,
                &opline->op1.u.constant,
                _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_SL_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
 
        shift_left_function(&EX_T(opline->result.u.var).tmp_var,
                &opline->op1.u.constant,
                _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_SR_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
 
        shift_right_function(&EX_T(opline->result.u.var).tmp_var,
                &opline->op1.u.constant,
                _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_CONCAT_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
 
        concat_function(&EX_T(opline->result.u.var).tmp_var,
                &opline->op1.u.constant,
                _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_IS_IDENTICAL_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
 
        is_identical_function(&EX_T(opline->result.u.var).tmp_var,
                &opline->op1.u.constant,
                _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_IS_NOT_IDENTICAL_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
 
        is_not_identical_function(&EX_T(opline->result.u.var).tmp_var,
                &opline->op1.u.constant,
                _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_IS_EQUAL_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
 
        is_equal_function(&EX_T(opline->result.u.var).tmp_var,
                &opline->op1.u.constant,
                _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_IS_NOT_EQUAL_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
 
        is_not_equal_function(&EX_T(opline->result.u.var).tmp_var,
                &opline->op1.u.constant,
                _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_IS_SMALLER_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
 
        is_smaller_function(&EX_T(opline->result.u.var).tmp_var,
                &opline->op1.u.constant,
                _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_IS_SMALLER_OR_EQUAL_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
 
        is_smaller_or_equal_function(&EX_T(opline->result.u.var).tmp_var,
                &opline->op1.u.constant,
                _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_BW_OR_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
 
        bitwise_or_function(&EX_T(opline->result.u.var).tmp_var,
                &opline->op1.u.constant,
                _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_BW_AND_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
 
        bitwise_and_function(&EX_T(opline->result.u.var).tmp_var,
                &opline->op1.u.constant,
                _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_BW_XOR_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
 
        bitwise_xor_function(&EX_T(opline->result.u.var).tmp_var,
                &opline->op1.u.constant,
                _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_BOOL_XOR_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
 
        boolean_xor_function(&EX_T(opline->result.u.var).tmp_var,
                &opline->op1.u.constant,
                _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
@@ -3598,7 +3582,7 @@ static int ZEND_CASE_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
        int switch_expr_is_overloaded=0;
-       zend_free_op free_op1, free_op2;
+       
 
        if (IS_CONST==IS_VAR) {
                if (EX_T(opline->op1.u.var).var.ptr_ptr) {
@@ -3612,14 +3596,13 @@ static int ZEND_CASE_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                                 &opline->op1.u.constant,
                                 _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
 
-       ;
        if (switch_expr_is_overloaded) {
                /* We only free op1 if this is a string offset,
                 * Since if it is a TMP_VAR, it'll be reused by
                 * other CASE opcodes (whereas string offsets
                 * are allocated at each get_zval_ptr())
                 */
-               ;
+
                EX_T(opline->op1.u.var).var.ptr_ptr = NULL;
                AI_USE_PTR(EX_T(opline->op1.u.var).var);
        }
@@ -3629,7 +3612,7 @@ static int ZEND_CASE_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_ADD_ARRAY_ELEMENT_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
        zval *array_ptr = &EX_T(opline->result.u.var).tmp_var;
        zval *expr_ptr, **expr_ptr_ptr = NULL;
        zval *offset=_get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC);
@@ -3690,14 +3673,14 @@ static int ZEND_ADD_ARRAY_ELEMENT_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS
                                /* do nothing */
                                break;
                }
-               ;
+
        } else {
                zend_hash_next_index_insert(array_ptr->value.ht, &expr_ptr, sizeof(zval *), NULL);
        }
        if (opline->extended_value) {
-               ;
+
        } else {
-               ;
+
        }
        ZEND_VM_NEXT_OPCODE();
 }
@@ -4052,7 +4035,7 @@ return_by_value:
                        *EG(return_value_ptr_ptr) = ret;
                }
        }
-       ;
+
        ZEND_VM_RETURN_FROM_EXECUTE_LOOP();
 }
 
@@ -4076,7 +4059,7 @@ static int ZEND_SEND_VAL_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                        zval_copy_ctor(valptr);
                }
                zend_ptr_stack_push(&EG(argument_stack), valptr);
-               ;
+
        }
        ZEND_VM_NEXT_OPCODE();
 }
@@ -4113,7 +4096,7 @@ static int ZEND_CLONE_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                zend_error(E_WARNING, "__clone method called on non-object");
                EX_T(opline->result.u.var).var.ptr = EG(error_zval_ptr);
                EX_T(opline->result.u.var).var.ptr->refcount++;
-               ;
+
                ZEND_VM_NEXT_OPCODE();
        }
 
@@ -4152,7 +4135,7 @@ static int ZEND_CLONE_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                EX_T(opline->result.u.var).var.ptr->refcount=1;
                EX_T(opline->result.u.var).var.ptr->is_ref=1;
        }
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
@@ -4198,7 +4181,7 @@ static int ZEND_CAST_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                        convert_to_object(result);
                        break;
        }
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
@@ -4416,9 +4399,9 @@ static int ZEND_FE_RESET_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                        array_ptr = zend_iterator_wrap(iter TSRMLS_CC);
                } else {
                        if (opline->extended_value) {
-                               ;
+
                        } else {
-                               ;
+
                        }
                        if (!EG(exception)) {
                                zend_throw_exception_ex(NULL, 0 TSRMLS_CC, "Object of type %s did not create an Iterator", ce->name);
@@ -4470,9 +4453,9 @@ static int ZEND_FE_RESET_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        }
 
        if (opline->extended_value) {
-               ;
+
        } else {
-               ;
+
        }
        if (is_empty) {
                ZEND_VM_SET_OPCODE(EX(op_array)->opcodes+opline->op2.u.opline_num);
@@ -4582,7 +4565,7 @@ static int ZEND_QM_ASSIGN_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        if (!1) {
                zval_copy_ctor(&EX_T(opline->result.u.var).tmp_var);
        }
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
@@ -4606,234 +4589,234 @@ static int ZEND_INSTANCEOF_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_ADD_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        add_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_tmp(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                &opline->op2.u.constant TSRMLS_CC);
        zval_dtor(free_op1.var);
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_SUB_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        sub_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_tmp(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                &opline->op2.u.constant TSRMLS_CC);
        zval_dtor(free_op1.var);
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_MUL_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        mul_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_tmp(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                &opline->op2.u.constant TSRMLS_CC);
        zval_dtor(free_op1.var);
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_DIV_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        div_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_tmp(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                &opline->op2.u.constant TSRMLS_CC);
        zval_dtor(free_op1.var);
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_MOD_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        mod_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_tmp(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                &opline->op2.u.constant TSRMLS_CC);
        zval_dtor(free_op1.var);
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_SL_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        shift_left_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_tmp(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                &opline->op2.u.constant TSRMLS_CC);
        zval_dtor(free_op1.var);
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_SR_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        shift_right_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_tmp(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                &opline->op2.u.constant TSRMLS_CC);
        zval_dtor(free_op1.var);
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_CONCAT_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        concat_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_tmp(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                &opline->op2.u.constant TSRMLS_CC);
        zval_dtor(free_op1.var);
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_IS_IDENTICAL_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        is_identical_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_tmp(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                &opline->op2.u.constant TSRMLS_CC);
        zval_dtor(free_op1.var);
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_IS_NOT_IDENTICAL_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        is_not_identical_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_tmp(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                &opline->op2.u.constant TSRMLS_CC);
        zval_dtor(free_op1.var);
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_IS_EQUAL_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        is_equal_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_tmp(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                &opline->op2.u.constant TSRMLS_CC);
        zval_dtor(free_op1.var);
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_IS_NOT_EQUAL_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        is_not_equal_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_tmp(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                &opline->op2.u.constant TSRMLS_CC);
        zval_dtor(free_op1.var);
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_IS_SMALLER_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        is_smaller_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_tmp(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                &opline->op2.u.constant TSRMLS_CC);
        zval_dtor(free_op1.var);
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_IS_SMALLER_OR_EQUAL_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        is_smaller_or_equal_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_tmp(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                &opline->op2.u.constant TSRMLS_CC);
        zval_dtor(free_op1.var);
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_BW_OR_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        bitwise_or_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_tmp(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                &opline->op2.u.constant TSRMLS_CC);
        zval_dtor(free_op1.var);
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_BW_AND_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        bitwise_and_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_tmp(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                &opline->op2.u.constant TSRMLS_CC);
        zval_dtor(free_op1.var);
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_BW_XOR_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        bitwise_xor_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_tmp(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                &opline->op2.u.constant TSRMLS_CC);
        zval_dtor(free_op1.var);
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_BOOL_XOR_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        boolean_xor_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_tmp(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                &opline->op2.u.constant TSRMLS_CC);
        zval_dtor(free_op1.var);
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
@@ -4849,12 +4832,12 @@ static int ZEND_FETCH_DIM_TMP_VAR_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARG
                        PZVAL_LOCK(*EX_T(opline->result.u.var).var.ptr_ptr);
                }
        } else {
-               zend_free_op free_op2;
+               
                zval *dim = &opline->op2.u.constant;
 
                EX_T(opline->result.u.var).var.ptr_ptr = zend_fetch_dimension_address_inner(container->value.ht, dim, BP_VAR_R TSRMLS_CC);
                SELECTIVE_PZVAL_LOCK(*EX_T(opline->result.u.var).var.ptr_ptr, &opline->result);
-               ;
+
        }
        AI_USE_PTR(EX_T(opline->result.u.var).var);
        ZEND_VM_NEXT_OPCODE();
@@ -4890,7 +4873,7 @@ static int ZEND_INIT_METHOD_CALL_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS
        zval *function_name;
        char *function_name_strval;
        int function_name_strlen;
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        zend_ptr_stack_3_push(&EG(arg_types_stack), EX(fbc), EX(object), EX(calling_scope));
 
@@ -4941,8 +4924,6 @@ static int ZEND_INIT_METHOD_CALL_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS
                EX(calling_scope) = NULL;
        }
 
-       ;
-       ;
 
        ZEND_VM_NEXT_OPCODE();
 }
@@ -4951,7 +4932,7 @@ static int ZEND_CASE_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
        int switch_expr_is_overloaded=0;
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        if (IS_TMP_VAR==IS_VAR) {
                if (EX_T(opline->op1.u.var).var.ptr_ptr) {
@@ -4965,7 +4946,6 @@ static int ZEND_CASE_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                                 _get_zval_ptr_tmp(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                                 &opline->op2.u.constant TSRMLS_CC);
 
-       ;
        if (switch_expr_is_overloaded) {
                /* We only free op1 if this is a string offset,
                 * Since if it is a TMP_VAR, it'll be reused by
@@ -4982,7 +4962,7 @@ static int ZEND_CASE_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_ADD_ARRAY_ELEMENT_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
        zval *array_ptr = &EX_T(opline->result.u.var).tmp_var;
        zval *expr_ptr, **expr_ptr_ptr = NULL;
        zval *offset=&opline->op2.u.constant;
@@ -5043,14 +5023,14 @@ static int ZEND_ADD_ARRAY_ELEMENT_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARG
                                /* do nothing */
                                break;
                }
-               ;
+
        } else {
                zend_hash_next_index_insert(array_ptr->value.ht, &expr_ptr, sizeof(zval *), NULL);
        }
        if (opline->extended_value) {
-               ;
+
        } else {
-               ;
+
        }
        ZEND_VM_NEXT_OPCODE();
 }
@@ -5381,7 +5361,6 @@ static int ZEND_INIT_METHOD_CALL_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        }
 
        zval_dtor(free_op2.var);
-       ;
 
        ZEND_VM_NEXT_OPCODE();
 }
@@ -5487,9 +5466,9 @@ static int ZEND_ADD_ARRAY_ELEMENT_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                zend_hash_next_index_insert(array_ptr->value.ht, &expr_ptr, sizeof(zval *), NULL);
        }
        if (opline->extended_value) {
-               ;
+
        } else {
-               ;
+
        }
        ZEND_VM_NEXT_OPCODE();
 }
@@ -5820,7 +5799,6 @@ static int ZEND_INIT_METHOD_CALL_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        }
 
        if (free_op2.var) {zval_ptr_dtor(&free_op2.var);};
-       ;
 
        ZEND_VM_NEXT_OPCODE();
 }
@@ -5926,9 +5904,9 @@ static int ZEND_ADD_ARRAY_ELEMENT_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                zend_hash_next_index_insert(array_ptr->value.ht, &expr_ptr, sizeof(zval *), NULL);
        }
        if (opline->extended_value) {
-               ;
+
        } else {
-               ;
+
        }
        ZEND_VM_NEXT_OPCODE();
 }
@@ -5941,7 +5919,7 @@ static int ZEND_INIT_ARRAY_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_ADD_ARRAY_ELEMENT_SPEC_TMP_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
        zval *array_ptr = &EX_T(opline->result.u.var).tmp_var;
        zval *expr_ptr, **expr_ptr_ptr = NULL;
        zval *offset=NULL;
@@ -6002,14 +5980,14 @@ static int ZEND_ADD_ARRAY_ELEMENT_SPEC_TMP_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_AR
                                /* do nothing */
                                break;
                }
-               ;
+
        } else {
                zend_hash_next_index_insert(array_ptr->value.ht, &expr_ptr, sizeof(zval *), NULL);
        }
        if (opline->extended_value) {
-               ;
+
        } else {
-               ;
+
        }
        ZEND_VM_NEXT_OPCODE();
 }
@@ -6022,241 +6000,241 @@ static int ZEND_INIT_ARRAY_SPEC_TMP_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_ADD_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        add_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_tmp(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
        zval_dtor(free_op1.var);
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_SUB_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        sub_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_tmp(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
        zval_dtor(free_op1.var);
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_MUL_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        mul_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_tmp(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
        zval_dtor(free_op1.var);
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_DIV_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        div_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_tmp(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
        zval_dtor(free_op1.var);
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_MOD_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        mod_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_tmp(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
        zval_dtor(free_op1.var);
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_SL_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        shift_left_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_tmp(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
        zval_dtor(free_op1.var);
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_SR_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        shift_right_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_tmp(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
        zval_dtor(free_op1.var);
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_CONCAT_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        concat_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_tmp(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
        zval_dtor(free_op1.var);
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_IS_IDENTICAL_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        is_identical_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_tmp(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
        zval_dtor(free_op1.var);
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_IS_NOT_IDENTICAL_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        is_not_identical_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_tmp(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
        zval_dtor(free_op1.var);
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_IS_EQUAL_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        is_equal_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_tmp(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
        zval_dtor(free_op1.var);
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_IS_NOT_EQUAL_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        is_not_equal_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_tmp(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
        zval_dtor(free_op1.var);
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_IS_SMALLER_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        is_smaller_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_tmp(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
        zval_dtor(free_op1.var);
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_IS_SMALLER_OR_EQUAL_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        is_smaller_or_equal_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_tmp(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
        zval_dtor(free_op1.var);
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_BW_OR_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        bitwise_or_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_tmp(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
        zval_dtor(free_op1.var);
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_BW_AND_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        bitwise_and_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_tmp(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
        zval_dtor(free_op1.var);
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_BW_XOR_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        bitwise_xor_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_tmp(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
        zval_dtor(free_op1.var);
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_BOOL_XOR_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        boolean_xor_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_tmp(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
        zval_dtor(free_op1.var);
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_ADD_VAR_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
        zval *var = _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC);
        zval var_copy;
        int use_copy;
@@ -6277,7 +6255,6 @@ static int ZEND_ADD_VAR_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
         * which aren't affected by FREE_OP(Ts, )'s anyway, unless they're
         * string offsets or overloaded objects
         */
-       ;
 
        ZEND_VM_NEXT_OPCODE();
 }
@@ -6288,7 +6265,7 @@ static int ZEND_INIT_METHOD_CALL_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        zval *function_name;
        char *function_name_strval;
        int function_name_strlen;
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        zend_ptr_stack_3_push(&EG(arg_types_stack), EX(fbc), EX(object), EX(calling_scope));
 
@@ -6339,8 +6316,6 @@ static int ZEND_INIT_METHOD_CALL_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                EX(calling_scope) = NULL;
        }
 
-       ;
-       ;
 
        ZEND_VM_NEXT_OPCODE();
 }
@@ -6349,7 +6324,7 @@ static int ZEND_CASE_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
        int switch_expr_is_overloaded=0;
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        if (IS_TMP_VAR==IS_VAR) {
                if (EX_T(opline->op1.u.var).var.ptr_ptr) {
@@ -6363,7 +6338,6 @@ static int ZEND_CASE_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                                 _get_zval_ptr_tmp(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                                 _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
 
-       ;
        if (switch_expr_is_overloaded) {
                /* We only free op1 if this is a string offset,
                 * Since if it is a TMP_VAR, it'll be reused by
@@ -6380,7 +6354,7 @@ static int ZEND_CASE_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_ADD_ARRAY_ELEMENT_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
        zval *array_ptr = &EX_T(opline->result.u.var).tmp_var;
        zval *expr_ptr, **expr_ptr_ptr = NULL;
        zval *offset=_get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC);
@@ -6441,14 +6415,14 @@ static int ZEND_ADD_ARRAY_ELEMENT_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                                /* do nothing */
                                break;
                }
-               ;
+
        } else {
                zend_hash_next_index_insert(array_ptr->value.ht, &expr_ptr, sizeof(zval *), NULL);
        }
        if (opline->extended_value) {
-               ;
+
        } else {
-               ;
+
        }
        ZEND_VM_NEXT_OPCODE();
 }
@@ -7751,234 +7725,234 @@ static int ZEND_INSTANCEOF_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_ADD_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        add_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                &opline->op2.u.constant TSRMLS_CC);
        if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_SUB_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        sub_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                &opline->op2.u.constant TSRMLS_CC);
        if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_MUL_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        mul_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                &opline->op2.u.constant TSRMLS_CC);
        if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_DIV_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        div_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                &opline->op2.u.constant TSRMLS_CC);
        if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_MOD_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        mod_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                &opline->op2.u.constant TSRMLS_CC);
        if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_SL_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        shift_left_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                &opline->op2.u.constant TSRMLS_CC);
        if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_SR_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        shift_right_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                &opline->op2.u.constant TSRMLS_CC);
        if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_CONCAT_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        concat_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                &opline->op2.u.constant TSRMLS_CC);
        if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_IS_IDENTICAL_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        is_identical_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                &opline->op2.u.constant TSRMLS_CC);
        if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_IS_NOT_IDENTICAL_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        is_not_identical_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                &opline->op2.u.constant TSRMLS_CC);
        if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_IS_EQUAL_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        is_equal_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                &opline->op2.u.constant TSRMLS_CC);
        if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_IS_NOT_EQUAL_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        is_not_equal_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                &opline->op2.u.constant TSRMLS_CC);
        if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_IS_SMALLER_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        is_smaller_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                &opline->op2.u.constant TSRMLS_CC);
        if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_IS_SMALLER_OR_EQUAL_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        is_smaller_or_equal_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                &opline->op2.u.constant TSRMLS_CC);
        if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_BW_OR_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        bitwise_or_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                &opline->op2.u.constant TSRMLS_CC);
        if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_BW_AND_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        bitwise_and_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                &opline->op2.u.constant TSRMLS_CC);
        if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_BW_XOR_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        bitwise_xor_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                &opline->op2.u.constant TSRMLS_CC);
        if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_BOOL_XOR_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        boolean_xor_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                &opline->op2.u.constant TSRMLS_CC);
        if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
@@ -7986,7 +7960,7 @@ static int zend_binary_assign_op_obj_helper_SPEC_VAR_CONST(int (*binary_op)(zval
 {
        zend_op *opline = EX(opline);
        zend_op *op_data = opline+1;
-       zend_free_op free_op1, free_op2, free_op_data1;
+       zend_free_op free_op1, free_op_data1;
        zval **object_ptr = _get_zval_ptr_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC);
        zval *object;
        zval *property = &opline->op2.u.constant;
@@ -8001,7 +7975,7 @@ static int zend_binary_assign_op_obj_helper_SPEC_VAR_CONST(int (*binary_op)(zval
 
        if (object->type != IS_OBJECT) {
                zend_error(E_WARNING, "Attempt to assign property of non-object");
-               ;
+
                FREE_OP(free_op_data1);
 
                if (!RETURN_VALUE_UNUSED(result)) {
@@ -8083,7 +8057,7 @@ static int zend_binary_assign_op_obj_helper_SPEC_VAR_CONST(int (*binary_op)(zval
                if (0) {
                        zval_ptr_dtor(&property);
                } else {
-                       ;
+
                }
                FREE_OP(free_op_data1);
        }
@@ -8097,7 +8071,7 @@ static int zend_binary_assign_op_obj_helper_SPEC_VAR_CONST(int (*binary_op)(zval
 static int zend_binary_assign_op_helper_SPEC_VAR_CONST(int (*binary_op)(zval *result, zval *op1, zval *op2 TSRMLS_DC), ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2, free_op_data2, free_op_data1;
+       zend_free_op free_op1, free_op_data2, free_op_data1;
        zval **var_ptr;
        zval *value;
        zend_bool increment_opline = 0;
@@ -8143,7 +8117,7 @@ static int zend_binary_assign_op_helper_SPEC_VAR_CONST(int (*binary_op)(zval *re
                        PZVAL_LOCK(*EX_T(opline->result.u.var).var.ptr_ptr);
                        AI_USE_PTR(EX_T(opline->result.u.var).var);
                }
-               ;
+
                if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
                if (increment_opline) {
                        ZEND_VM_INC_OPCODE();
@@ -8170,7 +8144,6 @@ static int zend_binary_assign_op_helper_SPEC_VAR_CONST(int (*binary_op)(zval *re
                PZVAL_LOCK(*var_ptr);
                AI_USE_PTR(EX_T(opline->result.u.var).var);
        }
-       ;
 
        if (increment_opline) {
                ZEND_VM_INC_OPCODE();
@@ -8238,7 +8211,7 @@ static int ZEND_ASSIGN_BW_XOR_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int zend_pre_incdec_property_helper_SPEC_VAR_CONST(incdec_t incdec_op, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
        zval **object_ptr = _get_zval_ptr_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC);
        zval *object;
        zval *property = &opline->op2.u.constant;
@@ -8250,7 +8223,7 @@ static int zend_pre_incdec_property_helper_SPEC_VAR_CONST(incdec_t incdec_op, ZE
 
        if (object->type != IS_OBJECT) {
                zend_error(E_WARNING, "Attempt to increment/decrement property of non-object");
-               ;
+
                if (!RETURN_VALUE_UNUSED(&opline->result)) {
                        *retval = EG(uninitialized_zval_ptr);
                        PZVAL_LOCK(*retval);
@@ -8311,7 +8284,7 @@ static int zend_pre_incdec_property_helper_SPEC_VAR_CONST(incdec_t incdec_op, ZE
        if (0) {
                zval_ptr_dtor(&property);
        } else {
-               ;
+
        }
        if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
        ZEND_VM_NEXT_OPCODE();
@@ -8330,7 +8303,7 @@ static int ZEND_PRE_DEC_OBJ_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int zend_post_incdec_property_helper_SPEC_VAR_CONST(incdec_t incdec_op, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
        zval **object_ptr = _get_zval_ptr_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC);
        zval *object;
        zval *property = &opline->op2.u.constant;
@@ -8342,7 +8315,7 @@ static int zend_post_incdec_property_helper_SPEC_VAR_CONST(incdec_t incdec_op, Z
 
        if (object->type != IS_OBJECT) {
                zend_error(E_WARNING, "Attempt to increment/decrement property of non-object");
-               ;
+
                *retval = *EG(uninitialized_zval_ptr);
                if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
                ZEND_VM_NEXT_OPCODE();
@@ -8402,7 +8375,7 @@ static int zend_post_incdec_property_helper_SPEC_VAR_CONST(incdec_t incdec_op, Z
        if (0) {
                zval_ptr_dtor(&property);
        } else {
-               ;
+
        }
        if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
        ZEND_VM_NEXT_OPCODE();
@@ -8421,14 +8394,14 @@ static int ZEND_POST_DEC_OBJ_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_FETCH_DIM_R_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
        zval *dim = &opline->op2.u.constant;
 
        if (opline->extended_value == ZEND_FETCH_ADD_LOCK && IS_VAR != IS_CV) {
                PZVAL_LOCK(*EX_T(opline->op1.u.var).var.ptr_ptr);
        }
        zend_fetch_dimension_address(RETURN_VALUE_UNUSED(&opline->result)?NULL:&EX_T(opline->result.u.var), _get_zval_ptr_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC), dim, 0, BP_VAR_R TSRMLS_CC);
-       ;
+
        if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
        ZEND_VM_NEXT_OPCODE();
 }
@@ -8436,11 +8409,11 @@ static int ZEND_FETCH_DIM_R_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_FETCH_DIM_W_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
        zval *dim = &opline->op2.u.constant;
 
        zend_fetch_dimension_address(RETURN_VALUE_UNUSED(&opline->result)?NULL:&EX_T(opline->result.u.var), _get_zval_ptr_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC), dim, 0, BP_VAR_W TSRMLS_CC);
-       ;
+
        if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
        ZEND_VM_NEXT_OPCODE();
 }
@@ -8448,11 +8421,11 @@ static int ZEND_FETCH_DIM_W_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_FETCH_DIM_RW_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
        zval *dim = &opline->op2.u.constant;
 
        zend_fetch_dimension_address(RETURN_VALUE_UNUSED(&opline->result)?NULL:&EX_T(opline->result.u.var), _get_zval_ptr_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC), dim, 0, BP_VAR_RW TSRMLS_CC);
-       ;
+
        if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
        ZEND_VM_NEXT_OPCODE();
 }
@@ -8460,11 +8433,11 @@ static int ZEND_FETCH_DIM_RW_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_FETCH_DIM_IS_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
        zval *dim = &opline->op2.u.constant;
 
        zend_fetch_dimension_address(RETURN_VALUE_UNUSED(&opline->result)?NULL:&EX_T(opline->result.u.var), _get_zval_ptr_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC), dim, 0, BP_VAR_IS TSRMLS_CC);
-       ;
+
        if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
        ZEND_VM_NEXT_OPCODE();
 }
@@ -8472,12 +8445,12 @@ static int ZEND_FETCH_DIM_IS_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_FETCH_DIM_FUNC_ARG_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
        int type = ARG_SHOULD_BE_SENT_BY_REF(EX(fbc), opline->extended_value)?BP_VAR_W:BP_VAR_R;
        zval *dim = &opline->op2.u.constant;
 
        zend_fetch_dimension_address(RETURN_VALUE_UNUSED(&opline->result)?NULL:&EX_T(opline->result.u.var), _get_zval_ptr_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC), dim, 0, type TSRMLS_CC);
-       ;
+
        if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
        ZEND_VM_NEXT_OPCODE();
 }
@@ -8485,7 +8458,7 @@ static int ZEND_FETCH_DIM_FUNC_ARG_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_AR
 static int ZEND_FETCH_DIM_UNSET_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
        zval *dim = &opline->op2.u.constant;
 
        /* Not needed in DIM_UNSET
@@ -8494,7 +8467,7 @@ static int ZEND_FETCH_DIM_UNSET_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        }
        */
        zend_fetch_dimension_address(RETURN_VALUE_UNUSED(&opline->result)?NULL:&EX_T(opline->result.u.var), _get_zval_ptr_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC), dim, 0, BP_VAR_UNSET TSRMLS_CC);
-       ;
+
        if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
        if (EX_T(opline->result.u.var).var.ptr_ptr == NULL) {
                zend_error_noreturn(E_ERROR, "Cannot unset string offsets");
@@ -8540,7 +8513,7 @@ static int zend_fetch_property_address_read_helper_SPEC_VAR_CONST(int type, ZEND
                SELECTIVE_PZVAL_LOCK(*retval, &opline->result);
                AI_USE_PTR(EX_T(opline->result.u.var).var);
        } else {
-               zend_free_op free_op2;
+               
                zval *offset  = &opline->op2.u.constant;
 
                if (0) {
@@ -8561,7 +8534,7 @@ static int zend_fetch_property_address_read_helper_SPEC_VAR_CONST(int type, ZEND
                if (0) {
                        zval_ptr_dtor(&offset);
                } else {
-                       ;
+
                }
        }
 
@@ -8577,7 +8550,7 @@ static int ZEND_FETCH_OBJ_R_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_FETCH_OBJ_W_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
        zval *property = &opline->op2.u.constant;
 
        if (opline->extended_value == ZEND_FETCH_ADD_LOCK && IS_VAR != IS_CV) {
@@ -8592,7 +8565,7 @@ static int ZEND_FETCH_OBJ_W_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        if (0) {
                zval_ptr_dtor(&property);
        } else {
-               ;
+
        }
        if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
        ZEND_VM_NEXT_OPCODE();
@@ -8601,7 +8574,7 @@ static int ZEND_FETCH_OBJ_W_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_FETCH_OBJ_RW_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
        zval *property = &opline->op2.u.constant;
 
        if (0) {
@@ -8611,7 +8584,7 @@ static int ZEND_FETCH_OBJ_RW_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        if (0) {
                zval_ptr_dtor(&property);
        } else {
-               ;
+
        }
        if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
        ZEND_VM_NEXT_OPCODE();
@@ -8628,7 +8601,7 @@ static int ZEND_FETCH_OBJ_FUNC_ARG_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_AR
 
        if (ARG_SHOULD_BE_SENT_BY_REF(EX(fbc), opline->extended_value)) {
                /* Behave like FETCH_OBJ_W */
-               zend_free_op free_op1, free_op2;
+               zend_free_op free_op1;
                zval *property = &opline->op2.u.constant;
 
                if (0) {
@@ -8638,7 +8611,7 @@ static int ZEND_FETCH_OBJ_FUNC_ARG_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_AR
                if (0) {
                        zval_ptr_dtor(&property);
                } else {
-                       ;
+
                }
                if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
                ZEND_VM_NEXT_OPCODE();
@@ -8650,7 +8623,7 @@ static int ZEND_FETCH_OBJ_FUNC_ARG_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_AR
 static int ZEND_FETCH_OBJ_UNSET_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2, free_res;
+       zend_free_op free_op1, free_res;
        zval *property = &opline->op2.u.constant;
 
        if (0) {
@@ -8660,7 +8633,7 @@ static int ZEND_FETCH_OBJ_UNSET_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        if (0) {
                zval_ptr_dtor(&property);
        } else {
-               ;
+
        }
        if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
 
@@ -8704,12 +8677,11 @@ static int ZEND_ASSIGN_DIM_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        if (object_ptr && (*object_ptr)->type == IS_OBJECT) {
                zend_assign_to_object(&opline->result, object_ptr, &opline->op2, &op_data->op1, EX(Ts), ZEND_ASSIGN_DIM TSRMLS_CC);
        } else {
-               zend_free_op free_op2, free_op_data1;
+               zend_free_op free_op_data1;
                zval *value;
                zval *dim = &opline->op2.u.constant;
 
                zend_fetch_dimension_address(&EX_T(op_data->op2.u.var), object_ptr, dim, 0, BP_VAR_W TSRMLS_CC);
-               ;
 
                value = get_zval_ptr(&op_data->op1, EX(Ts), &free_op_data1, BP_VAR_R);
                zend_assign_to_variable(&opline->result, &op_data->op2, &op_data->op1, value, (IS_TMP_FREE(free_op_data1)?IS_TMP_VAR:op_data->op1.op_type), EX(Ts) TSRMLS_CC);
@@ -8724,12 +8696,11 @@ static int ZEND_ASSIGN_DIM_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_ASSIGN_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op2;
+       
        zval *value = &opline->op2.u.constant;
 
        zend_assign_to_variable(&opline->result, &opline->op1, &opline->op2, value, (0?IS_TMP_VAR:IS_CONST), EX(Ts) TSRMLS_CC);
        /* zend_assign_to_variable() always takes care of op2, never free it! */
-       ;
 
        ZEND_VM_NEXT_OPCODE();
 }
@@ -8740,7 +8711,7 @@ static int ZEND_INIT_METHOD_CALL_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS
        zval *function_name;
        char *function_name_strval;
        int function_name_strlen;
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        zend_ptr_stack_3_push(&EG(arg_types_stack), EX(fbc), EX(object), EX(calling_scope));
 
@@ -8791,7 +8762,6 @@ static int ZEND_INIT_METHOD_CALL_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS
                EX(calling_scope) = NULL;
        }
 
-       ;
        if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
 
        ZEND_VM_NEXT_OPCODE();
@@ -8801,7 +8771,7 @@ static int ZEND_CASE_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
        int switch_expr_is_overloaded=0;
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        if (IS_VAR==IS_VAR) {
                if (EX_T(opline->op1.u.var).var.ptr_ptr) {
@@ -8815,7 +8785,6 @@ static int ZEND_CASE_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                                 _get_zval_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                                 &opline->op2.u.constant TSRMLS_CC);
 
-       ;
        if (switch_expr_is_overloaded) {
                /* We only free op1 if this is a string offset,
                 * Since if it is a TMP_VAR, it'll be reused by
@@ -8832,7 +8801,7 @@ static int ZEND_CASE_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_ADD_ARRAY_ELEMENT_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
        zval *array_ptr = &EX_T(opline->result.u.var).tmp_var;
        zval *expr_ptr, **expr_ptr_ptr = NULL;
        zval *offset=&opline->op2.u.constant;
@@ -8893,7 +8862,7 @@ static int ZEND_ADD_ARRAY_ELEMENT_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARG
                                /* do nothing */
                                break;
                }
-               ;
+
        } else {
                zend_hash_next_index_insert(array_ptr->value.ht, &expr_ptr, sizeof(zval *), NULL);
        }
@@ -8913,7 +8882,7 @@ static int ZEND_INIT_ARRAY_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_UNSET_DIM_OBJ_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
        zval **container = _get_zval_ptr_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC);
        zval *offset = &opline->op2.u.constant;
        long index;
@@ -8970,7 +8939,7 @@ static int ZEND_UNSET_DIM_OBJ_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                                                        zend_error(E_WARNING, "Illegal offset type in unset");
                                                        break;
                                        }
-                                       ;
+
                                        break;
                                }
                                case IS_OBJECT:
@@ -8984,14 +8953,14 @@ static int ZEND_UNSET_DIM_OBJ_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                                        if (0) {
                                                zval_ptr_dtor(&offset);
                                        } else {
-                                               ;
+
                                        }
                                        break;
                                case IS_STRING:
                                        zend_error_noreturn(E_ERROR, "Cannot unset string offsets");
                                        ZEND_VM_CONTINUE(); /* bailed out before */
                                default:
-                                       ;
+
                                        break;
                        }
                } else { /* ZEND_UNSET_OBJ */
@@ -9003,13 +8972,13 @@ static int ZEND_UNSET_DIM_OBJ_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                                if (0) {
                                        zval_ptr_dtor(&offset);
                                } else {
-                                       ;
+
                                }
                        }
                }
        } else {
                /* overloaded element */
-               ;
+
        }
        if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
 
@@ -9026,7 +8995,7 @@ static int zend_isset_isempty_dim_prop_obj_handler_SPEC_VAR_CONST(int prop_dim,
        long index;
 
        if (container) {
-               zend_free_op free_op2;
+               
                zval *offset = &opline->op2.u.constant;
 
                if ((*container)->type == IS_ARRAY) {
@@ -9081,7 +9050,7 @@ static int zend_isset_isempty_dim_prop_obj_handler_SPEC_VAR_CONST(int prop_dim,
                                        }
                                        break;
                        }
-                       ;
+
                } else if ((*container)->type == IS_OBJECT) {
                        if (0) {
                                MAKE_REAL_ZVAL_PTR(offset);
@@ -9094,7 +9063,7 @@ static int zend_isset_isempty_dim_prop_obj_handler_SPEC_VAR_CONST(int prop_dim,
                        if (0) {
                                zval_ptr_dtor(&offset);
                        } else {
-                               ;
+
                        }
                } else if ((*container)->type == IS_STRING && !prop_dim) { /* string offsets */
                        zval tmp;
@@ -9119,9 +9088,9 @@ static int zend_isset_isempty_dim_prop_obj_handler_SPEC_VAR_CONST(int prop_dim,
                                                break;
                                }
                        }
-                       ;
+
                } else {
-                       ;
+
                }
        }
 
@@ -10132,7 +10101,6 @@ static int ZEND_ASSIGN_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 
        zend_assign_to_variable(&opline->result, &opline->op1, &opline->op2, value, (1?IS_TMP_VAR:IS_TMP_VAR), EX(Ts) TSRMLS_CC);
        /* zend_assign_to_variable() always takes care of op2, never free it! */
-       ;
 
        ZEND_VM_NEXT_OPCODE();
 }
@@ -11994,7 +11962,7 @@ static int zend_binary_assign_op_obj_helper_SPEC_VAR_UNUSED(int (*binary_op)(zva
 {
        zend_op *opline = EX(opline);
        zend_op *op_data = opline+1;
-       zend_free_op free_op1, free_op2, free_op_data1;
+       zend_free_op free_op1, free_op_data1;
        zval **object_ptr = _get_zval_ptr_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC);
        zval *object;
        zval *property = NULL;
@@ -12009,7 +11977,7 @@ static int zend_binary_assign_op_obj_helper_SPEC_VAR_UNUSED(int (*binary_op)(zva
 
        if (object->type != IS_OBJECT) {
                zend_error(E_WARNING, "Attempt to assign property of non-object");
-               ;
+
                FREE_OP(free_op_data1);
 
                if (!RETURN_VALUE_UNUSED(result)) {
@@ -12091,7 +12059,7 @@ static int zend_binary_assign_op_obj_helper_SPEC_VAR_UNUSED(int (*binary_op)(zva
                if (0) {
                        zval_ptr_dtor(&property);
                } else {
-                       ;
+
                }
                FREE_OP(free_op_data1);
        }
@@ -12105,7 +12073,7 @@ static int zend_binary_assign_op_obj_helper_SPEC_VAR_UNUSED(int (*binary_op)(zva
 static int zend_binary_assign_op_helper_SPEC_VAR_UNUSED(int (*binary_op)(zval *result, zval *op1, zval *op2 TSRMLS_DC), ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2, free_op_data2, free_op_data1;
+       zend_free_op free_op1, free_op_data2, free_op_data1;
        zval **var_ptr;
        zval *value;
        zend_bool increment_opline = 0;
@@ -12151,7 +12119,7 @@ static int zend_binary_assign_op_helper_SPEC_VAR_UNUSED(int (*binary_op)(zval *r
                        PZVAL_LOCK(*EX_T(opline->result.u.var).var.ptr_ptr);
                        AI_USE_PTR(EX_T(opline->result.u.var).var);
                }
-               ;
+
                if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
                if (increment_opline) {
                        ZEND_VM_INC_OPCODE();
@@ -12178,7 +12146,6 @@ static int zend_binary_assign_op_helper_SPEC_VAR_UNUSED(int (*binary_op)(zval *r
                PZVAL_LOCK(*var_ptr);
                AI_USE_PTR(EX_T(opline->result.u.var).var);
        }
-       ;
 
        if (increment_opline) {
                ZEND_VM_INC_OPCODE();
@@ -12246,11 +12213,11 @@ static int ZEND_ASSIGN_BW_XOR_SPEC_VAR_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_FETCH_DIM_W_SPEC_VAR_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
        zval *dim = NULL;
 
        zend_fetch_dimension_address(RETURN_VALUE_UNUSED(&opline->result)?NULL:&EX_T(opline->result.u.var), _get_zval_ptr_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC), dim, 0, BP_VAR_W TSRMLS_CC);
-       ;
+
        if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
        ZEND_VM_NEXT_OPCODE();
 }
@@ -12272,12 +12239,11 @@ static int ZEND_ASSIGN_DIM_SPEC_VAR_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        if (object_ptr && (*object_ptr)->type == IS_OBJECT) {
                zend_assign_to_object(&opline->result, object_ptr, &opline->op2, &op_data->op1, EX(Ts), ZEND_ASSIGN_DIM TSRMLS_CC);
        } else {
-               zend_free_op free_op2, free_op_data1;
+               zend_free_op free_op_data1;
                zval *value;
                zval *dim = NULL;
 
                zend_fetch_dimension_address(&EX_T(op_data->op2.u.var), object_ptr, dim, 0, BP_VAR_W TSRMLS_CC);
-               ;
 
                value = get_zval_ptr(&op_data->op1, EX(Ts), &free_op_data1, BP_VAR_R);
                zend_assign_to_variable(&opline->result, &op_data->op2, &op_data->op1, value, (IS_TMP_FREE(free_op_data1)?IS_TMP_VAR:op_data->op1.op_type), EX(Ts) TSRMLS_CC);
@@ -12292,7 +12258,7 @@ static int ZEND_ASSIGN_DIM_SPEC_VAR_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_ADD_ARRAY_ELEMENT_SPEC_VAR_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
        zval *array_ptr = &EX_T(opline->result.u.var).tmp_var;
        zval *expr_ptr, **expr_ptr_ptr = NULL;
        zval *offset=NULL;
@@ -12353,7 +12319,7 @@ static int ZEND_ADD_ARRAY_ELEMENT_SPEC_VAR_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_AR
                                /* do nothing */
                                break;
                }
-               ;
+
        } else {
                zend_hash_next_index_insert(array_ptr->value.ht, &expr_ptr, sizeof(zval *), NULL);
        }
@@ -12373,234 +12339,234 @@ static int ZEND_INIT_ARRAY_SPEC_VAR_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_ADD_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        add_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
        if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_SUB_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        sub_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
        if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_MUL_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        mul_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
        if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_DIV_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        div_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
        if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_MOD_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        mod_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
        if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_SL_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        shift_left_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
        if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_SR_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        shift_right_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
        if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_CONCAT_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        concat_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
        if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_IS_IDENTICAL_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        is_identical_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
        if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_IS_NOT_IDENTICAL_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        is_not_identical_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
        if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_IS_EQUAL_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        is_equal_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
        if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_IS_NOT_EQUAL_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        is_not_equal_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
        if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_IS_SMALLER_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        is_smaller_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
        if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_IS_SMALLER_OR_EQUAL_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        is_smaller_or_equal_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
        if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_BW_OR_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        bitwise_or_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
        if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_BW_AND_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        bitwise_and_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
        if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_BW_XOR_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        bitwise_xor_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
        if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_BOOL_XOR_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        boolean_xor_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
        if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
@@ -12608,7 +12574,7 @@ static int zend_binary_assign_op_obj_helper_SPEC_VAR_CV(int (*binary_op)(zval *r
 {
        zend_op *opline = EX(opline);
        zend_op *op_data = opline+1;
-       zend_free_op free_op1, free_op2, free_op_data1;
+       zend_free_op free_op1, free_op_data1;
        zval **object_ptr = _get_zval_ptr_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC);
        zval *object;
        zval *property = _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC);
@@ -12623,7 +12589,7 @@ static int zend_binary_assign_op_obj_helper_SPEC_VAR_CV(int (*binary_op)(zval *r
 
        if (object->type != IS_OBJECT) {
                zend_error(E_WARNING, "Attempt to assign property of non-object");
-               ;
+
                FREE_OP(free_op_data1);
 
                if (!RETURN_VALUE_UNUSED(result)) {
@@ -12705,7 +12671,7 @@ static int zend_binary_assign_op_obj_helper_SPEC_VAR_CV(int (*binary_op)(zval *r
                if (0) {
                        zval_ptr_dtor(&property);
                } else {
-                       ;
+
                }
                FREE_OP(free_op_data1);
        }
@@ -12719,7 +12685,7 @@ static int zend_binary_assign_op_obj_helper_SPEC_VAR_CV(int (*binary_op)(zval *r
 static int zend_binary_assign_op_helper_SPEC_VAR_CV(int (*binary_op)(zval *result, zval *op1, zval *op2 TSRMLS_DC), ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2, free_op_data2, free_op_data1;
+       zend_free_op free_op1, free_op_data2, free_op_data1;
        zval **var_ptr;
        zval *value;
        zend_bool increment_opline = 0;
@@ -12765,7 +12731,7 @@ static int zend_binary_assign_op_helper_SPEC_VAR_CV(int (*binary_op)(zval *resul
                        PZVAL_LOCK(*EX_T(opline->result.u.var).var.ptr_ptr);
                        AI_USE_PTR(EX_T(opline->result.u.var).var);
                }
-               ;
+
                if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
                if (increment_opline) {
                        ZEND_VM_INC_OPCODE();
@@ -12792,7 +12758,6 @@ static int zend_binary_assign_op_helper_SPEC_VAR_CV(int (*binary_op)(zval *resul
                PZVAL_LOCK(*var_ptr);
                AI_USE_PTR(EX_T(opline->result.u.var).var);
        }
-       ;
 
        if (increment_opline) {
                ZEND_VM_INC_OPCODE();
@@ -12860,7 +12825,7 @@ static int ZEND_ASSIGN_BW_XOR_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int zend_pre_incdec_property_helper_SPEC_VAR_CV(incdec_t incdec_op, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
        zval **object_ptr = _get_zval_ptr_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC);
        zval *object;
        zval *property = _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC);
@@ -12872,7 +12837,7 @@ static int zend_pre_incdec_property_helper_SPEC_VAR_CV(incdec_t incdec_op, ZEND_
 
        if (object->type != IS_OBJECT) {
                zend_error(E_WARNING, "Attempt to increment/decrement property of non-object");
-               ;
+
                if (!RETURN_VALUE_UNUSED(&opline->result)) {
                        *retval = EG(uninitialized_zval_ptr);
                        PZVAL_LOCK(*retval);
@@ -12933,7 +12898,7 @@ static int zend_pre_incdec_property_helper_SPEC_VAR_CV(incdec_t incdec_op, ZEND_
        if (0) {
                zval_ptr_dtor(&property);
        } else {
-               ;
+
        }
        if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
        ZEND_VM_NEXT_OPCODE();
@@ -12952,7 +12917,7 @@ static int ZEND_PRE_DEC_OBJ_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int zend_post_incdec_property_helper_SPEC_VAR_CV(incdec_t incdec_op, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
        zval **object_ptr = _get_zval_ptr_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC);
        zval *object;
        zval *property = _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC);
@@ -12964,7 +12929,7 @@ static int zend_post_incdec_property_helper_SPEC_VAR_CV(incdec_t incdec_op, ZEND
 
        if (object->type != IS_OBJECT) {
                zend_error(E_WARNING, "Attempt to increment/decrement property of non-object");
-               ;
+
                *retval = *EG(uninitialized_zval_ptr);
                if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
                ZEND_VM_NEXT_OPCODE();
@@ -13024,7 +12989,7 @@ static int zend_post_incdec_property_helper_SPEC_VAR_CV(incdec_t incdec_op, ZEND
        if (0) {
                zval_ptr_dtor(&property);
        } else {
-               ;
+
        }
        if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
        ZEND_VM_NEXT_OPCODE();
@@ -13043,14 +13008,14 @@ static int ZEND_POST_DEC_OBJ_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_FETCH_DIM_R_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
        zval *dim = _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC);
 
        if (opline->extended_value == ZEND_FETCH_ADD_LOCK && IS_VAR != IS_CV) {
                PZVAL_LOCK(*EX_T(opline->op1.u.var).var.ptr_ptr);
        }
        zend_fetch_dimension_address(RETURN_VALUE_UNUSED(&opline->result)?NULL:&EX_T(opline->result.u.var), _get_zval_ptr_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC), dim, 0, BP_VAR_R TSRMLS_CC);
-       ;
+
        if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
        ZEND_VM_NEXT_OPCODE();
 }
@@ -13058,11 +13023,11 @@ static int ZEND_FETCH_DIM_R_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_FETCH_DIM_W_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
        zval *dim = _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC);
 
        zend_fetch_dimension_address(RETURN_VALUE_UNUSED(&opline->result)?NULL:&EX_T(opline->result.u.var), _get_zval_ptr_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC), dim, 0, BP_VAR_W TSRMLS_CC);
-       ;
+
        if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
        ZEND_VM_NEXT_OPCODE();
 }
@@ -13070,11 +13035,11 @@ static int ZEND_FETCH_DIM_W_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_FETCH_DIM_RW_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
        zval *dim = _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC);
 
        zend_fetch_dimension_address(RETURN_VALUE_UNUSED(&opline->result)?NULL:&EX_T(opline->result.u.var), _get_zval_ptr_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC), dim, 0, BP_VAR_RW TSRMLS_CC);
-       ;
+
        if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
        ZEND_VM_NEXT_OPCODE();
 }
@@ -13082,11 +13047,11 @@ static int ZEND_FETCH_DIM_RW_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_FETCH_DIM_IS_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
        zval *dim = _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC);
 
        zend_fetch_dimension_address(RETURN_VALUE_UNUSED(&opline->result)?NULL:&EX_T(opline->result.u.var), _get_zval_ptr_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC), dim, 0, BP_VAR_IS TSRMLS_CC);
-       ;
+
        if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
        ZEND_VM_NEXT_OPCODE();
 }
@@ -13094,12 +13059,12 @@ static int ZEND_FETCH_DIM_IS_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_FETCH_DIM_FUNC_ARG_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
        int type = ARG_SHOULD_BE_SENT_BY_REF(EX(fbc), opline->extended_value)?BP_VAR_W:BP_VAR_R;
        zval *dim = _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC);
 
        zend_fetch_dimension_address(RETURN_VALUE_UNUSED(&opline->result)?NULL:&EX_T(opline->result.u.var), _get_zval_ptr_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC), dim, 0, type TSRMLS_CC);
-       ;
+
        if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
        ZEND_VM_NEXT_OPCODE();
 }
@@ -13107,7 +13072,7 @@ static int ZEND_FETCH_DIM_FUNC_ARG_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_FETCH_DIM_UNSET_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
        zval *dim = _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC);
 
        /* Not needed in DIM_UNSET
@@ -13116,7 +13081,7 @@ static int ZEND_FETCH_DIM_UNSET_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        }
        */
        zend_fetch_dimension_address(RETURN_VALUE_UNUSED(&opline->result)?NULL:&EX_T(opline->result.u.var), _get_zval_ptr_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC), dim, 0, BP_VAR_UNSET TSRMLS_CC);
-       ;
+
        if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
        if (EX_T(opline->result.u.var).var.ptr_ptr == NULL) {
                zend_error_noreturn(E_ERROR, "Cannot unset string offsets");
@@ -13162,7 +13127,7 @@ static int zend_fetch_property_address_read_helper_SPEC_VAR_CV(int type, ZEND_OP
                SELECTIVE_PZVAL_LOCK(*retval, &opline->result);
                AI_USE_PTR(EX_T(opline->result.u.var).var);
        } else {
-               zend_free_op free_op2;
+               
                zval *offset  = _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC);
 
                if (0) {
@@ -13183,7 +13148,7 @@ static int zend_fetch_property_address_read_helper_SPEC_VAR_CV(int type, ZEND_OP
                if (0) {
                        zval_ptr_dtor(&offset);
                } else {
-                       ;
+
                }
        }
 
@@ -13199,7 +13164,7 @@ static int ZEND_FETCH_OBJ_R_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_FETCH_OBJ_W_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
        zval *property = _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC);
 
        if (opline->extended_value == ZEND_FETCH_ADD_LOCK && IS_VAR != IS_CV) {
@@ -13214,7 +13179,7 @@ static int ZEND_FETCH_OBJ_W_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        if (0) {
                zval_ptr_dtor(&property);
        } else {
-               ;
+
        }
        if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
        ZEND_VM_NEXT_OPCODE();
@@ -13223,7 +13188,7 @@ static int ZEND_FETCH_OBJ_W_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_FETCH_OBJ_RW_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
        zval *property = _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC);
 
        if (0) {
@@ -13233,7 +13198,7 @@ static int ZEND_FETCH_OBJ_RW_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        if (0) {
                zval_ptr_dtor(&property);
        } else {
-               ;
+
        }
        if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
        ZEND_VM_NEXT_OPCODE();
@@ -13250,7 +13215,7 @@ static int ZEND_FETCH_OBJ_FUNC_ARG_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 
        if (ARG_SHOULD_BE_SENT_BY_REF(EX(fbc), opline->extended_value)) {
                /* Behave like FETCH_OBJ_W */
-               zend_free_op free_op1, free_op2;
+               zend_free_op free_op1;
                zval *property = _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC);
 
                if (0) {
@@ -13260,7 +13225,7 @@ static int ZEND_FETCH_OBJ_FUNC_ARG_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                if (0) {
                        zval_ptr_dtor(&property);
                } else {
-                       ;
+
                }
                if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
                ZEND_VM_NEXT_OPCODE();
@@ -13272,7 +13237,7 @@ static int ZEND_FETCH_OBJ_FUNC_ARG_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_FETCH_OBJ_UNSET_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2, free_res;
+       zend_free_op free_op1, free_res;
        zval *property = _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC);
 
        if (0) {
@@ -13282,7 +13247,7 @@ static int ZEND_FETCH_OBJ_UNSET_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        if (0) {
                zval_ptr_dtor(&property);
        } else {
-               ;
+
        }
        if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
 
@@ -13326,12 +13291,11 @@ static int ZEND_ASSIGN_DIM_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        if (object_ptr && (*object_ptr)->type == IS_OBJECT) {
                zend_assign_to_object(&opline->result, object_ptr, &opline->op2, &op_data->op1, EX(Ts), ZEND_ASSIGN_DIM TSRMLS_CC);
        } else {
-               zend_free_op free_op2, free_op_data1;
+               zend_free_op free_op_data1;
                zval *value;
                zval *dim = _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC);
 
                zend_fetch_dimension_address(&EX_T(op_data->op2.u.var), object_ptr, dim, 0, BP_VAR_W TSRMLS_CC);
-               ;
 
                value = get_zval_ptr(&op_data->op1, EX(Ts), &free_op_data1, BP_VAR_R);
                zend_assign_to_variable(&opline->result, &op_data->op2, &op_data->op1, value, (IS_TMP_FREE(free_op_data1)?IS_TMP_VAR:op_data->op1.op_type), EX(Ts) TSRMLS_CC);
@@ -13346,12 +13310,11 @@ static int ZEND_ASSIGN_DIM_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_ASSIGN_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op2;
+       
        zval *value = _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC);
 
        zend_assign_to_variable(&opline->result, &opline->op1, &opline->op2, value, (0?IS_TMP_VAR:IS_CV), EX(Ts) TSRMLS_CC);
        /* zend_assign_to_variable() always takes care of op2, never free it! */
-       ;
 
        ZEND_VM_NEXT_OPCODE();
 }
@@ -13384,7 +13347,6 @@ static int ZEND_ASSIGN_REF_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        }
 
        if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-       ;
 
        ZEND_VM_NEXT_OPCODE();
 }
@@ -13395,7 +13357,7 @@ static int ZEND_INIT_METHOD_CALL_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        zval *function_name;
        char *function_name_strval;
        int function_name_strlen;
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        zend_ptr_stack_3_push(&EG(arg_types_stack), EX(fbc), EX(object), EX(calling_scope));
 
@@ -13446,7 +13408,6 @@ static int ZEND_INIT_METHOD_CALL_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                EX(calling_scope) = NULL;
        }
 
-       ;
        if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
 
        ZEND_VM_NEXT_OPCODE();
@@ -13456,7 +13417,7 @@ static int ZEND_CASE_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
        int switch_expr_is_overloaded=0;
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
 
        if (IS_VAR==IS_VAR) {
                if (EX_T(opline->op1.u.var).var.ptr_ptr) {
@@ -13470,7 +13431,6 @@ static int ZEND_CASE_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                                 _get_zval_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC),
                                 _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
 
-       ;
        if (switch_expr_is_overloaded) {
                /* We only free op1 if this is a string offset,
                 * Since if it is a TMP_VAR, it'll be reused by
@@ -13487,7 +13447,7 @@ static int ZEND_CASE_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_ADD_ARRAY_ELEMENT_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
        zval *array_ptr = &EX_T(opline->result.u.var).tmp_var;
        zval *expr_ptr, **expr_ptr_ptr = NULL;
        zval *offset=_get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC);
@@ -13548,7 +13508,7 @@ static int ZEND_ADD_ARRAY_ELEMENT_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                                /* do nothing */
                                break;
                }
-               ;
+
        } else {
                zend_hash_next_index_insert(array_ptr->value.ht, &expr_ptr, sizeof(zval *), NULL);
        }
@@ -13568,7 +13528,7 @@ static int ZEND_INIT_ARRAY_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_UNSET_DIM_OBJ_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op1;
        zval **container = _get_zval_ptr_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC);
        zval *offset = _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC);
        long index;
@@ -13625,7 +13585,7 @@ static int ZEND_UNSET_DIM_OBJ_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                                                        zend_error(E_WARNING, "Illegal offset type in unset");
                                                        break;
                                        }
-                                       ;
+
                                        break;
                                }
                                case IS_OBJECT:
@@ -13639,14 +13599,14 @@ static int ZEND_UNSET_DIM_OBJ_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                                        if (0) {
                                                zval_ptr_dtor(&offset);
                                        } else {
-                                               ;
+
                                        }
                                        break;
                                case IS_STRING:
                                        zend_error_noreturn(E_ERROR, "Cannot unset string offsets");
                                        ZEND_VM_CONTINUE(); /* bailed out before */
                                default:
-                                       ;
+
                                        break;
                        }
                } else { /* ZEND_UNSET_OBJ */
@@ -13658,13 +13618,13 @@ static int ZEND_UNSET_DIM_OBJ_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                                if (0) {
                                        zval_ptr_dtor(&offset);
                                } else {
-                                       ;
+
                                }
                        }
                }
        } else {
                /* overloaded element */
-               ;
+
        }
        if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
 
@@ -13681,7 +13641,7 @@ static int zend_isset_isempty_dim_prop_obj_handler_SPEC_VAR_CV(int prop_dim, ZEN
        long index;
 
        if (container) {
-               zend_free_op free_op2;
+               
                zval *offset = _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC);
 
                if ((*container)->type == IS_ARRAY) {
@@ -13736,7 +13696,7 @@ static int zend_isset_isempty_dim_prop_obj_handler_SPEC_VAR_CV(int prop_dim, ZEN
                                        }
                                        break;
                        }
-                       ;
+
                } else if ((*container)->type == IS_OBJECT) {
                        if (0) {
                                MAKE_REAL_ZVAL_PTR(offset);
@@ -13749,7 +13709,7 @@ static int zend_isset_isempty_dim_prop_obj_handler_SPEC_VAR_CV(int prop_dim, ZEN
                        if (0) {
                                zval_ptr_dtor(&offset);
                        } else {
-                               ;
+
                        }
                } else if ((*container)->type == IS_STRING && !prop_dim) { /* string offsets */
                        zval tmp;
@@ -13774,9 +13734,9 @@ static int zend_isset_isempty_dim_prop_obj_handler_SPEC_VAR_CV(int prop_dim, ZEN
                                                break;
                                }
                        }
-                       ;
+
                } else {
-                       ;
+
                }
        }
 
@@ -13809,7 +13769,7 @@ static int ZEND_ISSET_ISEMPTY_PROP_OBJ_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_A
 static int ZEND_CLONE_SPEC_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1;
+       
        zval *obj = _get_obj_zval_ptr_unused(TSRMLS_C);
        zend_class_entry *ce;
        zend_function *clone;
@@ -13819,7 +13779,7 @@ static int ZEND_CLONE_SPEC_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                zend_error(E_WARNING, "__clone method called on non-object");
                EX_T(opline->result.u.var).var.ptr = EG(error_zval_ptr);
                EX_T(opline->result.u.var).var.ptr->refcount++;
-               ;
+
                ZEND_VM_NEXT_OPCODE();
        }
 
@@ -13858,7 +13818,7 @@ static int ZEND_CLONE_SPEC_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                EX_T(opline->result.u.var).var.ptr->refcount=1;
                EX_T(opline->result.u.var).var.ptr->is_ref=1;
        }
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
@@ -13868,7 +13828,7 @@ static int ZEND_EXIT_SPEC_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 
        if (IS_UNUSED != IS_UNUSED) {
                zval *ptr;
-               zend_free_op free_op1;
+               
 
                ptr = NULL;
                if (Z_TYPE_P(ptr) == IS_LONG) {
@@ -13876,7 +13836,7 @@ static int ZEND_EXIT_SPEC_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                } else {
                        zend_print_variable(ptr);
                }
-               ;
+
        }
        zend_bailout();
        ZEND_VM_NEXT_OPCODE();
@@ -13886,7 +13846,7 @@ static int zend_binary_assign_op_obj_helper_SPEC_UNUSED_CONST(int (*binary_op)(z
 {
        zend_op *opline = EX(opline);
        zend_op *op_data = opline+1;
-       zend_free_op free_op1, free_op2, free_op_data1;
+       zend_free_op free_op_data1;
        zval **object_ptr = _get_obj_zval_ptr_ptr_unused(TSRMLS_C);
        zval *object;
        zval *property = &opline->op2.u.constant;
@@ -13901,7 +13861,7 @@ static int zend_binary_assign_op_obj_helper_SPEC_UNUSED_CONST(int (*binary_op)(z
 
        if (object->type != IS_OBJECT) {
                zend_error(E_WARNING, "Attempt to assign property of non-object");
-               ;
+
                FREE_OP(free_op_data1);
 
                if (!RETURN_VALUE_UNUSED(result)) {
@@ -13983,12 +13943,11 @@ static int zend_binary_assign_op_obj_helper_SPEC_UNUSED_CONST(int (*binary_op)(z
                if (0) {
                        zval_ptr_dtor(&property);
                } else {
-                       ;
+
                }
                FREE_OP(free_op_data1);
        }
 
-       ;
        /* assign_obj has two opcodes! */
        ZEND_VM_INC_OPCODE();
        ZEND_VM_NEXT_OPCODE();
@@ -13997,7 +13956,7 @@ static int zend_binary_assign_op_obj_helper_SPEC_UNUSED_CONST(int (*binary_op)(z
 static int zend_binary_assign_op_helper_SPEC_UNUSED_CONST(int (*binary_op)(zval *result, zval *op1, zval *op2 TSRMLS_DC), ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2, free_op_data2, free_op_data1;
+       zend_free_op free_op1, free_op_data2, free_op_data1;
        zval **var_ptr;
        zval *value;
        zend_bool increment_opline = 0;
@@ -14043,8 +14002,8 @@ static int zend_binary_assign_op_helper_SPEC_UNUSED_CONST(int (*binary_op)(zval
                        PZVAL_LOCK(*EX_T(opline->result.u.var).var.ptr_ptr);
                        AI_USE_PTR(EX_T(opline->result.u.var).var);
                }
-               ;
-               ;
+
+
                if (increment_opline) {
                        ZEND_VM_INC_OPCODE();
                }
@@ -14070,13 +14029,12 @@ static int zend_binary_assign_op_helper_SPEC_UNUSED_CONST(int (*binary_op)(zval
                PZVAL_LOCK(*var_ptr);
                AI_USE_PTR(EX_T(opline->result.u.var).var);
        }
-       ;
 
        if (increment_opline) {
                ZEND_VM_INC_OPCODE();
                FREE_OP_VAR_PTR(free_op_data2);
        }
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
@@ -14138,7 +14096,7 @@ static int ZEND_ASSIGN_BW_XOR_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS
 static int zend_pre_incdec_property_helper_SPEC_UNUSED_CONST(incdec_t incdec_op, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
        zval **object_ptr = _get_obj_zval_ptr_ptr_unused(TSRMLS_C);
        zval *object;
        zval *property = &opline->op2.u.constant;
@@ -14150,12 +14108,12 @@ static int zend_pre_incdec_property_helper_SPEC_UNUSED_CONST(incdec_t incdec_op,
 
        if (object->type != IS_OBJECT) {
                zend_error(E_WARNING, "Attempt to increment/decrement property of non-object");
-               ;
+
                if (!RETURN_VALUE_UNUSED(&opline->result)) {
                        *retval = EG(uninitialized_zval_ptr);
                        PZVAL_LOCK(*retval);
                }
-               ;
+
                ZEND_VM_NEXT_OPCODE();
        }
 
@@ -14211,9 +14169,9 @@ static int zend_pre_incdec_property_helper_SPEC_UNUSED_CONST(incdec_t incdec_op,
        if (0) {
                zval_ptr_dtor(&property);
        } else {
-               ;
+
        }
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
@@ -14230,7 +14188,7 @@ static int ZEND_PRE_DEC_OBJ_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int zend_post_incdec_property_helper_SPEC_UNUSED_CONST(incdec_t incdec_op, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
        zval **object_ptr = _get_obj_zval_ptr_ptr_unused(TSRMLS_C);
        zval *object;
        zval *property = &opline->op2.u.constant;
@@ -14242,9 +14200,9 @@ static int zend_post_incdec_property_helper_SPEC_UNUSED_CONST(incdec_t incdec_op
 
        if (object->type != IS_OBJECT) {
                zend_error(E_WARNING, "Attempt to increment/decrement property of non-object");
-               ;
+
                *retval = *EG(uninitialized_zval_ptr);
-               ;
+
                ZEND_VM_NEXT_OPCODE();
        }
 
@@ -14302,9 +14260,9 @@ static int zend_post_incdec_property_helper_SPEC_UNUSED_CONST(incdec_t incdec_op
        if (0) {
                zval_ptr_dtor(&property);
        } else {
-               ;
+
        }
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
@@ -14323,7 +14281,7 @@ static int zend_fetch_property_address_read_helper_SPEC_UNUSED_CONST(int type, Z
        zend_op *opline = EX(opline);
        zval *container;
        zval **retval;
-       zend_free_op free_op1;
+       
 
        retval = &EX_T(opline->result.u.var).var.ptr;
        EX_T(opline->result.u.var).var.ptr_ptr = retval;
@@ -14336,7 +14294,7 @@ static int zend_fetch_property_address_read_helper_SPEC_UNUSED_CONST(int type, Z
                        PZVAL_LOCK(*retval);
                        AI_USE_PTR(EX_T(opline->result.u.var).var);
                }
-               ;
+
                ZEND_VM_NEXT_OPCODE();
        }
 
@@ -14347,7 +14305,7 @@ static int zend_fetch_property_address_read_helper_SPEC_UNUSED_CONST(int type, Z
                SELECTIVE_PZVAL_LOCK(*retval, &opline->result);
                AI_USE_PTR(EX_T(opline->result.u.var).var);
        } else {
-               zend_free_op free_op2;
+               
                zval *offset  = &opline->op2.u.constant;
 
                if (0) {
@@ -14368,11 +14326,10 @@ static int zend_fetch_property_address_read_helper_SPEC_UNUSED_CONST(int type, Z
                if (0) {
                        zval_ptr_dtor(&offset);
                } else {
-                       ;
+
                }
        }
 
-       ;
        ZEND_VM_NEXT_OPCODE();
 }
 
@@ -14384,7 +14341,7 @@ static int ZEND_FETCH_OBJ_R_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_FETCH_OBJ_W_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
        zval *property = &opline->op2.u.constant;
 
        if (opline->extended_value == ZEND_FETCH_ADD_LOCK && IS_UNUSED != IS_CV) {
@@ -14399,16 +14356,16 @@ static int ZEND_FETCH_OBJ_W_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        if (0) {
                zval_ptr_dtor(&property);
        } else {
-               ;
+
        }
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_FETCH_OBJ_RW_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
        zval *property = &opline->op2.u.constant;
 
        if (0) {
@@ -14418,9 +14375,9 @@ static int ZEND_FETCH_OBJ_RW_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        if (0) {
                zval_ptr_dtor(&property);
        } else {
-               ;
+
        }
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
@@ -14435,7 +14392,7 @@ static int ZEND_FETCH_OBJ_FUNC_ARG_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER
 
        if (ARG_SHOULD_BE_SENT_BY_REF(EX(fbc), opline->extended_value)) {
                /* Behave like FETCH_OBJ_W */
-               zend_free_op free_op1, free_op2;
+               
                zval *property = &opline->op2.u.constant;
 
                if (0) {
@@ -14445,9 +14402,9 @@ static int ZEND_FETCH_OBJ_FUNC_ARG_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER
                if (0) {
                        zval_ptr_dtor(&property);
                } else {
-                       ;
+
                }
-               ;
+
                ZEND_VM_NEXT_OPCODE();
        } else {
                return zend_fetch_property_address_read_helper_SPEC_UNUSED_CONST(BP_VAR_R, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
@@ -14457,7 +14414,7 @@ static int ZEND_FETCH_OBJ_FUNC_ARG_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER
 static int ZEND_FETCH_OBJ_UNSET_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2, free_res;
+       zend_free_op free_res;
        zval *property = &opline->op2.u.constant;
 
        if (0) {
@@ -14467,9 +14424,8 @@ static int ZEND_FETCH_OBJ_UNSET_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_AR
        if (0) {
                zval_ptr_dtor(&property);
        } else {
-               ;
+
        }
-       ;
 
        PZVAL_UNLOCK(*EX_T(opline->result.u.var).var.ptr_ptr, &free_res);
        if (EX_T(opline->result.u.var).var.ptr_ptr != &EG(uninitialized_zval_ptr)) {
@@ -14484,11 +14440,11 @@ static int ZEND_ASSIGN_OBJ_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
        zend_op *op_data = opline+1;
-       zend_free_op free_op1;
+       
        zval **object_ptr = _get_obj_zval_ptr_ptr_unused(TSRMLS_C);
 
        zend_assign_to_object(&opline->result, object_ptr, &opline->op2, &op_data->op1, EX(Ts), ZEND_ASSIGN_OBJ TSRMLS_CC);
-       ;
+
        /* assign_obj has two opcodes! */
        ZEND_VM_INC_OPCODE();
        ZEND_VM_NEXT_OPCODE();
@@ -14498,7 +14454,7 @@ static int ZEND_ASSIGN_DIM_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
        zend_op *op_data = opline+1;
-       zend_free_op free_op1;
+       
        zval **object_ptr;
 
        if (IS_UNUSED == IS_CV || EX_T(opline->op1.u.var).var.ptr_ptr) {
@@ -14511,18 +14467,17 @@ static int ZEND_ASSIGN_DIM_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        if (object_ptr && (*object_ptr)->type == IS_OBJECT) {
                zend_assign_to_object(&opline->result, object_ptr, &opline->op2, &op_data->op1, EX(Ts), ZEND_ASSIGN_DIM TSRMLS_CC);
        } else {
-               zend_free_op free_op2, free_op_data1;
+               zend_free_op free_op_data1;
                zval *value;
                zval *dim = &opline->op2.u.constant;
 
                zend_fetch_dimension_address(&EX_T(op_data->op2.u.var), object_ptr, dim, 0, BP_VAR_W TSRMLS_CC);
-               ;
 
                value = get_zval_ptr(&op_data->op1, EX(Ts), &free_op_data1, BP_VAR_R);
                zend_assign_to_variable(&opline->result, &op_data->op2, &op_data->op1, value, (IS_TMP_FREE(free_op_data1)?IS_TMP_VAR:op_data->op1.op_type), EX(Ts) TSRMLS_CC);
                FREE_OP_IF_VAR(free_op_data1);
        }
-       ;
+
        /* assign_dim has two opcodes! */
        ZEND_VM_INC_OPCODE();
        ZEND_VM_NEXT_OPCODE();
@@ -14534,7 +14489,7 @@ static int ZEND_INIT_METHOD_CALL_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_A
        zval *function_name;
        char *function_name_strval;
        int function_name_strlen;
-       zend_free_op free_op1, free_op2;
+       
 
        zend_ptr_stack_3_push(&EG(arg_types_stack), EX(fbc), EX(object), EX(calling_scope));
 
@@ -14585,8 +14540,6 @@ static int ZEND_INIT_METHOD_CALL_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_A
                EX(calling_scope) = NULL;
        }
 
-       ;
-       ;
 
        ZEND_VM_NEXT_OPCODE();
 }
@@ -14635,7 +14588,7 @@ static int ZEND_FETCH_CONSTANT_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARG
 static int ZEND_ADD_ARRAY_ELEMENT_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
        zval *array_ptr = &EX_T(opline->result.u.var).tmp_var;
        zval *expr_ptr, **expr_ptr_ptr = NULL;
        zval *offset=&opline->op2.u.constant;
@@ -14696,14 +14649,14 @@ static int ZEND_ADD_ARRAY_ELEMENT_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_
                                /* do nothing */
                                break;
                }
-               ;
+
        } else {
                zend_hash_next_index_insert(array_ptr->value.ht, &expr_ptr, sizeof(zval *), NULL);
        }
        if (opline->extended_value) {
-               ;
+
        } else {
-               ;
+
        }
        ZEND_VM_NEXT_OPCODE();
 }
@@ -14716,7 +14669,7 @@ static int ZEND_INIT_ARRAY_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_UNSET_DIM_OBJ_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
        zval **container = _get_obj_zval_ptr_ptr_unused(TSRMLS_C);
        zval *offset = &opline->op2.u.constant;
        long index;
@@ -14773,7 +14726,7 @@ static int ZEND_UNSET_DIM_OBJ_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS
                                                        zend_error(E_WARNING, "Illegal offset type in unset");
                                                        break;
                                        }
-                                       ;
+
                                        break;
                                }
                                case IS_OBJECT:
@@ -14787,14 +14740,14 @@ static int ZEND_UNSET_DIM_OBJ_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS
                                        if (0) {
                                                zval_ptr_dtor(&offset);
                                        } else {
-                                               ;
+
                                        }
                                        break;
                                case IS_STRING:
                                        zend_error_noreturn(E_ERROR, "Cannot unset string offsets");
                                        ZEND_VM_CONTINUE(); /* bailed out before */
                                default:
-                                       ;
+
                                        break;
                        }
                } else { /* ZEND_UNSET_OBJ */
@@ -14806,15 +14759,14 @@ static int ZEND_UNSET_DIM_OBJ_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS
                                if (0) {
                                        zval_ptr_dtor(&offset);
                                } else {
-                                       ;
+
                                }
                        }
                }
        } else {
                /* overloaded element */
-               ;
+
        }
-       ;
 
        ZEND_VM_NEXT_OPCODE();
 }
@@ -14822,14 +14774,14 @@ static int ZEND_UNSET_DIM_OBJ_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS
 static int zend_isset_isempty_dim_prop_obj_handler_SPEC_UNUSED_CONST(int prop_dim, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1;
+       
        zval **container = _get_obj_zval_ptr_ptr_unused(TSRMLS_C);
        zval **value = NULL;
        int result = 0;
        long index;
 
        if (container) {
-               zend_free_op free_op2;
+               
                zval *offset = &opline->op2.u.constant;
 
                if ((*container)->type == IS_ARRAY) {
@@ -14884,7 +14836,7 @@ static int zend_isset_isempty_dim_prop_obj_handler_SPEC_UNUSED_CONST(int prop_di
                                        }
                                        break;
                        }
-                       ;
+
                } else if ((*container)->type == IS_OBJECT) {
                        if (0) {
                                MAKE_REAL_ZVAL_PTR(offset);
@@ -14897,7 +14849,7 @@ static int zend_isset_isempty_dim_prop_obj_handler_SPEC_UNUSED_CONST(int prop_di
                        if (0) {
                                zval_ptr_dtor(&offset);
                        } else {
-                               ;
+
                        }
                } else if ((*container)->type == IS_STRING && !prop_dim) { /* string offsets */
                        zval tmp;
@@ -14922,9 +14874,9 @@ static int zend_isset_isempty_dim_prop_obj_handler_SPEC_UNUSED_CONST(int prop_di
                                                break;
                                }
                        }
-                       ;
+
                } else {
-                       ;
+
                }
        }
 
@@ -14939,8 +14891,6 @@ static int zend_isset_isempty_dim_prop_obj_handler_SPEC_UNUSED_CONST(int prop_di
                        break;
        }
 
-       ;
-
        ZEND_VM_NEXT_OPCODE();
 }
 
@@ -14958,7 +14908,7 @@ static int zend_binary_assign_op_obj_helper_SPEC_UNUSED_TMP(int (*binary_op)(zva
 {
        zend_op *opline = EX(opline);
        zend_op *op_data = opline+1;
-       zend_free_op free_op1, free_op2, free_op_data1;
+       zend_free_op free_op2, free_op_data1;
        zval **object_ptr = _get_obj_zval_ptr_ptr_unused(TSRMLS_C);
        zval *object;
        zval *property = _get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
@@ -15060,7 +15010,6 @@ static int zend_binary_assign_op_obj_helper_SPEC_UNUSED_TMP(int (*binary_op)(zva
                FREE_OP(free_op_data1);
        }
 
-       ;
        /* assign_obj has two opcodes! */
        ZEND_VM_INC_OPCODE();
        ZEND_VM_NEXT_OPCODE();
@@ -15116,7 +15065,7 @@ static int zend_binary_assign_op_helper_SPEC_UNUSED_TMP(int (*binary_op)(zval *r
                        AI_USE_PTR(EX_T(opline->result.u.var).var);
                }
                zval_dtor(free_op2.var);
-               ;
+
                if (increment_opline) {
                        ZEND_VM_INC_OPCODE();
                }
@@ -15148,7 +15097,7 @@ static int zend_binary_assign_op_helper_SPEC_UNUSED_TMP(int (*binary_op)(zval *r
                ZEND_VM_INC_OPCODE();
                FREE_OP_VAR_PTR(free_op_data2);
        }
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
@@ -15210,7 +15159,7 @@ static int ZEND_ASSIGN_BW_XOR_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int zend_pre_incdec_property_helper_SPEC_UNUSED_TMP(incdec_t incdec_op, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
        zval **object_ptr = _get_obj_zval_ptr_ptr_unused(TSRMLS_C);
        zval *object;
        zval *property = _get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
@@ -15227,7 +15176,7 @@ static int zend_pre_incdec_property_helper_SPEC_UNUSED_TMP(incdec_t incdec_op, Z
                        *retval = EG(uninitialized_zval_ptr);
                        PZVAL_LOCK(*retval);
                }
-               ;
+
                ZEND_VM_NEXT_OPCODE();
        }
 
@@ -15285,7 +15234,7 @@ static int zend_pre_incdec_property_helper_SPEC_UNUSED_TMP(incdec_t incdec_op, Z
        } else {
                zval_dtor(free_op2.var);
        }
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
@@ -15302,7 +15251,7 @@ static int ZEND_PRE_DEC_OBJ_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int zend_post_incdec_property_helper_SPEC_UNUSED_TMP(incdec_t incdec_op, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
        zval **object_ptr = _get_obj_zval_ptr_ptr_unused(TSRMLS_C);
        zval *object;
        zval *property = _get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
@@ -15316,7 +15265,7 @@ static int zend_post_incdec_property_helper_SPEC_UNUSED_TMP(incdec_t incdec_op,
                zend_error(E_WARNING, "Attempt to increment/decrement property of non-object");
                zval_dtor(free_op2.var);
                *retval = *EG(uninitialized_zval_ptr);
-               ;
+
                ZEND_VM_NEXT_OPCODE();
        }
 
@@ -15376,7 +15325,7 @@ static int zend_post_incdec_property_helper_SPEC_UNUSED_TMP(incdec_t incdec_op,
        } else {
                zval_dtor(free_op2.var);
        }
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
@@ -15395,7 +15344,7 @@ static int zend_fetch_property_address_read_helper_SPEC_UNUSED_TMP(int type, ZEN
        zend_op *opline = EX(opline);
        zval *container;
        zval **retval;
-       zend_free_op free_op1;
+       
 
        retval = &EX_T(opline->result.u.var).var.ptr;
        EX_T(opline->result.u.var).var.ptr_ptr = retval;
@@ -15408,7 +15357,7 @@ static int zend_fetch_property_address_read_helper_SPEC_UNUSED_TMP(int type, ZEN
                        PZVAL_LOCK(*retval);
                        AI_USE_PTR(EX_T(opline->result.u.var).var);
                }
-               ;
+
                ZEND_VM_NEXT_OPCODE();
        }
 
@@ -15444,7 +15393,6 @@ static int zend_fetch_property_address_read_helper_SPEC_UNUSED_TMP(int type, ZEN
                }
        }
 
-       ;
        ZEND_VM_NEXT_OPCODE();
 }
 
@@ -15456,7 +15404,7 @@ static int ZEND_FETCH_OBJ_R_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_FETCH_OBJ_W_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
        zval *property = _get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
 
        if (opline->extended_value == ZEND_FETCH_ADD_LOCK && IS_UNUSED != IS_CV) {
@@ -15473,14 +15421,14 @@ static int ZEND_FETCH_OBJ_W_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        } else {
                zval_dtor(free_op2.var);
        }
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_FETCH_OBJ_RW_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
        zval *property = _get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
 
        if (1) {
@@ -15492,7 +15440,7 @@ static int ZEND_FETCH_OBJ_RW_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        } else {
                zval_dtor(free_op2.var);
        }
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
@@ -15507,7 +15455,7 @@ static int ZEND_FETCH_OBJ_FUNC_ARG_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HANDLER_A
 
        if (ARG_SHOULD_BE_SENT_BY_REF(EX(fbc), opline->extended_value)) {
                /* Behave like FETCH_OBJ_W */
-               zend_free_op free_op1, free_op2;
+               zend_free_op free_op2;
                zval *property = _get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
 
                if (1) {
@@ -15519,7 +15467,7 @@ static int ZEND_FETCH_OBJ_FUNC_ARG_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HANDLER_A
                } else {
                        zval_dtor(free_op2.var);
                }
-               ;
+
                ZEND_VM_NEXT_OPCODE();
        } else {
                return zend_fetch_property_address_read_helper_SPEC_UNUSED_TMP(BP_VAR_R, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
@@ -15529,7 +15477,7 @@ static int ZEND_FETCH_OBJ_FUNC_ARG_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HANDLER_A
 static int ZEND_FETCH_OBJ_UNSET_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2, free_res;
+       zend_free_op free_op2, free_res;
        zval *property = _get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
 
        if (1) {
@@ -15541,7 +15489,6 @@ static int ZEND_FETCH_OBJ_UNSET_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS
        } else {
                zval_dtor(free_op2.var);
        }
-       ;
 
        PZVAL_UNLOCK(*EX_T(opline->result.u.var).var.ptr_ptr, &free_res);
        if (EX_T(opline->result.u.var).var.ptr_ptr != &EG(uninitialized_zval_ptr)) {
@@ -15556,11 +15503,11 @@ static int ZEND_ASSIGN_OBJ_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
        zend_op *op_data = opline+1;
-       zend_free_op free_op1;
+       
        zval **object_ptr = _get_obj_zval_ptr_ptr_unused(TSRMLS_C);
 
        zend_assign_to_object(&opline->result, object_ptr, &opline->op2, &op_data->op1, EX(Ts), ZEND_ASSIGN_OBJ TSRMLS_CC);
-       ;
+
        /* assign_obj has two opcodes! */
        ZEND_VM_INC_OPCODE();
        ZEND_VM_NEXT_OPCODE();
@@ -15570,7 +15517,7 @@ static int ZEND_ASSIGN_DIM_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
        zend_op *op_data = opline+1;
-       zend_free_op free_op1;
+       
        zval **object_ptr;
 
        if (IS_UNUSED == IS_CV || EX_T(opline->op1.u.var).var.ptr_ptr) {
@@ -15594,7 +15541,7 @@ static int ZEND_ASSIGN_DIM_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                zend_assign_to_variable(&opline->result, &op_data->op2, &op_data->op1, value, (IS_TMP_FREE(free_op_data1)?IS_TMP_VAR:op_data->op1.op_type), EX(Ts) TSRMLS_CC);
                FREE_OP_IF_VAR(free_op_data1);
        }
-       ;
+
        /* assign_dim has two opcodes! */
        ZEND_VM_INC_OPCODE();
        ZEND_VM_NEXT_OPCODE();
@@ -15606,7 +15553,7 @@ static int ZEND_INIT_METHOD_CALL_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARG
        zval *function_name;
        char *function_name_strval;
        int function_name_strlen;
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        zend_ptr_stack_3_push(&EG(arg_types_stack), EX(fbc), EX(object), EX(calling_scope));
 
@@ -15658,7 +15605,6 @@ static int ZEND_INIT_METHOD_CALL_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARG
        }
 
        zval_dtor(free_op2.var);
-       ;
 
        ZEND_VM_NEXT_OPCODE();
 }
@@ -15666,7 +15612,7 @@ static int ZEND_INIT_METHOD_CALL_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARG
 static int ZEND_ADD_ARRAY_ELEMENT_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
        zval *array_ptr = &EX_T(opline->result.u.var).tmp_var;
        zval *expr_ptr, **expr_ptr_ptr = NULL;
        zval *offset=_get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
@@ -15732,9 +15678,9 @@ static int ZEND_ADD_ARRAY_ELEMENT_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HANDLER_AR
                zend_hash_next_index_insert(array_ptr->value.ht, &expr_ptr, sizeof(zval *), NULL);
        }
        if (opline->extended_value) {
-               ;
+
        } else {
-               ;
+
        }
        ZEND_VM_NEXT_OPCODE();
 }
@@ -15747,7 +15693,7 @@ static int ZEND_INIT_ARRAY_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_UNSET_DIM_OBJ_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
        zval **container = _get_obj_zval_ptr_ptr_unused(TSRMLS_C);
        zval *offset = _get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
        long index;
@@ -15845,7 +15791,6 @@ static int ZEND_UNSET_DIM_OBJ_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                /* overloaded element */
                zval_dtor(free_op2.var);
        }
-       ;
 
        ZEND_VM_NEXT_OPCODE();
 }
@@ -15853,7 +15798,7 @@ static int ZEND_UNSET_DIM_OBJ_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int zend_isset_isempty_dim_prop_obj_handler_SPEC_UNUSED_TMP(int prop_dim, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1;
+       
        zval **container = _get_obj_zval_ptr_ptr_unused(TSRMLS_C);
        zval **value = NULL;
        int result = 0;
@@ -15970,8 +15915,6 @@ static int zend_isset_isempty_dim_prop_obj_handler_SPEC_UNUSED_TMP(int prop_dim,
                        break;
        }
 
-       ;
-
        ZEND_VM_NEXT_OPCODE();
 }
 
@@ -15989,7 +15932,7 @@ static int zend_binary_assign_op_obj_helper_SPEC_UNUSED_VAR(int (*binary_op)(zva
 {
        zend_op *opline = EX(opline);
        zend_op *op_data = opline+1;
-       zend_free_op free_op1, free_op2, free_op_data1;
+       zend_free_op free_op2, free_op_data1;
        zval **object_ptr = _get_obj_zval_ptr_ptr_unused(TSRMLS_C);
        zval *object;
        zval *property = _get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
@@ -16091,7 +16034,6 @@ static int zend_binary_assign_op_obj_helper_SPEC_UNUSED_VAR(int (*binary_op)(zva
                FREE_OP(free_op_data1);
        }
 
-       ;
        /* assign_obj has two opcodes! */
        ZEND_VM_INC_OPCODE();
        ZEND_VM_NEXT_OPCODE();
@@ -16147,7 +16089,7 @@ static int zend_binary_assign_op_helper_SPEC_UNUSED_VAR(int (*binary_op)(zval *r
                        AI_USE_PTR(EX_T(opline->result.u.var).var);
                }
                if (free_op2.var) {zval_ptr_dtor(&free_op2.var);};
-               ;
+
                if (increment_opline) {
                        ZEND_VM_INC_OPCODE();
                }
@@ -16179,7 +16121,7 @@ static int zend_binary_assign_op_helper_SPEC_UNUSED_VAR(int (*binary_op)(zval *r
                ZEND_VM_INC_OPCODE();
                FREE_OP_VAR_PTR(free_op_data2);
        }
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
@@ -16241,7 +16183,7 @@ static int ZEND_ASSIGN_BW_XOR_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int zend_pre_incdec_property_helper_SPEC_UNUSED_VAR(incdec_t incdec_op, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
        zval **object_ptr = _get_obj_zval_ptr_ptr_unused(TSRMLS_C);
        zval *object;
        zval *property = _get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
@@ -16258,7 +16200,7 @@ static int zend_pre_incdec_property_helper_SPEC_UNUSED_VAR(incdec_t incdec_op, Z
                        *retval = EG(uninitialized_zval_ptr);
                        PZVAL_LOCK(*retval);
                }
-               ;
+
                ZEND_VM_NEXT_OPCODE();
        }
 
@@ -16316,7 +16258,7 @@ static int zend_pre_incdec_property_helper_SPEC_UNUSED_VAR(incdec_t incdec_op, Z
        } else {
                if (free_op2.var) {zval_ptr_dtor(&free_op2.var);};
        }
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
@@ -16333,7 +16275,7 @@ static int ZEND_PRE_DEC_OBJ_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int zend_post_incdec_property_helper_SPEC_UNUSED_VAR(incdec_t incdec_op, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
        zval **object_ptr = _get_obj_zval_ptr_ptr_unused(TSRMLS_C);
        zval *object;
        zval *property = _get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
@@ -16347,7 +16289,7 @@ static int zend_post_incdec_property_helper_SPEC_UNUSED_VAR(incdec_t incdec_op,
                zend_error(E_WARNING, "Attempt to increment/decrement property of non-object");
                if (free_op2.var) {zval_ptr_dtor(&free_op2.var);};
                *retval = *EG(uninitialized_zval_ptr);
-               ;
+
                ZEND_VM_NEXT_OPCODE();
        }
 
@@ -16407,7 +16349,7 @@ static int zend_post_incdec_property_helper_SPEC_UNUSED_VAR(incdec_t incdec_op,
        } else {
                if (free_op2.var) {zval_ptr_dtor(&free_op2.var);};
        }
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
@@ -16426,7 +16368,7 @@ static int zend_fetch_property_address_read_helper_SPEC_UNUSED_VAR(int type, ZEN
        zend_op *opline = EX(opline);
        zval *container;
        zval **retval;
-       zend_free_op free_op1;
+       
 
        retval = &EX_T(opline->result.u.var).var.ptr;
        EX_T(opline->result.u.var).var.ptr_ptr = retval;
@@ -16439,7 +16381,7 @@ static int zend_fetch_property_address_read_helper_SPEC_UNUSED_VAR(int type, ZEN
                        PZVAL_LOCK(*retval);
                        AI_USE_PTR(EX_T(opline->result.u.var).var);
                }
-               ;
+
                ZEND_VM_NEXT_OPCODE();
        }
 
@@ -16475,7 +16417,6 @@ static int zend_fetch_property_address_read_helper_SPEC_UNUSED_VAR(int type, ZEN
                }
        }
 
-       ;
        ZEND_VM_NEXT_OPCODE();
 }
 
@@ -16487,7 +16428,7 @@ static int ZEND_FETCH_OBJ_R_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_FETCH_OBJ_W_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
        zval *property = _get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
 
        if (opline->extended_value == ZEND_FETCH_ADD_LOCK && IS_UNUSED != IS_CV) {
@@ -16504,14 +16445,14 @@ static int ZEND_FETCH_OBJ_W_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        } else {
                if (free_op2.var) {zval_ptr_dtor(&free_op2.var);};
        }
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_FETCH_OBJ_RW_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
        zval *property = _get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
 
        if (0) {
@@ -16523,7 +16464,7 @@ static int ZEND_FETCH_OBJ_RW_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        } else {
                if (free_op2.var) {zval_ptr_dtor(&free_op2.var);};
        }
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
@@ -16538,7 +16479,7 @@ static int ZEND_FETCH_OBJ_FUNC_ARG_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_HANDLER_A
 
        if (ARG_SHOULD_BE_SENT_BY_REF(EX(fbc), opline->extended_value)) {
                /* Behave like FETCH_OBJ_W */
-               zend_free_op free_op1, free_op2;
+               zend_free_op free_op2;
                zval *property = _get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
 
                if (0) {
@@ -16550,7 +16491,7 @@ static int ZEND_FETCH_OBJ_FUNC_ARG_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_HANDLER_A
                } else {
                        if (free_op2.var) {zval_ptr_dtor(&free_op2.var);};
                }
-               ;
+
                ZEND_VM_NEXT_OPCODE();
        } else {
                return zend_fetch_property_address_read_helper_SPEC_UNUSED_VAR(BP_VAR_R, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
@@ -16560,7 +16501,7 @@ static int ZEND_FETCH_OBJ_FUNC_ARG_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_HANDLER_A
 static int ZEND_FETCH_OBJ_UNSET_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2, free_res;
+       zend_free_op free_op2, free_res;
        zval *property = _get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
 
        if (0) {
@@ -16572,7 +16513,6 @@ static int ZEND_FETCH_OBJ_UNSET_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS
        } else {
                if (free_op2.var) {zval_ptr_dtor(&free_op2.var);};
        }
-       ;
 
        PZVAL_UNLOCK(*EX_T(opline->result.u.var).var.ptr_ptr, &free_res);
        if (EX_T(opline->result.u.var).var.ptr_ptr != &EG(uninitialized_zval_ptr)) {
@@ -16587,11 +16527,11 @@ static int ZEND_ASSIGN_OBJ_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
        zend_op *op_data = opline+1;
-       zend_free_op free_op1;
+       
        zval **object_ptr = _get_obj_zval_ptr_ptr_unused(TSRMLS_C);
 
        zend_assign_to_object(&opline->result, object_ptr, &opline->op2, &op_data->op1, EX(Ts), ZEND_ASSIGN_OBJ TSRMLS_CC);
-       ;
+
        /* assign_obj has two opcodes! */
        ZEND_VM_INC_OPCODE();
        ZEND_VM_NEXT_OPCODE();
@@ -16601,7 +16541,7 @@ static int ZEND_ASSIGN_DIM_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
        zend_op *op_data = opline+1;
-       zend_free_op free_op1;
+       
        zval **object_ptr;
 
        if (IS_UNUSED == IS_CV || EX_T(opline->op1.u.var).var.ptr_ptr) {
@@ -16625,7 +16565,7 @@ static int ZEND_ASSIGN_DIM_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                zend_assign_to_variable(&opline->result, &op_data->op2, &op_data->op1, value, (IS_TMP_FREE(free_op_data1)?IS_TMP_VAR:op_data->op1.op_type), EX(Ts) TSRMLS_CC);
                FREE_OP_IF_VAR(free_op_data1);
        }
-       ;
+
        /* assign_dim has two opcodes! */
        ZEND_VM_INC_OPCODE();
        ZEND_VM_NEXT_OPCODE();
@@ -16637,7 +16577,7 @@ static int ZEND_INIT_METHOD_CALL_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARG
        zval *function_name;
        char *function_name_strval;
        int function_name_strlen;
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        zend_ptr_stack_3_push(&EG(arg_types_stack), EX(fbc), EX(object), EX(calling_scope));
 
@@ -16689,7 +16629,6 @@ static int ZEND_INIT_METHOD_CALL_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARG
        }
 
        if (free_op2.var) {zval_ptr_dtor(&free_op2.var);};
-       ;
 
        ZEND_VM_NEXT_OPCODE();
 }
@@ -16697,7 +16636,7 @@ static int ZEND_INIT_METHOD_CALL_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARG
 static int ZEND_ADD_ARRAY_ELEMENT_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
        zval *array_ptr = &EX_T(opline->result.u.var).tmp_var;
        zval *expr_ptr, **expr_ptr_ptr = NULL;
        zval *offset=_get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
@@ -16763,9 +16702,9 @@ static int ZEND_ADD_ARRAY_ELEMENT_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_HANDLER_AR
                zend_hash_next_index_insert(array_ptr->value.ht, &expr_ptr, sizeof(zval *), NULL);
        }
        if (opline->extended_value) {
-               ;
+
        } else {
-               ;
+
        }
        ZEND_VM_NEXT_OPCODE();
 }
@@ -16778,7 +16717,7 @@ static int ZEND_INIT_ARRAY_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_UNSET_DIM_OBJ_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
        zval **container = _get_obj_zval_ptr_ptr_unused(TSRMLS_C);
        zval *offset = _get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
        long index;
@@ -16876,7 +16815,6 @@ static int ZEND_UNSET_DIM_OBJ_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                /* overloaded element */
                if (free_op2.var) {zval_ptr_dtor(&free_op2.var);};
        }
-       ;
 
        ZEND_VM_NEXT_OPCODE();
 }
@@ -16884,7 +16822,7 @@ static int ZEND_UNSET_DIM_OBJ_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int zend_isset_isempty_dim_prop_obj_handler_SPEC_UNUSED_VAR(int prop_dim, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1;
+       
        zval **container = _get_obj_zval_ptr_ptr_unused(TSRMLS_C);
        zval **value = NULL;
        int result = 0;
@@ -17001,8 +16939,6 @@ static int zend_isset_isempty_dim_prop_obj_handler_SPEC_UNUSED_VAR(int prop_dim,
                        break;
        }
 
-       ;
-
        ZEND_VM_NEXT_OPCODE();
 }
 
@@ -17020,7 +16956,7 @@ static int zend_binary_assign_op_obj_helper_SPEC_UNUSED_UNUSED(int (*binary_op)(
 {
        zend_op *opline = EX(opline);
        zend_op *op_data = opline+1;
-       zend_free_op free_op1, free_op2, free_op_data1;
+       zend_free_op free_op_data1;
        zval **object_ptr = _get_obj_zval_ptr_ptr_unused(TSRMLS_C);
        zval *object;
        zval *property = NULL;
@@ -17035,7 +16971,7 @@ static int zend_binary_assign_op_obj_helper_SPEC_UNUSED_UNUSED(int (*binary_op)(
 
        if (object->type != IS_OBJECT) {
                zend_error(E_WARNING, "Attempt to assign property of non-object");
-               ;
+
                FREE_OP(free_op_data1);
 
                if (!RETURN_VALUE_UNUSED(result)) {
@@ -17117,12 +17053,11 @@ static int zend_binary_assign_op_obj_helper_SPEC_UNUSED_UNUSED(int (*binary_op)(
                if (0) {
                        zval_ptr_dtor(&property);
                } else {
-                       ;
+
                }
                FREE_OP(free_op_data1);
        }
 
-       ;
        /* assign_obj has two opcodes! */
        ZEND_VM_INC_OPCODE();
        ZEND_VM_NEXT_OPCODE();
@@ -17131,7 +17066,7 @@ static int zend_binary_assign_op_obj_helper_SPEC_UNUSED_UNUSED(int (*binary_op)(
 static int zend_binary_assign_op_helper_SPEC_UNUSED_UNUSED(int (*binary_op)(zval *result, zval *op1, zval *op2 TSRMLS_DC), ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2, free_op_data2, free_op_data1;
+       zend_free_op free_op1, free_op_data2, free_op_data1;
        zval **var_ptr;
        zval *value;
        zend_bool increment_opline = 0;
@@ -17177,8 +17112,8 @@ static int zend_binary_assign_op_helper_SPEC_UNUSED_UNUSED(int (*binary_op)(zval
                        PZVAL_LOCK(*EX_T(opline->result.u.var).var.ptr_ptr);
                        AI_USE_PTR(EX_T(opline->result.u.var).var);
                }
-               ;
-               ;
+
+
                if (increment_opline) {
                        ZEND_VM_INC_OPCODE();
                }
@@ -17204,13 +17139,12 @@ static int zend_binary_assign_op_helper_SPEC_UNUSED_UNUSED(int (*binary_op)(zval
                PZVAL_LOCK(*var_ptr);
                AI_USE_PTR(EX_T(opline->result.u.var).var);
        }
-       ;
 
        if (increment_opline) {
                ZEND_VM_INC_OPCODE();
                FREE_OP_VAR_PTR(free_op_data2);
        }
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
@@ -17273,7 +17207,7 @@ static int ZEND_ASSIGN_DIM_SPEC_UNUSED_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
        zend_op *op_data = opline+1;
-       zend_free_op free_op1;
+       
        zval **object_ptr;
 
        if (IS_UNUSED == IS_CV || EX_T(opline->op1.u.var).var.ptr_ptr) {
@@ -17286,18 +17220,17 @@ static int ZEND_ASSIGN_DIM_SPEC_UNUSED_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        if (object_ptr && (*object_ptr)->type == IS_OBJECT) {
                zend_assign_to_object(&opline->result, object_ptr, &opline->op2, &op_data->op1, EX(Ts), ZEND_ASSIGN_DIM TSRMLS_CC);
        } else {
-               zend_free_op free_op2, free_op_data1;
+               zend_free_op free_op_data1;
                zval *value;
                zval *dim = NULL;
 
                zend_fetch_dimension_address(&EX_T(op_data->op2.u.var), object_ptr, dim, 0, BP_VAR_W TSRMLS_CC);
-               ;
 
                value = get_zval_ptr(&op_data->op1, EX(Ts), &free_op_data1, BP_VAR_R);
                zend_assign_to_variable(&opline->result, &op_data->op2, &op_data->op1, value, (IS_TMP_FREE(free_op_data1)?IS_TMP_VAR:op_data->op1.op_type), EX(Ts) TSRMLS_CC);
                FREE_OP_IF_VAR(free_op_data1);
        }
-       ;
+
        /* assign_dim has two opcodes! */
        ZEND_VM_INC_OPCODE();
        ZEND_VM_NEXT_OPCODE();
@@ -17306,7 +17239,7 @@ static int ZEND_ASSIGN_DIM_SPEC_UNUSED_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_ADD_ARRAY_ELEMENT_SPEC_UNUSED_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
        zval *array_ptr = &EX_T(opline->result.u.var).tmp_var;
        zval *expr_ptr, **expr_ptr_ptr = NULL;
        zval *offset=NULL;
@@ -17367,14 +17300,14 @@ static int ZEND_ADD_ARRAY_ELEMENT_SPEC_UNUSED_UNUSED_HANDLER(ZEND_OPCODE_HANDLER
                                /* do nothing */
                                break;
                }
-               ;
+
        } else {
                zend_hash_next_index_insert(array_ptr->value.ht, &expr_ptr, sizeof(zval *), NULL);
        }
        if (opline->extended_value) {
-               ;
+
        } else {
-               ;
+
        }
        ZEND_VM_NEXT_OPCODE();
 }
@@ -17388,7 +17321,7 @@ static int zend_binary_assign_op_obj_helper_SPEC_UNUSED_CV(int (*binary_op)(zval
 {
        zend_op *opline = EX(opline);
        zend_op *op_data = opline+1;
-       zend_free_op free_op1, free_op2, free_op_data1;
+       zend_free_op free_op_data1;
        zval **object_ptr = _get_obj_zval_ptr_ptr_unused(TSRMLS_C);
        zval *object;
        zval *property = _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC);
@@ -17403,7 +17336,7 @@ static int zend_binary_assign_op_obj_helper_SPEC_UNUSED_CV(int (*binary_op)(zval
 
        if (object->type != IS_OBJECT) {
                zend_error(E_WARNING, "Attempt to assign property of non-object");
-               ;
+
                FREE_OP(free_op_data1);
 
                if (!RETURN_VALUE_UNUSED(result)) {
@@ -17485,12 +17418,11 @@ static int zend_binary_assign_op_obj_helper_SPEC_UNUSED_CV(int (*binary_op)(zval
                if (0) {
                        zval_ptr_dtor(&property);
                } else {
-                       ;
+
                }
                FREE_OP(free_op_data1);
        }
 
-       ;
        /* assign_obj has two opcodes! */
        ZEND_VM_INC_OPCODE();
        ZEND_VM_NEXT_OPCODE();
@@ -17499,7 +17431,7 @@ static int zend_binary_assign_op_obj_helper_SPEC_UNUSED_CV(int (*binary_op)(zval
 static int zend_binary_assign_op_helper_SPEC_UNUSED_CV(int (*binary_op)(zval *result, zval *op1, zval *op2 TSRMLS_DC), ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2, free_op_data2, free_op_data1;
+       zend_free_op free_op1, free_op_data2, free_op_data1;
        zval **var_ptr;
        zval *value;
        zend_bool increment_opline = 0;
@@ -17545,8 +17477,8 @@ static int zend_binary_assign_op_helper_SPEC_UNUSED_CV(int (*binary_op)(zval *re
                        PZVAL_LOCK(*EX_T(opline->result.u.var).var.ptr_ptr);
                        AI_USE_PTR(EX_T(opline->result.u.var).var);
                }
-               ;
-               ;
+
+
                if (increment_opline) {
                        ZEND_VM_INC_OPCODE();
                }
@@ -17572,13 +17504,12 @@ static int zend_binary_assign_op_helper_SPEC_UNUSED_CV(int (*binary_op)(zval *re
                PZVAL_LOCK(*var_ptr);
                AI_USE_PTR(EX_T(opline->result.u.var).var);
        }
-       ;
 
        if (increment_opline) {
                ZEND_VM_INC_OPCODE();
                FREE_OP_VAR_PTR(free_op_data2);
        }
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
@@ -17640,7 +17571,7 @@ static int ZEND_ASSIGN_BW_XOR_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int zend_pre_incdec_property_helper_SPEC_UNUSED_CV(incdec_t incdec_op, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
        zval **object_ptr = _get_obj_zval_ptr_ptr_unused(TSRMLS_C);
        zval *object;
        zval *property = _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC);
@@ -17652,12 +17583,12 @@ static int zend_pre_incdec_property_helper_SPEC_UNUSED_CV(incdec_t incdec_op, ZE
 
        if (object->type != IS_OBJECT) {
                zend_error(E_WARNING, "Attempt to increment/decrement property of non-object");
-               ;
+
                if (!RETURN_VALUE_UNUSED(&opline->result)) {
                        *retval = EG(uninitialized_zval_ptr);
                        PZVAL_LOCK(*retval);
                }
-               ;
+
                ZEND_VM_NEXT_OPCODE();
        }
 
@@ -17713,9 +17644,9 @@ static int zend_pre_incdec_property_helper_SPEC_UNUSED_CV(incdec_t incdec_op, ZE
        if (0) {
                zval_ptr_dtor(&property);
        } else {
-               ;
+
        }
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
@@ -17732,7 +17663,7 @@ static int ZEND_PRE_DEC_OBJ_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int zend_post_incdec_property_helper_SPEC_UNUSED_CV(incdec_t incdec_op, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
        zval **object_ptr = _get_obj_zval_ptr_ptr_unused(TSRMLS_C);
        zval *object;
        zval *property = _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC);
@@ -17744,9 +17675,9 @@ static int zend_post_incdec_property_helper_SPEC_UNUSED_CV(incdec_t incdec_op, Z
 
        if (object->type != IS_OBJECT) {
                zend_error(E_WARNING, "Attempt to increment/decrement property of non-object");
-               ;
+
                *retval = *EG(uninitialized_zval_ptr);
-               ;
+
                ZEND_VM_NEXT_OPCODE();
        }
 
@@ -17804,9 +17735,9 @@ static int zend_post_incdec_property_helper_SPEC_UNUSED_CV(incdec_t incdec_op, Z
        if (0) {
                zval_ptr_dtor(&property);
        } else {
-               ;
+
        }
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
@@ -17825,7 +17756,7 @@ static int zend_fetch_property_address_read_helper_SPEC_UNUSED_CV(int type, ZEND
        zend_op *opline = EX(opline);
        zval *container;
        zval **retval;
-       zend_free_op free_op1;
+       
 
        retval = &EX_T(opline->result.u.var).var.ptr;
        EX_T(opline->result.u.var).var.ptr_ptr = retval;
@@ -17838,7 +17769,7 @@ static int zend_fetch_property_address_read_helper_SPEC_UNUSED_CV(int type, ZEND
                        PZVAL_LOCK(*retval);
                        AI_USE_PTR(EX_T(opline->result.u.var).var);
                }
-               ;
+
                ZEND_VM_NEXT_OPCODE();
        }
 
@@ -17849,7 +17780,7 @@ static int zend_fetch_property_address_read_helper_SPEC_UNUSED_CV(int type, ZEND
                SELECTIVE_PZVAL_LOCK(*retval, &opline->result);
                AI_USE_PTR(EX_T(opline->result.u.var).var);
        } else {
-               zend_free_op free_op2;
+               
                zval *offset  = _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC);
 
                if (0) {
@@ -17870,11 +17801,10 @@ static int zend_fetch_property_address_read_helper_SPEC_UNUSED_CV(int type, ZEND
                if (0) {
                        zval_ptr_dtor(&offset);
                } else {
-                       ;
+
                }
        }
 
-       ;
        ZEND_VM_NEXT_OPCODE();
 }
 
@@ -17886,7 +17816,7 @@ static int ZEND_FETCH_OBJ_R_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_FETCH_OBJ_W_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
        zval *property = _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC);
 
        if (opline->extended_value == ZEND_FETCH_ADD_LOCK && IS_UNUSED != IS_CV) {
@@ -17901,16 +17831,16 @@ static int ZEND_FETCH_OBJ_W_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        if (0) {
                zval_ptr_dtor(&property);
        } else {
-               ;
+
        }
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_FETCH_OBJ_RW_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
        zval *property = _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC);
 
        if (0) {
@@ -17920,9 +17850,9 @@ static int ZEND_FETCH_OBJ_RW_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        if (0) {
                zval_ptr_dtor(&property);
        } else {
-               ;
+
        }
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
@@ -17937,7 +17867,7 @@ static int ZEND_FETCH_OBJ_FUNC_ARG_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_AR
 
        if (ARG_SHOULD_BE_SENT_BY_REF(EX(fbc), opline->extended_value)) {
                /* Behave like FETCH_OBJ_W */
-               zend_free_op free_op1, free_op2;
+               
                zval *property = _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC);
 
                if (0) {
@@ -17947,9 +17877,9 @@ static int ZEND_FETCH_OBJ_FUNC_ARG_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_AR
                if (0) {
                        zval_ptr_dtor(&property);
                } else {
-                       ;
+
                }
-               ;
+
                ZEND_VM_NEXT_OPCODE();
        } else {
                return zend_fetch_property_address_read_helper_SPEC_UNUSED_CV(BP_VAR_R, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
@@ -17959,7 +17889,7 @@ static int ZEND_FETCH_OBJ_FUNC_ARG_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_AR
 static int ZEND_FETCH_OBJ_UNSET_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2, free_res;
+       zend_free_op free_res;
        zval *property = _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC);
 
        if (0) {
@@ -17969,9 +17899,8 @@ static int ZEND_FETCH_OBJ_UNSET_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        if (0) {
                zval_ptr_dtor(&property);
        } else {
-               ;
+
        }
-       ;
 
        PZVAL_UNLOCK(*EX_T(opline->result.u.var).var.ptr_ptr, &free_res);
        if (EX_T(opline->result.u.var).var.ptr_ptr != &EG(uninitialized_zval_ptr)) {
@@ -17986,11 +17915,11 @@ static int ZEND_ASSIGN_OBJ_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
        zend_op *op_data = opline+1;
-       zend_free_op free_op1;
+       
        zval **object_ptr = _get_obj_zval_ptr_ptr_unused(TSRMLS_C);
 
        zend_assign_to_object(&opline->result, object_ptr, &opline->op2, &op_data->op1, EX(Ts), ZEND_ASSIGN_OBJ TSRMLS_CC);
-       ;
+
        /* assign_obj has two opcodes! */
        ZEND_VM_INC_OPCODE();
        ZEND_VM_NEXT_OPCODE();
@@ -18000,7 +17929,7 @@ static int ZEND_ASSIGN_DIM_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
        zend_op *op_data = opline+1;
-       zend_free_op free_op1;
+       
        zval **object_ptr;
 
        if (IS_UNUSED == IS_CV || EX_T(opline->op1.u.var).var.ptr_ptr) {
@@ -18013,18 +17942,17 @@ static int ZEND_ASSIGN_DIM_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        if (object_ptr && (*object_ptr)->type == IS_OBJECT) {
                zend_assign_to_object(&opline->result, object_ptr, &opline->op2, &op_data->op1, EX(Ts), ZEND_ASSIGN_DIM TSRMLS_CC);
        } else {
-               zend_free_op free_op2, free_op_data1;
+               zend_free_op free_op_data1;
                zval *value;
                zval *dim = _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC);
 
                zend_fetch_dimension_address(&EX_T(op_data->op2.u.var), object_ptr, dim, 0, BP_VAR_W TSRMLS_CC);
-               ;
 
                value = get_zval_ptr(&op_data->op1, EX(Ts), &free_op_data1, BP_VAR_R);
                zend_assign_to_variable(&opline->result, &op_data->op2, &op_data->op1, value, (IS_TMP_FREE(free_op_data1)?IS_TMP_VAR:op_data->op1.op_type), EX(Ts) TSRMLS_CC);
                FREE_OP_IF_VAR(free_op_data1);
        }
-       ;
+
        /* assign_dim has two opcodes! */
        ZEND_VM_INC_OPCODE();
        ZEND_VM_NEXT_OPCODE();
@@ -18036,7 +17964,7 @@ static int ZEND_INIT_METHOD_CALL_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS
        zval *function_name;
        char *function_name_strval;
        int function_name_strlen;
-       zend_free_op free_op1, free_op2;
+       
 
        zend_ptr_stack_3_push(&EG(arg_types_stack), EX(fbc), EX(object), EX(calling_scope));
 
@@ -18087,8 +18015,6 @@ static int ZEND_INIT_METHOD_CALL_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS
                EX(calling_scope) = NULL;
        }
 
-       ;
-       ;
 
        ZEND_VM_NEXT_OPCODE();
 }
@@ -18096,7 +18022,7 @@ static int ZEND_INIT_METHOD_CALL_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS
 static int ZEND_ADD_ARRAY_ELEMENT_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
        zval *array_ptr = &EX_T(opline->result.u.var).tmp_var;
        zval *expr_ptr, **expr_ptr_ptr = NULL;
        zval *offset=_get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC);
@@ -18157,14 +18083,14 @@ static int ZEND_ADD_ARRAY_ELEMENT_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARG
                                /* do nothing */
                                break;
                }
-               ;
+
        } else {
                zend_hash_next_index_insert(array_ptr->value.ht, &expr_ptr, sizeof(zval *), NULL);
        }
        if (opline->extended_value) {
-               ;
+
        } else {
-               ;
+
        }
        ZEND_VM_NEXT_OPCODE();
 }
@@ -18177,7 +18103,7 @@ static int ZEND_INIT_ARRAY_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_UNSET_DIM_OBJ_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
        zval **container = _get_obj_zval_ptr_ptr_unused(TSRMLS_C);
        zval *offset = _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC);
        long index;
@@ -18234,7 +18160,7 @@ static int ZEND_UNSET_DIM_OBJ_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                                                        zend_error(E_WARNING, "Illegal offset type in unset");
                                                        break;
                                        }
-                                       ;
+
                                        break;
                                }
                                case IS_OBJECT:
@@ -18248,14 +18174,14 @@ static int ZEND_UNSET_DIM_OBJ_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                                        if (0) {
                                                zval_ptr_dtor(&offset);
                                        } else {
-                                               ;
+
                                        }
                                        break;
                                case IS_STRING:
                                        zend_error_noreturn(E_ERROR, "Cannot unset string offsets");
                                        ZEND_VM_CONTINUE(); /* bailed out before */
                                default:
-                                       ;
+
                                        break;
                        }
                } else { /* ZEND_UNSET_OBJ */
@@ -18267,15 +18193,14 @@ static int ZEND_UNSET_DIM_OBJ_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                                if (0) {
                                        zval_ptr_dtor(&offset);
                                } else {
-                                       ;
+
                                }
                        }
                }
        } else {
                /* overloaded element */
-               ;
+
        }
-       ;
 
        ZEND_VM_NEXT_OPCODE();
 }
@@ -18283,14 +18208,14 @@ static int ZEND_UNSET_DIM_OBJ_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int zend_isset_isempty_dim_prop_obj_handler_SPEC_UNUSED_CV(int prop_dim, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1;
+       
        zval **container = _get_obj_zval_ptr_ptr_unused(TSRMLS_C);
        zval **value = NULL;
        int result = 0;
        long index;
 
        if (container) {
-               zend_free_op free_op2;
+               
                zval *offset = _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC);
 
                if ((*container)->type == IS_ARRAY) {
@@ -18345,7 +18270,7 @@ static int zend_isset_isempty_dim_prop_obj_handler_SPEC_UNUSED_CV(int prop_dim,
                                        }
                                        break;
                        }
-                       ;
+
                } else if ((*container)->type == IS_OBJECT) {
                        if (0) {
                                MAKE_REAL_ZVAL_PTR(offset);
@@ -18358,7 +18283,7 @@ static int zend_isset_isempty_dim_prop_obj_handler_SPEC_UNUSED_CV(int prop_dim,
                        if (0) {
                                zval_ptr_dtor(&offset);
                        } else {
-                               ;
+
                        }
                } else if ((*container)->type == IS_STRING && !prop_dim) { /* string offsets */
                        zval tmp;
@@ -18383,9 +18308,9 @@ static int zend_isset_isempty_dim_prop_obj_handler_SPEC_UNUSED_CV(int prop_dim,
                                                break;
                                }
                        }
-                       ;
+
                } else {
-                       ;
+
                }
        }
 
@@ -18400,8 +18325,6 @@ static int zend_isset_isempty_dim_prop_obj_handler_SPEC_UNUSED_CV(int prop_dim,
                        break;
        }
 
-       ;
-
        ZEND_VM_NEXT_OPCODE();
 }
 
@@ -18418,29 +18341,29 @@ static int ZEND_ISSET_ISEMPTY_PROP_OBJ_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLE
 static int ZEND_BW_NOT_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1;
+       
 
        bitwise_not_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_BOOL_NOT_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1;
+       
 
        boolean_not_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_PRE_INC_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1;
+       
        zval **var_ptr = _get_zval_ptr_ptr_cv(&opline->op1, EX(Ts), BP_VAR_RW TSRMLS_CC);
 
        if (!var_ptr) {
@@ -18452,7 +18375,7 @@ static int ZEND_PRE_INC_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                        PZVAL_LOCK(*EX_T(opline->result.u.var).var.ptr_ptr);
                        AI_USE_PTR(EX_T(opline->result.u.var).var);
                }
-               ;
+
                ZEND_VM_NEXT_OPCODE();
        }
 
@@ -18476,14 +18399,13 @@ static int ZEND_PRE_INC_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                AI_USE_PTR(EX_T(opline->result.u.var).var);
        }
 
-       ;
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_PRE_DEC_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1;
+       
        zval **var_ptr = _get_zval_ptr_ptr_cv(&opline->op1, EX(Ts), BP_VAR_RW TSRMLS_CC);
 
        if (!var_ptr) {
@@ -18495,7 +18417,7 @@ static int ZEND_PRE_DEC_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                        PZVAL_LOCK(*EX_T(opline->result.u.var).var.ptr_ptr);
                        AI_USE_PTR(EX_T(opline->result.u.var).var);
                }
-               ;
+
                ZEND_VM_NEXT_OPCODE();
        }
 
@@ -18519,14 +18441,13 @@ static int ZEND_PRE_DEC_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                AI_USE_PTR(EX_T(opline->result.u.var).var);
        }
 
-       ;
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_POST_INC_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1;
+       
        zval **var_ptr = _get_zval_ptr_ptr_cv(&opline->op1, EX(Ts), BP_VAR_RW TSRMLS_CC);
 
        if (!var_ptr) {
@@ -18536,7 +18457,7 @@ static int ZEND_POST_INC_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                if (!RETURN_VALUE_UNUSED(&opline->result)) {
                        EX_T(opline->result.u.var).tmp_var = *EG(uninitialized_zval_ptr);
                }
-               ;
+
                ZEND_VM_NEXT_OPCODE();
        }
 
@@ -18557,14 +18478,13 @@ static int ZEND_POST_INC_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                increment_function(*var_ptr);
        }
 
-       ;
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_POST_DEC_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1;
+       
        zval **var_ptr = _get_zval_ptr_ptr_cv(&opline->op1, EX(Ts), BP_VAR_RW TSRMLS_CC);
 
        if (!var_ptr) {
@@ -18574,7 +18494,7 @@ static int ZEND_POST_DEC_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                if (!RETURN_VALUE_UNUSED(&opline->result)) {
                        EX_T(opline->result.u.var).tmp_var = *EG(uninitialized_zval_ptr);
                }
-               ;
+
                ZEND_VM_NEXT_OPCODE();
        }
 
@@ -18595,14 +18515,13 @@ static int ZEND_POST_DEC_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                decrement_function(*var_ptr);
        }
 
-       ;
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_ECHO_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1;
+       
        zval z_copy;
        zval *z = _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC);
 
@@ -18614,7 +18533,6 @@ static int ZEND_ECHO_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                zend_print_variable(z);
        }
 
-       ;
        ZEND_VM_NEXT_OPCODE();
 }
 
@@ -18631,7 +18549,7 @@ static int ZEND_PRINT_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int zend_fetch_var_address_helper_SPEC_CV(int type, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1;
+       
        zval *varname = _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC);
        zval **retval;
        zval tmp_varname;
@@ -18681,7 +18599,7 @@ static int zend_fetch_var_address_helper_SPEC_CV(int type, ZEND_OPCODE_HANDLER_A
                switch (opline->op2.u.EA.type) {
                        case ZEND_FETCH_GLOBAL:
                        case ZEND_FETCH_LOCAL:
-                               ;
+
                                break;
                        case ZEND_FETCH_STATIC:
                                zval_update_constant(retval, (void*) 1 TSRMLS_CC);
@@ -18750,10 +18668,9 @@ static int ZEND_FETCH_IS_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_JMPZ_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1;
+       
        int ret = i_zend_is_true(_get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC));
 
-       ;
        if (!ret) {
 #if DEBUG_ZEND>=2
                printf("Conditional jmp to %d\n", opline->op2.u.opline_num);
@@ -18768,10 +18685,9 @@ static int ZEND_JMPZ_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_JMPNZ_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1;
+       
        int ret = i_zend_is_true(_get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC));
 
-       ;
        if (ret) {
 #if DEBUG_ZEND>=2
                printf("Conditional jmp to %d\n", opline->op2.u.opline_num);
@@ -18786,10 +18702,9 @@ static int ZEND_JMPNZ_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_JMPZNZ_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1;
+       
        int retval = i_zend_is_true(_get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC));
 
-       ;
        if (retval) {
 #if DEBUG_ZEND>=2
                printf("Conditional jmp on true to %d\n", opline->extended_value);
@@ -18808,10 +18723,9 @@ static int ZEND_JMPZNZ_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_JMPZ_EX_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1;
+       
        int retval = i_zend_is_true(_get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC));
 
-       ;
        EX_T(opline->result.u.var).tmp_var.value.lval = retval;
        EX_T(opline->result.u.var).tmp_var.type = IS_BOOL;
        if (!retval) {
@@ -18827,10 +18741,9 @@ static int ZEND_JMPZ_EX_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_JMPNZ_EX_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1;
+       
        int retval = i_zend_is_true(_get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC));
 
-       ;
        EX_T(opline->result.u.var).tmp_var.value.lval = retval;
        EX_T(opline->result.u.var).tmp_var.type = IS_BOOL;
        if (retval) {
@@ -18916,7 +18829,7 @@ return_by_value:
                        *EG(return_value_ptr_ptr) = ret;
                }
        }
-       ;
+
        ZEND_VM_RETURN_FROM_EXECUTE_LOOP();
 }
 
@@ -18925,7 +18838,7 @@ static int ZEND_THROW_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        zend_op *opline = EX(opline);
        zval *value;
        zval *exception;
-       zend_free_op free_op1;
+       
 
        value = _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC);
 
@@ -18940,7 +18853,7 @@ static int ZEND_THROW_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        }
 
        zend_throw_exception_object(exception TSRMLS_CC);
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
@@ -18954,7 +18867,7 @@ static int ZEND_SEND_VAL_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        {
                zval *valptr;
                zval *value;
-               zend_free_op free_op1;
+               
 
                value = _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC);
 
@@ -18964,7 +18877,7 @@ static int ZEND_SEND_VAL_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                        zval_copy_ctor(valptr);
                }
                zend_ptr_stack_push(&EG(argument_stack), valptr);
-               ;
+
        }
        ZEND_VM_NEXT_OPCODE();
 }
@@ -18973,7 +18886,7 @@ static int zend_send_by_var_helper_SPEC_CV(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
        zval *varptr;
-       zend_free_op free_op1;
+       
        varptr = _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC);
 
        if (varptr == &EG(uninitialized_zval)) {
@@ -19008,14 +18921,14 @@ static int ZEND_SEND_VAR_NO_REF_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        }
        {
                zval *varptr;
-               zend_free_op free_op1;
+               
                varptr = _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC);
 
                if (varptr != &EG(uninitialized_zval) && (PZVAL_IS_REF(varptr) || varptr->refcount == 1)) {
                        varptr->is_ref = 1;
                        varptr->refcount++;
                        zend_ptr_stack_push(&EG(argument_stack), varptr);
-                       ;
+
                        ZEND_VM_NEXT_OPCODE();
                }
                zend_error_noreturn(E_ERROR, "Only variables can be passed by reference");
@@ -19026,7 +18939,7 @@ static int ZEND_SEND_VAR_NO_REF_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_SEND_REF_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1;
+       
        zval **varptr_ptr;
        zval *varptr;
        varptr_ptr = _get_zval_ptr_ptr_cv(&opline->op1, EX(Ts), BP_VAR_W TSRMLS_CC);
@@ -19040,7 +18953,6 @@ static int ZEND_SEND_REF_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        varptr->refcount++;
        zend_ptr_stack_push(&EG(argument_stack), varptr);
 
-       ;
        ZEND_VM_NEXT_OPCODE();
 }
 
@@ -19058,12 +18970,11 @@ static int ZEND_SEND_VAR_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_BOOL_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1;
+       
 
        /* PHP 3.0 returned "" for false and 1 for true, here we use 0 and 1 for now */
        EX_T(opline->result.u.var).tmp_var.value.lval = i_zend_is_true(_get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC));
        EX_T(opline->result.u.var).tmp_var.type = IS_BOOL;
-       ;
 
        ZEND_VM_NEXT_OPCODE();
 }
@@ -19071,7 +18982,7 @@ static int ZEND_BOOL_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_CLONE_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1;
+       
        zval *obj = _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC);
        zend_class_entry *ce;
        zend_function *clone;
@@ -19081,7 +18992,7 @@ static int ZEND_CLONE_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                zend_error(E_WARNING, "__clone method called on non-object");
                EX_T(opline->result.u.var).var.ptr = EG(error_zval_ptr);
                EX_T(opline->result.u.var).var.ptr->refcount++;
-               ;
+
                ZEND_VM_NEXT_OPCODE();
        }
 
@@ -19120,14 +19031,14 @@ static int ZEND_CLONE_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                EX_T(opline->result.u.var).var.ptr->refcount=1;
                EX_T(opline->result.u.var).var.ptr->is_ref=1;
        }
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_CAST_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1;
+       
        zval *expr = _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC);
        zval *result = &EX_T(opline->result.u.var).tmp_var;
 
@@ -19166,7 +19077,7 @@ static int ZEND_CAST_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                        convert_to_object(result);
                        break;
        }
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
@@ -19176,7 +19087,7 @@ static int ZEND_INCLUDE_OR_EVAL_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        zend_op_array *new_op_array=NULL;
        zval **original_return_value = EG(return_value_ptr_ptr);
        int return_value_used;
-       zend_free_op free_op1;
+       
        zval *inc_filename = _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC);
        zval tmp_inc_filename;
        zend_bool failure_retval=0;
@@ -19235,7 +19146,7 @@ static int ZEND_INCLUDE_OR_EVAL_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        if (inc_filename==&tmp_inc_filename) {
                zval_dtor(&tmp_inc_filename);
        }
-       ;
+
        EX_T(opline->result.u.var).var.ptr_ptr = &EX_T(opline->result.u.var).var.ptr;
        if (new_op_array) {
                zval *saved_object;
@@ -19294,7 +19205,7 @@ static int ZEND_UNSET_VAR_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        zend_op *opline = EX(opline);
        zval tmp, *varname;
        HashTable *target_symbol_table;
-       zend_free_op free_op1;
+       
 
        varname = _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC);
 
@@ -19332,14 +19243,14 @@ static int ZEND_UNSET_VAR_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        if (varname == &tmp) {
                zval_dtor(&tmp);
        }
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_FE_RESET_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1;
+       
        zval *array_ptr, **array_ptr_ptr;
        HashTable *fe_ht;
        zend_object_iterator *iter = NULL;
@@ -19384,9 +19295,9 @@ static int ZEND_FE_RESET_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                        array_ptr = zend_iterator_wrap(iter TSRMLS_CC);
                } else {
                        if (opline->extended_value) {
-                               ;
+
                        } else {
-                               ;
+
                        }
                        if (!EG(exception)) {
                                zend_throw_exception_ex(NULL, 0 TSRMLS_CC, "Object of type %s did not create an Iterator", ce->name);
@@ -19438,9 +19349,9 @@ static int ZEND_FE_RESET_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        }
 
        if (opline->extended_value) {
-               ;
+
        } else {
-               ;
+
        }
        if (is_empty) {
                ZEND_VM_SET_OPCODE(EX(op_array)->opcodes+opline->op2.u.opline_num);
@@ -19453,7 +19364,7 @@ static int ZEND_FE_RESET_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_ISSET_ISEMPTY_VAR_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1;
+       
        zval tmp, *varname = _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_IS TSRMLS_CC);
        zval **value;
        zend_bool isset = 1;
@@ -19500,7 +19411,6 @@ static int ZEND_ISSET_ISEMPTY_VAR_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        if (varname == &tmp) {
                zval_dtor(&tmp);
        }
-       ;
 
        ZEND_VM_NEXT_OPCODE();
 }
@@ -19511,7 +19421,7 @@ static int ZEND_EXIT_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 
        if (IS_CV != IS_UNUSED) {
                zval *ptr;
-               zend_free_op free_op1;
+               
 
                ptr = _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC);
                if (Z_TYPE_P(ptr) == IS_LONG) {
@@ -19519,7 +19429,7 @@ static int ZEND_EXIT_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                } else {
                        zend_print_variable(ptr);
                }
-               ;
+
        }
        zend_bailout();
        ZEND_VM_NEXT_OPCODE();
@@ -19528,21 +19438,21 @@ static int ZEND_EXIT_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_QM_ASSIGN_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1;
+       
        zval *value = _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC);
 
        EX_T(opline->result.u.var).tmp_var = *value;
        if (!0) {
                zval_copy_ctor(&EX_T(opline->result.u.var).tmp_var);
        }
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_INSTANCEOF_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1;
+       
        zval *expr = _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC);
        zend_bool result;
 
@@ -19552,241 +19462,241 @@ static int ZEND_INSTANCEOF_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                result = 0;
        }
        ZVAL_BOOL(&EX_T(opline->result.u.var).tmp_var, result);
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_ADD_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
 
        add_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC),
                &opline->op2.u.constant TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_SUB_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
 
        sub_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC),
                &opline->op2.u.constant TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_MUL_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
 
        mul_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC),
                &opline->op2.u.constant TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_DIV_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
 
        div_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC),
                &opline->op2.u.constant TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_MOD_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
 
        mod_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC),
                &opline->op2.u.constant TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_SL_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
 
        shift_left_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC),
                &opline->op2.u.constant TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_SR_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
 
        shift_right_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC),
                &opline->op2.u.constant TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_CONCAT_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
 
        concat_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC),
                &opline->op2.u.constant TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_IS_IDENTICAL_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
 
        is_identical_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC),
                &opline->op2.u.constant TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_IS_NOT_IDENTICAL_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
 
        is_not_identical_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC),
                &opline->op2.u.constant TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_IS_EQUAL_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
 
        is_equal_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC),
                &opline->op2.u.constant TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_IS_NOT_EQUAL_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
 
        is_not_equal_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC),
                &opline->op2.u.constant TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_IS_SMALLER_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
 
        is_smaller_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC),
                &opline->op2.u.constant TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_IS_SMALLER_OR_EQUAL_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
 
        is_smaller_or_equal_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC),
                &opline->op2.u.constant TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_BW_OR_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
 
        bitwise_or_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC),
                &opline->op2.u.constant TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_BW_AND_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
 
        bitwise_and_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC),
                &opline->op2.u.constant TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_BW_XOR_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
 
        bitwise_xor_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC),
                &opline->op2.u.constant TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_BOOL_XOR_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
 
        boolean_xor_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC),
                &opline->op2.u.constant TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
@@ -19794,7 +19704,7 @@ static int zend_binary_assign_op_obj_helper_SPEC_CV_CONST(int (*binary_op)(zval
 {
        zend_op *opline = EX(opline);
        zend_op *op_data = opline+1;
-       zend_free_op free_op1, free_op2, free_op_data1;
+       zend_free_op free_op_data1;
        zval **object_ptr = _get_zval_ptr_ptr_cv(&opline->op1, EX(Ts), BP_VAR_W TSRMLS_CC);
        zval *object;
        zval *property = &opline->op2.u.constant;
@@ -19809,7 +19719,7 @@ static int zend_binary_assign_op_obj_helper_SPEC_CV_CONST(int (*binary_op)(zval
 
        if (object->type != IS_OBJECT) {
                zend_error(E_WARNING, "Attempt to assign property of non-object");
-               ;
+
                FREE_OP(free_op_data1);
 
                if (!RETURN_VALUE_UNUSED(result)) {
@@ -19891,12 +19801,11 @@ static int zend_binary_assign_op_obj_helper_SPEC_CV_CONST(int (*binary_op)(zval
                if (0) {
                        zval_ptr_dtor(&property);
                } else {
-                       ;
+
                }
                FREE_OP(free_op_data1);
        }
 
-       ;
        /* assign_obj has two opcodes! */
        ZEND_VM_INC_OPCODE();
        ZEND_VM_NEXT_OPCODE();
@@ -19905,7 +19814,7 @@ static int zend_binary_assign_op_obj_helper_SPEC_CV_CONST(int (*binary_op)(zval
 static int zend_binary_assign_op_helper_SPEC_CV_CONST(int (*binary_op)(zval *result, zval *op1, zval *op2 TSRMLS_DC), ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2, free_op_data2, free_op_data1;
+       zend_free_op free_op1, free_op_data2, free_op_data1;
        zval **var_ptr;
        zval *value;
        zend_bool increment_opline = 0;
@@ -19951,8 +19860,8 @@ static int zend_binary_assign_op_helper_SPEC_CV_CONST(int (*binary_op)(zval *res
                        PZVAL_LOCK(*EX_T(opline->result.u.var).var.ptr_ptr);
                        AI_USE_PTR(EX_T(opline->result.u.var).var);
                }
-               ;
-               ;
+
+
                if (increment_opline) {
                        ZEND_VM_INC_OPCODE();
                }
@@ -19978,13 +19887,12 @@ static int zend_binary_assign_op_helper_SPEC_CV_CONST(int (*binary_op)(zval *res
                PZVAL_LOCK(*var_ptr);
                AI_USE_PTR(EX_T(opline->result.u.var).var);
        }
-       ;
 
        if (increment_opline) {
                ZEND_VM_INC_OPCODE();
                FREE_OP_VAR_PTR(free_op_data2);
        }
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
@@ -20046,7 +19954,7 @@ static int ZEND_ASSIGN_BW_XOR_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int zend_pre_incdec_property_helper_SPEC_CV_CONST(incdec_t incdec_op, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
        zval **object_ptr = _get_zval_ptr_ptr_cv(&opline->op1, EX(Ts), BP_VAR_W TSRMLS_CC);
        zval *object;
        zval *property = &opline->op2.u.constant;
@@ -20058,12 +19966,12 @@ static int zend_pre_incdec_property_helper_SPEC_CV_CONST(incdec_t incdec_op, ZEN
 
        if (object->type != IS_OBJECT) {
                zend_error(E_WARNING, "Attempt to increment/decrement property of non-object");
-               ;
+
                if (!RETURN_VALUE_UNUSED(&opline->result)) {
                        *retval = EG(uninitialized_zval_ptr);
                        PZVAL_LOCK(*retval);
                }
-               ;
+
                ZEND_VM_NEXT_OPCODE();
        }
 
@@ -20119,9 +20027,9 @@ static int zend_pre_incdec_property_helper_SPEC_CV_CONST(incdec_t incdec_op, ZEN
        if (0) {
                zval_ptr_dtor(&property);
        } else {
-               ;
+
        }
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
@@ -20138,7 +20046,7 @@ static int ZEND_PRE_DEC_OBJ_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int zend_post_incdec_property_helper_SPEC_CV_CONST(incdec_t incdec_op, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
        zval **object_ptr = _get_zval_ptr_ptr_cv(&opline->op1, EX(Ts), BP_VAR_W TSRMLS_CC);
        zval *object;
        zval *property = &opline->op2.u.constant;
@@ -20150,9 +20058,9 @@ static int zend_post_incdec_property_helper_SPEC_CV_CONST(incdec_t incdec_op, ZE
 
        if (object->type != IS_OBJECT) {
                zend_error(E_WARNING, "Attempt to increment/decrement property of non-object");
-               ;
+
                *retval = *EG(uninitialized_zval_ptr);
-               ;
+
                ZEND_VM_NEXT_OPCODE();
        }
 
@@ -20210,9 +20118,9 @@ static int zend_post_incdec_property_helper_SPEC_CV_CONST(incdec_t incdec_op, ZE
        if (0) {
                zval_ptr_dtor(&property);
        } else {
-               ;
+
        }
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
@@ -20229,71 +20137,71 @@ static int ZEND_POST_DEC_OBJ_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_FETCH_DIM_R_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
        zval *dim = &opline->op2.u.constant;
 
        if (opline->extended_value == ZEND_FETCH_ADD_LOCK && IS_CV != IS_CV) {
                PZVAL_LOCK(*EX_T(opline->op1.u.var).var.ptr_ptr);
        }
        zend_fetch_dimension_address(RETURN_VALUE_UNUSED(&opline->result)?NULL:&EX_T(opline->result.u.var), _get_zval_ptr_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC), dim, 0, BP_VAR_R TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_FETCH_DIM_W_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
        zval *dim = &opline->op2.u.constant;
 
        zend_fetch_dimension_address(RETURN_VALUE_UNUSED(&opline->result)?NULL:&EX_T(opline->result.u.var), _get_zval_ptr_ptr_cv(&opline->op1, EX(Ts), BP_VAR_W TSRMLS_CC), dim, 0, BP_VAR_W TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_FETCH_DIM_RW_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
        zval *dim = &opline->op2.u.constant;
 
        zend_fetch_dimension_address(RETURN_VALUE_UNUSED(&opline->result)?NULL:&EX_T(opline->result.u.var), _get_zval_ptr_ptr_cv(&opline->op1, EX(Ts), BP_VAR_RW TSRMLS_CC), dim, 0, BP_VAR_RW TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_FETCH_DIM_IS_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
        zval *dim = &opline->op2.u.constant;
 
        zend_fetch_dimension_address(RETURN_VALUE_UNUSED(&opline->result)?NULL:&EX_T(opline->result.u.var), _get_zval_ptr_ptr_cv(&opline->op1, EX(Ts), BP_VAR_IS TSRMLS_CC), dim, 0, BP_VAR_IS TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_FETCH_DIM_FUNC_ARG_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
        int type = ARG_SHOULD_BE_SENT_BY_REF(EX(fbc), opline->extended_value)?BP_VAR_W:BP_VAR_R;
        zval *dim = &opline->op2.u.constant;
 
        zend_fetch_dimension_address(RETURN_VALUE_UNUSED(&opline->result)?NULL:&EX_T(opline->result.u.var), _get_zval_ptr_ptr_cv(&opline->op1, EX(Ts), type TSRMLS_CC), dim, 0, type TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_FETCH_DIM_UNSET_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
        zval *dim = &opline->op2.u.constant;
 
        /* Not needed in DIM_UNSET
@@ -20302,8 +20210,8 @@ static int ZEND_FETCH_DIM_UNSET_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        }
        */
        zend_fetch_dimension_address(RETURN_VALUE_UNUSED(&opline->result)?NULL:&EX_T(opline->result.u.var), _get_zval_ptr_ptr_cv(&opline->op1, EX(Ts), BP_VAR_UNSET TSRMLS_CC), dim, 0, BP_VAR_UNSET TSRMLS_CC);
-       ;
-       ;
+
+
        if (EX_T(opline->result.u.var).var.ptr_ptr == NULL) {
                zend_error_noreturn(E_ERROR, "Cannot unset string offsets");
        } else {
@@ -20324,7 +20232,7 @@ static int zend_fetch_property_address_read_helper_SPEC_CV_CONST(int type, ZEND_
        zend_op *opline = EX(opline);
        zval *container;
        zval **retval;
-       zend_free_op free_op1;
+       
 
        retval = &EX_T(opline->result.u.var).var.ptr;
        EX_T(opline->result.u.var).var.ptr_ptr = retval;
@@ -20337,7 +20245,7 @@ static int zend_fetch_property_address_read_helper_SPEC_CV_CONST(int type, ZEND_
                        PZVAL_LOCK(*retval);
                        AI_USE_PTR(EX_T(opline->result.u.var).var);
                }
-               ;
+
                ZEND_VM_NEXT_OPCODE();
        }
 
@@ -20348,7 +20256,7 @@ static int zend_fetch_property_address_read_helper_SPEC_CV_CONST(int type, ZEND_
                SELECTIVE_PZVAL_LOCK(*retval, &opline->result);
                AI_USE_PTR(EX_T(opline->result.u.var).var);
        } else {
-               zend_free_op free_op2;
+               
                zval *offset  = &opline->op2.u.constant;
 
                if (0) {
@@ -20369,11 +20277,10 @@ static int zend_fetch_property_address_read_helper_SPEC_CV_CONST(int type, ZEND_
                if (0) {
                        zval_ptr_dtor(&offset);
                } else {
-                       ;
+
                }
        }
 
-       ;
        ZEND_VM_NEXT_OPCODE();
 }
 
@@ -20385,7 +20292,7 @@ static int ZEND_FETCH_OBJ_R_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_FETCH_OBJ_W_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
        zval *property = &opline->op2.u.constant;
 
        if (opline->extended_value == ZEND_FETCH_ADD_LOCK && IS_CV != IS_CV) {
@@ -20400,16 +20307,16 @@ static int ZEND_FETCH_OBJ_W_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        if (0) {
                zval_ptr_dtor(&property);
        } else {
-               ;
+
        }
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_FETCH_OBJ_RW_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
        zval *property = &opline->op2.u.constant;
 
        if (0) {
@@ -20419,9 +20326,9 @@ static int ZEND_FETCH_OBJ_RW_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        if (0) {
                zval_ptr_dtor(&property);
        } else {
-               ;
+
        }
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
@@ -20436,7 +20343,7 @@ static int ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARG
 
        if (ARG_SHOULD_BE_SENT_BY_REF(EX(fbc), opline->extended_value)) {
                /* Behave like FETCH_OBJ_W */
-               zend_free_op free_op1, free_op2;
+               
                zval *property = &opline->op2.u.constant;
 
                if (0) {
@@ -20446,9 +20353,9 @@ static int ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARG
                if (0) {
                        zval_ptr_dtor(&property);
                } else {
-                       ;
+
                }
-               ;
+
                ZEND_VM_NEXT_OPCODE();
        } else {
                return zend_fetch_property_address_read_helper_SPEC_CV_CONST(BP_VAR_R, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
@@ -20458,7 +20365,7 @@ static int ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARG
 static int ZEND_FETCH_OBJ_UNSET_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2, free_res;
+       zend_free_op free_res;
        zval *property = &opline->op2.u.constant;
 
        if (0) {
@@ -20468,9 +20375,8 @@ static int ZEND_FETCH_OBJ_UNSET_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        if (0) {
                zval_ptr_dtor(&property);
        } else {
-               ;
+
        }
-       ;
 
        PZVAL_UNLOCK(*EX_T(opline->result.u.var).var.ptr_ptr, &free_res);
        if (EX_T(opline->result.u.var).var.ptr_ptr != &EG(uninitialized_zval_ptr)) {
@@ -20485,11 +20391,11 @@ static int ZEND_ASSIGN_OBJ_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
        zend_op *op_data = opline+1;
-       zend_free_op free_op1;
+       
        zval **object_ptr = _get_zval_ptr_ptr_cv(&opline->op1, EX(Ts), BP_VAR_W TSRMLS_CC);
 
        zend_assign_to_object(&opline->result, object_ptr, &opline->op2, &op_data->op1, EX(Ts), ZEND_ASSIGN_OBJ TSRMLS_CC);
-       ;
+
        /* assign_obj has two opcodes! */
        ZEND_VM_INC_OPCODE();
        ZEND_VM_NEXT_OPCODE();
@@ -20499,7 +20405,7 @@ static int ZEND_ASSIGN_DIM_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
        zend_op *op_data = opline+1;
-       zend_free_op free_op1;
+       
        zval **object_ptr;
 
        if (IS_CV == IS_CV || EX_T(opline->op1.u.var).var.ptr_ptr) {
@@ -20512,18 +20418,17 @@ static int ZEND_ASSIGN_DIM_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        if (object_ptr && (*object_ptr)->type == IS_OBJECT) {
                zend_assign_to_object(&opline->result, object_ptr, &opline->op2, &op_data->op1, EX(Ts), ZEND_ASSIGN_DIM TSRMLS_CC);
        } else {
-               zend_free_op free_op2, free_op_data1;
+               zend_free_op free_op_data1;
                zval *value;
                zval *dim = &opline->op2.u.constant;
 
                zend_fetch_dimension_address(&EX_T(op_data->op2.u.var), object_ptr, dim, 0, BP_VAR_W TSRMLS_CC);
-               ;
 
                value = get_zval_ptr(&op_data->op1, EX(Ts), &free_op_data1, BP_VAR_R);
                zend_assign_to_variable(&opline->result, &op_data->op2, &op_data->op1, value, (IS_TMP_FREE(free_op_data1)?IS_TMP_VAR:op_data->op1.op_type), EX(Ts) TSRMLS_CC);
                FREE_OP_IF_VAR(free_op_data1);
        }
-       ;
+
        /* assign_dim has two opcodes! */
        ZEND_VM_INC_OPCODE();
        ZEND_VM_NEXT_OPCODE();
@@ -20532,12 +20437,11 @@ static int ZEND_ASSIGN_DIM_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_ASSIGN_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op2;
+       
        zval *value = &opline->op2.u.constant;
 
        zend_assign_to_variable(&opline->result, &opline->op1, &opline->op2, value, (0?IS_TMP_VAR:IS_CONST), EX(Ts) TSRMLS_CC);
        /* zend_assign_to_variable() always takes care of op2, never free it! */
-       ;
 
        ZEND_VM_NEXT_OPCODE();
 }
@@ -20548,7 +20452,7 @@ static int ZEND_INIT_METHOD_CALL_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        zval *function_name;
        char *function_name_strval;
        int function_name_strlen;
-       zend_free_op free_op1, free_op2;
+       
 
        zend_ptr_stack_3_push(&EG(arg_types_stack), EX(fbc), EX(object), EX(calling_scope));
 
@@ -20599,8 +20503,6 @@ static int ZEND_INIT_METHOD_CALL_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                EX(calling_scope) = NULL;
        }
 
-       ;
-       ;
 
        ZEND_VM_NEXT_OPCODE();
 }
@@ -20609,7 +20511,7 @@ static int ZEND_CASE_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
        int switch_expr_is_overloaded=0;
-       zend_free_op free_op1, free_op2;
+       
 
        if (IS_CV==IS_VAR) {
                if (EX_T(opline->op1.u.var).var.ptr_ptr) {
@@ -20623,14 +20525,13 @@ static int ZEND_CASE_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                                 _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC),
                                 &opline->op2.u.constant TSRMLS_CC);
 
-       ;
        if (switch_expr_is_overloaded) {
                /* We only free op1 if this is a string offset,
                 * Since if it is a TMP_VAR, it'll be reused by
                 * other CASE opcodes (whereas string offsets
                 * are allocated at each get_zval_ptr())
                 */
-               ;
+
                EX_T(opline->op1.u.var).var.ptr_ptr = NULL;
                AI_USE_PTR(EX_T(opline->op1.u.var).var);
        }
@@ -20640,7 +20541,7 @@ static int ZEND_CASE_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_ADD_ARRAY_ELEMENT_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
        zval *array_ptr = &EX_T(opline->result.u.var).tmp_var;
        zval *expr_ptr, **expr_ptr_ptr = NULL;
        zval *offset=&opline->op2.u.constant;
@@ -20701,14 +20602,14 @@ static int ZEND_ADD_ARRAY_ELEMENT_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS
                                /* do nothing */
                                break;
                }
-               ;
+
        } else {
                zend_hash_next_index_insert(array_ptr->value.ht, &expr_ptr, sizeof(zval *), NULL);
        }
        if (opline->extended_value) {
-               ;
+
        } else {
-               ;
+
        }
        ZEND_VM_NEXT_OPCODE();
 }
@@ -20721,7 +20622,7 @@ static int ZEND_INIT_ARRAY_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_UNSET_DIM_OBJ_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
        zval **container = _get_zval_ptr_ptr_cv(&opline->op1, EX(Ts), BP_VAR_UNSET TSRMLS_CC);
        zval *offset = &opline->op2.u.constant;
        long index;
@@ -20778,7 +20679,7 @@ static int ZEND_UNSET_DIM_OBJ_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                                                        zend_error(E_WARNING, "Illegal offset type in unset");
                                                        break;
                                        }
-                                       ;
+
                                        break;
                                }
                                case IS_OBJECT:
@@ -20792,14 +20693,14 @@ static int ZEND_UNSET_DIM_OBJ_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                                        if (0) {
                                                zval_ptr_dtor(&offset);
                                        } else {
-                                               ;
+
                                        }
                                        break;
                                case IS_STRING:
                                        zend_error_noreturn(E_ERROR, "Cannot unset string offsets");
                                        ZEND_VM_CONTINUE(); /* bailed out before */
                                default:
-                                       ;
+
                                        break;
                        }
                } else { /* ZEND_UNSET_OBJ */
@@ -20811,15 +20712,14 @@ static int ZEND_UNSET_DIM_OBJ_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                                if (0) {
                                        zval_ptr_dtor(&offset);
                                } else {
-                                       ;
+
                                }
                        }
                }
        } else {
                /* overloaded element */
-               ;
+
        }
-       ;
 
        ZEND_VM_NEXT_OPCODE();
 }
@@ -20827,14 +20727,14 @@ static int ZEND_UNSET_DIM_OBJ_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int zend_isset_isempty_dim_prop_obj_handler_SPEC_CV_CONST(int prop_dim, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1;
+       
        zval **container = _get_zval_ptr_ptr_cv(&opline->op1, EX(Ts), BP_VAR_IS TSRMLS_CC);
        zval **value = NULL;
        int result = 0;
        long index;
 
        if (container) {
-               zend_free_op free_op2;
+               
                zval *offset = &opline->op2.u.constant;
 
                if ((*container)->type == IS_ARRAY) {
@@ -20889,7 +20789,7 @@ static int zend_isset_isempty_dim_prop_obj_handler_SPEC_CV_CONST(int prop_dim, Z
                                        }
                                        break;
                        }
-                       ;
+
                } else if ((*container)->type == IS_OBJECT) {
                        if (0) {
                                MAKE_REAL_ZVAL_PTR(offset);
@@ -20902,7 +20802,7 @@ static int zend_isset_isempty_dim_prop_obj_handler_SPEC_CV_CONST(int prop_dim, Z
                        if (0) {
                                zval_ptr_dtor(&offset);
                        } else {
-                               ;
+
                        }
                } else if ((*container)->type == IS_STRING && !prop_dim) { /* string offsets */
                        zval tmp;
@@ -20927,9 +20827,9 @@ static int zend_isset_isempty_dim_prop_obj_handler_SPEC_CV_CONST(int prop_dim, Z
                                                break;
                                }
                        }
-                       ;
+
                } else {
-                       ;
+
                }
        }
 
@@ -20944,8 +20844,6 @@ static int zend_isset_isempty_dim_prop_obj_handler_SPEC_CV_CONST(int prop_dim, Z
                        break;
        }
 
-       ;
-
        ZEND_VM_NEXT_OPCODE();
 }
 
@@ -20962,12 +20860,12 @@ static int ZEND_ISSET_ISEMPTY_PROP_OBJ_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER
 static int ZEND_ADD_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        add_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC),
                _get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC) TSRMLS_CC);
-       ;
+
        zval_dtor(free_op2.var);
        ZEND_VM_NEXT_OPCODE();
 }
@@ -20975,12 +20873,12 @@ static int ZEND_ADD_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_SUB_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        sub_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC),
                _get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC) TSRMLS_CC);
-       ;
+
        zval_dtor(free_op2.var);
        ZEND_VM_NEXT_OPCODE();
 }
@@ -20988,12 +20886,12 @@ static int ZEND_SUB_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_MUL_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        mul_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC),
                _get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC) TSRMLS_CC);
-       ;
+
        zval_dtor(free_op2.var);
        ZEND_VM_NEXT_OPCODE();
 }
@@ -21001,12 +20899,12 @@ static int ZEND_MUL_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_DIV_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        div_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC),
                _get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC) TSRMLS_CC);
-       ;
+
        zval_dtor(free_op2.var);
        ZEND_VM_NEXT_OPCODE();
 }
@@ -21014,12 +20912,12 @@ static int ZEND_DIV_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_MOD_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        mod_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC),
                _get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC) TSRMLS_CC);
-       ;
+
        zval_dtor(free_op2.var);
        ZEND_VM_NEXT_OPCODE();
 }
@@ -21027,12 +20925,12 @@ static int ZEND_MOD_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_SL_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        shift_left_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC),
                _get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC) TSRMLS_CC);
-       ;
+
        zval_dtor(free_op2.var);
        ZEND_VM_NEXT_OPCODE();
 }
@@ -21040,12 +20938,12 @@ static int ZEND_SL_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_SR_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        shift_right_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC),
                _get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC) TSRMLS_CC);
-       ;
+
        zval_dtor(free_op2.var);
        ZEND_VM_NEXT_OPCODE();
 }
@@ -21053,12 +20951,12 @@ static int ZEND_SR_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_CONCAT_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        concat_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC),
                _get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC) TSRMLS_CC);
-       ;
+
        zval_dtor(free_op2.var);
        ZEND_VM_NEXT_OPCODE();
 }
@@ -21066,12 +20964,12 @@ static int ZEND_CONCAT_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_IS_IDENTICAL_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        is_identical_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC),
                _get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC) TSRMLS_CC);
-       ;
+
        zval_dtor(free_op2.var);
        ZEND_VM_NEXT_OPCODE();
 }
@@ -21079,12 +20977,12 @@ static int ZEND_IS_IDENTICAL_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_IS_NOT_IDENTICAL_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        is_not_identical_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC),
                _get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC) TSRMLS_CC);
-       ;
+
        zval_dtor(free_op2.var);
        ZEND_VM_NEXT_OPCODE();
 }
@@ -21092,12 +20990,12 @@ static int ZEND_IS_NOT_IDENTICAL_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_IS_EQUAL_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        is_equal_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC),
                _get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC) TSRMLS_CC);
-       ;
+
        zval_dtor(free_op2.var);
        ZEND_VM_NEXT_OPCODE();
 }
@@ -21105,12 +21003,12 @@ static int ZEND_IS_EQUAL_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_IS_NOT_EQUAL_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        is_not_equal_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC),
                _get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC) TSRMLS_CC);
-       ;
+
        zval_dtor(free_op2.var);
        ZEND_VM_NEXT_OPCODE();
 }
@@ -21118,12 +21016,12 @@ static int ZEND_IS_NOT_EQUAL_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_IS_SMALLER_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        is_smaller_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC),
                _get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC) TSRMLS_CC);
-       ;
+
        zval_dtor(free_op2.var);
        ZEND_VM_NEXT_OPCODE();
 }
@@ -21131,12 +21029,12 @@ static int ZEND_IS_SMALLER_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_IS_SMALLER_OR_EQUAL_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        is_smaller_or_equal_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC),
                _get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC) TSRMLS_CC);
-       ;
+
        zval_dtor(free_op2.var);
        ZEND_VM_NEXT_OPCODE();
 }
@@ -21144,12 +21042,12 @@ static int ZEND_IS_SMALLER_OR_EQUAL_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS
 static int ZEND_BW_OR_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        bitwise_or_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC),
                _get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC) TSRMLS_CC);
-       ;
+
        zval_dtor(free_op2.var);
        ZEND_VM_NEXT_OPCODE();
 }
@@ -21157,12 +21055,12 @@ static int ZEND_BW_OR_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_BW_AND_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        bitwise_and_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC),
                _get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC) TSRMLS_CC);
-       ;
+
        zval_dtor(free_op2.var);
        ZEND_VM_NEXT_OPCODE();
 }
@@ -21170,12 +21068,12 @@ static int ZEND_BW_AND_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_BW_XOR_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        bitwise_xor_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC),
                _get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC) TSRMLS_CC);
-       ;
+
        zval_dtor(free_op2.var);
        ZEND_VM_NEXT_OPCODE();
 }
@@ -21183,12 +21081,12 @@ static int ZEND_BW_XOR_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_BOOL_XOR_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        boolean_xor_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC),
                _get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC) TSRMLS_CC);
-       ;
+
        zval_dtor(free_op2.var);
        ZEND_VM_NEXT_OPCODE();
 }
@@ -21197,7 +21095,7 @@ static int zend_binary_assign_op_obj_helper_SPEC_CV_TMP(int (*binary_op)(zval *r
 {
        zend_op *opline = EX(opline);
        zend_op *op_data = opline+1;
-       zend_free_op free_op1, free_op2, free_op_data1;
+       zend_free_op free_op2, free_op_data1;
        zval **object_ptr = _get_zval_ptr_ptr_cv(&opline->op1, EX(Ts), BP_VAR_W TSRMLS_CC);
        zval *object;
        zval *property = _get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
@@ -21299,7 +21197,6 @@ static int zend_binary_assign_op_obj_helper_SPEC_CV_TMP(int (*binary_op)(zval *r
                FREE_OP(free_op_data1);
        }
 
-       ;
        /* assign_obj has two opcodes! */
        ZEND_VM_INC_OPCODE();
        ZEND_VM_NEXT_OPCODE();
@@ -21355,7 +21252,7 @@ static int zend_binary_assign_op_helper_SPEC_CV_TMP(int (*binary_op)(zval *resul
                        AI_USE_PTR(EX_T(opline->result.u.var).var);
                }
                zval_dtor(free_op2.var);
-               ;
+
                if (increment_opline) {
                        ZEND_VM_INC_OPCODE();
                }
@@ -21387,7 +21284,7 @@ static int zend_binary_assign_op_helper_SPEC_CV_TMP(int (*binary_op)(zval *resul
                ZEND_VM_INC_OPCODE();
                FREE_OP_VAR_PTR(free_op_data2);
        }
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
@@ -21449,7 +21346,7 @@ static int ZEND_ASSIGN_BW_XOR_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int zend_pre_incdec_property_helper_SPEC_CV_TMP(incdec_t incdec_op, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
        zval **object_ptr = _get_zval_ptr_ptr_cv(&opline->op1, EX(Ts), BP_VAR_W TSRMLS_CC);
        zval *object;
        zval *property = _get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
@@ -21466,7 +21363,7 @@ static int zend_pre_incdec_property_helper_SPEC_CV_TMP(incdec_t incdec_op, ZEND_
                        *retval = EG(uninitialized_zval_ptr);
                        PZVAL_LOCK(*retval);
                }
-               ;
+
                ZEND_VM_NEXT_OPCODE();
        }
 
@@ -21524,7 +21421,7 @@ static int zend_pre_incdec_property_helper_SPEC_CV_TMP(incdec_t incdec_op, ZEND_
        } else {
                zval_dtor(free_op2.var);
        }
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
@@ -21541,7 +21438,7 @@ static int ZEND_PRE_DEC_OBJ_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int zend_post_incdec_property_helper_SPEC_CV_TMP(incdec_t incdec_op, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
        zval **object_ptr = _get_zval_ptr_ptr_cv(&opline->op1, EX(Ts), BP_VAR_W TSRMLS_CC);
        zval *object;
        zval *property = _get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
@@ -21555,7 +21452,7 @@ static int zend_post_incdec_property_helper_SPEC_CV_TMP(incdec_t incdec_op, ZEND
                zend_error(E_WARNING, "Attempt to increment/decrement property of non-object");
                zval_dtor(free_op2.var);
                *retval = *EG(uninitialized_zval_ptr);
-               ;
+
                ZEND_VM_NEXT_OPCODE();
        }
 
@@ -21615,7 +21512,7 @@ static int zend_post_incdec_property_helper_SPEC_CV_TMP(incdec_t incdec_op, ZEND
        } else {
                zval_dtor(free_op2.var);
        }
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
@@ -21632,7 +21529,7 @@ static int ZEND_POST_DEC_OBJ_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_FETCH_DIM_R_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
        zval *dim = _get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
 
        if (opline->extended_value == ZEND_FETCH_ADD_LOCK && IS_CV != IS_CV) {
@@ -21640,63 +21537,63 @@ static int ZEND_FETCH_DIM_R_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        }
        zend_fetch_dimension_address(RETURN_VALUE_UNUSED(&opline->result)?NULL:&EX_T(opline->result.u.var), _get_zval_ptr_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC), dim, 1, BP_VAR_R TSRMLS_CC);
        zval_dtor(free_op2.var);
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_FETCH_DIM_W_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
        zval *dim = _get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
 
        zend_fetch_dimension_address(RETURN_VALUE_UNUSED(&opline->result)?NULL:&EX_T(opline->result.u.var), _get_zval_ptr_ptr_cv(&opline->op1, EX(Ts), BP_VAR_W TSRMLS_CC), dim, 1, BP_VAR_W TSRMLS_CC);
        zval_dtor(free_op2.var);
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_FETCH_DIM_RW_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
        zval *dim = _get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
 
        zend_fetch_dimension_address(RETURN_VALUE_UNUSED(&opline->result)?NULL:&EX_T(opline->result.u.var), _get_zval_ptr_ptr_cv(&opline->op1, EX(Ts), BP_VAR_RW TSRMLS_CC), dim, 1, BP_VAR_RW TSRMLS_CC);
        zval_dtor(free_op2.var);
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_FETCH_DIM_IS_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
        zval *dim = _get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
 
        zend_fetch_dimension_address(RETURN_VALUE_UNUSED(&opline->result)?NULL:&EX_T(opline->result.u.var), _get_zval_ptr_ptr_cv(&opline->op1, EX(Ts), BP_VAR_IS TSRMLS_CC), dim, 1, BP_VAR_IS TSRMLS_CC);
        zval_dtor(free_op2.var);
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_FETCH_DIM_FUNC_ARG_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
        int type = ARG_SHOULD_BE_SENT_BY_REF(EX(fbc), opline->extended_value)?BP_VAR_W:BP_VAR_R;
        zval *dim = _get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
 
        zend_fetch_dimension_address(RETURN_VALUE_UNUSED(&opline->result)?NULL:&EX_T(opline->result.u.var), _get_zval_ptr_ptr_cv(&opline->op1, EX(Ts), type TSRMLS_CC), dim, 1, type TSRMLS_CC);
        zval_dtor(free_op2.var);
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_FETCH_DIM_UNSET_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
        zval *dim = _get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
 
        /* Not needed in DIM_UNSET
@@ -21706,7 +21603,7 @@ static int ZEND_FETCH_DIM_UNSET_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        */
        zend_fetch_dimension_address(RETURN_VALUE_UNUSED(&opline->result)?NULL:&EX_T(opline->result.u.var), _get_zval_ptr_ptr_cv(&opline->op1, EX(Ts), BP_VAR_UNSET TSRMLS_CC), dim, 1, BP_VAR_UNSET TSRMLS_CC);
        zval_dtor(free_op2.var);
-       ;
+
        if (EX_T(opline->result.u.var).var.ptr_ptr == NULL) {
                zend_error_noreturn(E_ERROR, "Cannot unset string offsets");
        } else {
@@ -21727,7 +21624,7 @@ static int zend_fetch_property_address_read_helper_SPEC_CV_TMP(int type, ZEND_OP
        zend_op *opline = EX(opline);
        zval *container;
        zval **retval;
-       zend_free_op free_op1;
+       
 
        retval = &EX_T(opline->result.u.var).var.ptr;
        EX_T(opline->result.u.var).var.ptr_ptr = retval;
@@ -21740,7 +21637,7 @@ static int zend_fetch_property_address_read_helper_SPEC_CV_TMP(int type, ZEND_OP
                        PZVAL_LOCK(*retval);
                        AI_USE_PTR(EX_T(opline->result.u.var).var);
                }
-               ;
+
                ZEND_VM_NEXT_OPCODE();
        }
 
@@ -21776,7 +21673,6 @@ static int zend_fetch_property_address_read_helper_SPEC_CV_TMP(int type, ZEND_OP
                }
        }
 
-       ;
        ZEND_VM_NEXT_OPCODE();
 }
 
@@ -21788,7 +21684,7 @@ static int ZEND_FETCH_OBJ_R_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_FETCH_OBJ_W_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
        zval *property = _get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
 
        if (opline->extended_value == ZEND_FETCH_ADD_LOCK && IS_CV != IS_CV) {
@@ -21805,14 +21701,14 @@ static int ZEND_FETCH_OBJ_W_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        } else {
                zval_dtor(free_op2.var);
        }
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_FETCH_OBJ_RW_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
        zval *property = _get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
 
        if (1) {
@@ -21824,7 +21720,7 @@ static int ZEND_FETCH_OBJ_RW_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        } else {
                zval_dtor(free_op2.var);
        }
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
@@ -21839,7 +21735,7 @@ static int ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 
        if (ARG_SHOULD_BE_SENT_BY_REF(EX(fbc), opline->extended_value)) {
                /* Behave like FETCH_OBJ_W */
-               zend_free_op free_op1, free_op2;
+               zend_free_op free_op2;
                zval *property = _get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
 
                if (1) {
@@ -21851,7 +21747,7 @@ static int ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                } else {
                        zval_dtor(free_op2.var);
                }
-               ;
+
                ZEND_VM_NEXT_OPCODE();
        } else {
                return zend_fetch_property_address_read_helper_SPEC_CV_TMP(BP_VAR_R, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
@@ -21861,7 +21757,7 @@ static int ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_FETCH_OBJ_UNSET_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2, free_res;
+       zend_free_op free_op2, free_res;
        zval *property = _get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
 
        if (1) {
@@ -21873,7 +21769,6 @@ static int ZEND_FETCH_OBJ_UNSET_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        } else {
                zval_dtor(free_op2.var);
        }
-       ;
 
        PZVAL_UNLOCK(*EX_T(opline->result.u.var).var.ptr_ptr, &free_res);
        if (EX_T(opline->result.u.var).var.ptr_ptr != &EG(uninitialized_zval_ptr)) {
@@ -21888,11 +21783,11 @@ static int ZEND_ASSIGN_OBJ_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
        zend_op *op_data = opline+1;
-       zend_free_op free_op1;
+       
        zval **object_ptr = _get_zval_ptr_ptr_cv(&opline->op1, EX(Ts), BP_VAR_W TSRMLS_CC);
 
        zend_assign_to_object(&opline->result, object_ptr, &opline->op2, &op_data->op1, EX(Ts), ZEND_ASSIGN_OBJ TSRMLS_CC);
-       ;
+
        /* assign_obj has two opcodes! */
        ZEND_VM_INC_OPCODE();
        ZEND_VM_NEXT_OPCODE();
@@ -21902,7 +21797,7 @@ static int ZEND_ASSIGN_DIM_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
        zend_op *op_data = opline+1;
-       zend_free_op free_op1;
+       
        zval **object_ptr;
 
        if (IS_CV == IS_CV || EX_T(opline->op1.u.var).var.ptr_ptr) {
@@ -21926,7 +21821,7 @@ static int ZEND_ASSIGN_DIM_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                zend_assign_to_variable(&opline->result, &op_data->op2, &op_data->op1, value, (IS_TMP_FREE(free_op_data1)?IS_TMP_VAR:op_data->op1.op_type), EX(Ts) TSRMLS_CC);
                FREE_OP_IF_VAR(free_op_data1);
        }
-       ;
+
        /* assign_dim has two opcodes! */
        ZEND_VM_INC_OPCODE();
        ZEND_VM_NEXT_OPCODE();
@@ -21940,7 +21835,6 @@ static int ZEND_ASSIGN_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 
        zend_assign_to_variable(&opline->result, &opline->op1, &opline->op2, value, (1?IS_TMP_VAR:IS_TMP_VAR), EX(Ts) TSRMLS_CC);
        /* zend_assign_to_variable() always takes care of op2, never free it! */
-       ;
 
        ZEND_VM_NEXT_OPCODE();
 }
@@ -21951,7 +21845,7 @@ static int ZEND_INIT_METHOD_CALL_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        zval *function_name;
        char *function_name_strval;
        int function_name_strlen;
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        zend_ptr_stack_3_push(&EG(arg_types_stack), EX(fbc), EX(object), EX(calling_scope));
 
@@ -22003,7 +21897,6 @@ static int ZEND_INIT_METHOD_CALL_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        }
 
        zval_dtor(free_op2.var);
-       ;
 
        ZEND_VM_NEXT_OPCODE();
 }
@@ -22012,7 +21905,7 @@ static int ZEND_CASE_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
        int switch_expr_is_overloaded=0;
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        if (IS_CV==IS_VAR) {
                if (EX_T(opline->op1.u.var).var.ptr_ptr) {
@@ -22033,7 +21926,7 @@ static int ZEND_CASE_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                 * other CASE opcodes (whereas string offsets
                 * are allocated at each get_zval_ptr())
                 */
-               ;
+
                EX_T(opline->op1.u.var).var.ptr_ptr = NULL;
                AI_USE_PTR(EX_T(opline->op1.u.var).var);
        }
@@ -22043,7 +21936,7 @@ static int ZEND_CASE_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_ADD_ARRAY_ELEMENT_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
        zval *array_ptr = &EX_T(opline->result.u.var).tmp_var;
        zval *expr_ptr, **expr_ptr_ptr = NULL;
        zval *offset=_get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
@@ -22109,9 +22002,9 @@ static int ZEND_ADD_ARRAY_ELEMENT_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                zend_hash_next_index_insert(array_ptr->value.ht, &expr_ptr, sizeof(zval *), NULL);
        }
        if (opline->extended_value) {
-               ;
+
        } else {
-               ;
+
        }
        ZEND_VM_NEXT_OPCODE();
 }
@@ -22124,7 +22017,7 @@ static int ZEND_INIT_ARRAY_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_UNSET_DIM_OBJ_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
        zval **container = _get_zval_ptr_ptr_cv(&opline->op1, EX(Ts), BP_VAR_UNSET TSRMLS_CC);
        zval *offset = _get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
        long index;
@@ -22222,7 +22115,6 @@ static int ZEND_UNSET_DIM_OBJ_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                /* overloaded element */
                zval_dtor(free_op2.var);
        }
-       ;
 
        ZEND_VM_NEXT_OPCODE();
 }
@@ -22230,7 +22122,7 @@ static int ZEND_UNSET_DIM_OBJ_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int zend_isset_isempty_dim_prop_obj_handler_SPEC_CV_TMP(int prop_dim, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1;
+       
        zval **container = _get_zval_ptr_ptr_cv(&opline->op1, EX(Ts), BP_VAR_IS TSRMLS_CC);
        zval **value = NULL;
        int result = 0;
@@ -22347,8 +22239,6 @@ static int zend_isset_isempty_dim_prop_obj_handler_SPEC_CV_TMP(int prop_dim, ZEN
                        break;
        }
 
-       ;
-
        ZEND_VM_NEXT_OPCODE();
 }
 
@@ -22365,12 +22255,12 @@ static int ZEND_ISSET_ISEMPTY_PROP_OBJ_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_A
 static int ZEND_ADD_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        add_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC),
                _get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC) TSRMLS_CC);
-       ;
+
        if (free_op2.var) {zval_ptr_dtor(&free_op2.var);};
        ZEND_VM_NEXT_OPCODE();
 }
@@ -22378,12 +22268,12 @@ static int ZEND_ADD_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_SUB_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        sub_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC),
                _get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC) TSRMLS_CC);
-       ;
+
        if (free_op2.var) {zval_ptr_dtor(&free_op2.var);};
        ZEND_VM_NEXT_OPCODE();
 }
@@ -22391,12 +22281,12 @@ static int ZEND_SUB_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_MUL_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        mul_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC),
                _get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC) TSRMLS_CC);
-       ;
+
        if (free_op2.var) {zval_ptr_dtor(&free_op2.var);};
        ZEND_VM_NEXT_OPCODE();
 }
@@ -22404,12 +22294,12 @@ static int ZEND_MUL_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_DIV_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        div_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC),
                _get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC) TSRMLS_CC);
-       ;
+
        if (free_op2.var) {zval_ptr_dtor(&free_op2.var);};
        ZEND_VM_NEXT_OPCODE();
 }
@@ -22417,12 +22307,12 @@ static int ZEND_DIV_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_MOD_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        mod_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC),
                _get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC) TSRMLS_CC);
-       ;
+
        if (free_op2.var) {zval_ptr_dtor(&free_op2.var);};
        ZEND_VM_NEXT_OPCODE();
 }
@@ -22430,12 +22320,12 @@ static int ZEND_MOD_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_SL_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        shift_left_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC),
                _get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC) TSRMLS_CC);
-       ;
+
        if (free_op2.var) {zval_ptr_dtor(&free_op2.var);};
        ZEND_VM_NEXT_OPCODE();
 }
@@ -22443,12 +22333,12 @@ static int ZEND_SL_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_SR_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        shift_right_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC),
                _get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC) TSRMLS_CC);
-       ;
+
        if (free_op2.var) {zval_ptr_dtor(&free_op2.var);};
        ZEND_VM_NEXT_OPCODE();
 }
@@ -22456,12 +22346,12 @@ static int ZEND_SR_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_CONCAT_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        concat_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC),
                _get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC) TSRMLS_CC);
-       ;
+
        if (free_op2.var) {zval_ptr_dtor(&free_op2.var);};
        ZEND_VM_NEXT_OPCODE();
 }
@@ -22469,12 +22359,12 @@ static int ZEND_CONCAT_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_IS_IDENTICAL_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        is_identical_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC),
                _get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC) TSRMLS_CC);
-       ;
+
        if (free_op2.var) {zval_ptr_dtor(&free_op2.var);};
        ZEND_VM_NEXT_OPCODE();
 }
@@ -22482,12 +22372,12 @@ static int ZEND_IS_IDENTICAL_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_IS_NOT_IDENTICAL_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        is_not_identical_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC),
                _get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC) TSRMLS_CC);
-       ;
+
        if (free_op2.var) {zval_ptr_dtor(&free_op2.var);};
        ZEND_VM_NEXT_OPCODE();
 }
@@ -22495,12 +22385,12 @@ static int ZEND_IS_NOT_IDENTICAL_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_IS_EQUAL_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        is_equal_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC),
                _get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC) TSRMLS_CC);
-       ;
+
        if (free_op2.var) {zval_ptr_dtor(&free_op2.var);};
        ZEND_VM_NEXT_OPCODE();
 }
@@ -22508,12 +22398,12 @@ static int ZEND_IS_EQUAL_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_IS_NOT_EQUAL_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        is_not_equal_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC),
                _get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC) TSRMLS_CC);
-       ;
+
        if (free_op2.var) {zval_ptr_dtor(&free_op2.var);};
        ZEND_VM_NEXT_OPCODE();
 }
@@ -22521,12 +22411,12 @@ static int ZEND_IS_NOT_EQUAL_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_IS_SMALLER_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        is_smaller_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC),
                _get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC) TSRMLS_CC);
-       ;
+
        if (free_op2.var) {zval_ptr_dtor(&free_op2.var);};
        ZEND_VM_NEXT_OPCODE();
 }
@@ -22534,12 +22424,12 @@ static int ZEND_IS_SMALLER_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_IS_SMALLER_OR_EQUAL_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        is_smaller_or_equal_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC),
                _get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC) TSRMLS_CC);
-       ;
+
        if (free_op2.var) {zval_ptr_dtor(&free_op2.var);};
        ZEND_VM_NEXT_OPCODE();
 }
@@ -22547,12 +22437,12 @@ static int ZEND_IS_SMALLER_OR_EQUAL_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS
 static int ZEND_BW_OR_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        bitwise_or_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC),
                _get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC) TSRMLS_CC);
-       ;
+
        if (free_op2.var) {zval_ptr_dtor(&free_op2.var);};
        ZEND_VM_NEXT_OPCODE();
 }
@@ -22560,12 +22450,12 @@ static int ZEND_BW_OR_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_BW_AND_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        bitwise_and_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC),
                _get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC) TSRMLS_CC);
-       ;
+
        if (free_op2.var) {zval_ptr_dtor(&free_op2.var);};
        ZEND_VM_NEXT_OPCODE();
 }
@@ -22573,12 +22463,12 @@ static int ZEND_BW_AND_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_BW_XOR_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        bitwise_xor_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC),
                _get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC) TSRMLS_CC);
-       ;
+
        if (free_op2.var) {zval_ptr_dtor(&free_op2.var);};
        ZEND_VM_NEXT_OPCODE();
 }
@@ -22586,12 +22476,12 @@ static int ZEND_BW_XOR_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_BOOL_XOR_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        boolean_xor_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC),
                _get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC) TSRMLS_CC);
-       ;
+
        if (free_op2.var) {zval_ptr_dtor(&free_op2.var);};
        ZEND_VM_NEXT_OPCODE();
 }
@@ -22600,7 +22490,7 @@ static int zend_binary_assign_op_obj_helper_SPEC_CV_VAR(int (*binary_op)(zval *r
 {
        zend_op *opline = EX(opline);
        zend_op *op_data = opline+1;
-       zend_free_op free_op1, free_op2, free_op_data1;
+       zend_free_op free_op2, free_op_data1;
        zval **object_ptr = _get_zval_ptr_ptr_cv(&opline->op1, EX(Ts), BP_VAR_W TSRMLS_CC);
        zval *object;
        zval *property = _get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
@@ -22702,7 +22592,6 @@ static int zend_binary_assign_op_obj_helper_SPEC_CV_VAR(int (*binary_op)(zval *r
                FREE_OP(free_op_data1);
        }
 
-       ;
        /* assign_obj has two opcodes! */
        ZEND_VM_INC_OPCODE();
        ZEND_VM_NEXT_OPCODE();
@@ -22758,7 +22647,7 @@ static int zend_binary_assign_op_helper_SPEC_CV_VAR(int (*binary_op)(zval *resul
                        AI_USE_PTR(EX_T(opline->result.u.var).var);
                }
                if (free_op2.var) {zval_ptr_dtor(&free_op2.var);};
-               ;
+
                if (increment_opline) {
                        ZEND_VM_INC_OPCODE();
                }
@@ -22790,7 +22679,7 @@ static int zend_binary_assign_op_helper_SPEC_CV_VAR(int (*binary_op)(zval *resul
                ZEND_VM_INC_OPCODE();
                FREE_OP_VAR_PTR(free_op_data2);
        }
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
@@ -22852,7 +22741,7 @@ static int ZEND_ASSIGN_BW_XOR_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int zend_pre_incdec_property_helper_SPEC_CV_VAR(incdec_t incdec_op, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
        zval **object_ptr = _get_zval_ptr_ptr_cv(&opline->op1, EX(Ts), BP_VAR_W TSRMLS_CC);
        zval *object;
        zval *property = _get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
@@ -22869,7 +22758,7 @@ static int zend_pre_incdec_property_helper_SPEC_CV_VAR(incdec_t incdec_op, ZEND_
                        *retval = EG(uninitialized_zval_ptr);
                        PZVAL_LOCK(*retval);
                }
-               ;
+
                ZEND_VM_NEXT_OPCODE();
        }
 
@@ -22927,7 +22816,7 @@ static int zend_pre_incdec_property_helper_SPEC_CV_VAR(incdec_t incdec_op, ZEND_
        } else {
                if (free_op2.var) {zval_ptr_dtor(&free_op2.var);};
        }
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
@@ -22944,7 +22833,7 @@ static int ZEND_PRE_DEC_OBJ_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int zend_post_incdec_property_helper_SPEC_CV_VAR(incdec_t incdec_op, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
        zval **object_ptr = _get_zval_ptr_ptr_cv(&opline->op1, EX(Ts), BP_VAR_W TSRMLS_CC);
        zval *object;
        zval *property = _get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
@@ -22958,7 +22847,7 @@ static int zend_post_incdec_property_helper_SPEC_CV_VAR(incdec_t incdec_op, ZEND
                zend_error(E_WARNING, "Attempt to increment/decrement property of non-object");
                if (free_op2.var) {zval_ptr_dtor(&free_op2.var);};
                *retval = *EG(uninitialized_zval_ptr);
-               ;
+
                ZEND_VM_NEXT_OPCODE();
        }
 
@@ -23018,7 +22907,7 @@ static int zend_post_incdec_property_helper_SPEC_CV_VAR(incdec_t incdec_op, ZEND
        } else {
                if (free_op2.var) {zval_ptr_dtor(&free_op2.var);};
        }
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
@@ -23035,7 +22924,7 @@ static int ZEND_POST_DEC_OBJ_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_FETCH_DIM_R_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
        zval *dim = _get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
 
        if (opline->extended_value == ZEND_FETCH_ADD_LOCK && IS_CV != IS_CV) {
@@ -23043,63 +22932,63 @@ static int ZEND_FETCH_DIM_R_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        }
        zend_fetch_dimension_address(RETURN_VALUE_UNUSED(&opline->result)?NULL:&EX_T(opline->result.u.var), _get_zval_ptr_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC), dim, 0, BP_VAR_R TSRMLS_CC);
        if (free_op2.var) {zval_ptr_dtor(&free_op2.var);};
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_FETCH_DIM_W_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
        zval *dim = _get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
 
        zend_fetch_dimension_address(RETURN_VALUE_UNUSED(&opline->result)?NULL:&EX_T(opline->result.u.var), _get_zval_ptr_ptr_cv(&opline->op1, EX(Ts), BP_VAR_W TSRMLS_CC), dim, 0, BP_VAR_W TSRMLS_CC);
        if (free_op2.var) {zval_ptr_dtor(&free_op2.var);};
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_FETCH_DIM_RW_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
        zval *dim = _get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
 
        zend_fetch_dimension_address(RETURN_VALUE_UNUSED(&opline->result)?NULL:&EX_T(opline->result.u.var), _get_zval_ptr_ptr_cv(&opline->op1, EX(Ts), BP_VAR_RW TSRMLS_CC), dim, 0, BP_VAR_RW TSRMLS_CC);
        if (free_op2.var) {zval_ptr_dtor(&free_op2.var);};
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_FETCH_DIM_IS_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
        zval *dim = _get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
 
        zend_fetch_dimension_address(RETURN_VALUE_UNUSED(&opline->result)?NULL:&EX_T(opline->result.u.var), _get_zval_ptr_ptr_cv(&opline->op1, EX(Ts), BP_VAR_IS TSRMLS_CC), dim, 0, BP_VAR_IS TSRMLS_CC);
        if (free_op2.var) {zval_ptr_dtor(&free_op2.var);};
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_FETCH_DIM_FUNC_ARG_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
        int type = ARG_SHOULD_BE_SENT_BY_REF(EX(fbc), opline->extended_value)?BP_VAR_W:BP_VAR_R;
        zval *dim = _get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
 
        zend_fetch_dimension_address(RETURN_VALUE_UNUSED(&opline->result)?NULL:&EX_T(opline->result.u.var), _get_zval_ptr_ptr_cv(&opline->op1, EX(Ts), type TSRMLS_CC), dim, 0, type TSRMLS_CC);
        if (free_op2.var) {zval_ptr_dtor(&free_op2.var);};
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_FETCH_DIM_UNSET_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
        zval *dim = _get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
 
        /* Not needed in DIM_UNSET
@@ -23109,7 +22998,7 @@ static int ZEND_FETCH_DIM_UNSET_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        */
        zend_fetch_dimension_address(RETURN_VALUE_UNUSED(&opline->result)?NULL:&EX_T(opline->result.u.var), _get_zval_ptr_ptr_cv(&opline->op1, EX(Ts), BP_VAR_UNSET TSRMLS_CC), dim, 0, BP_VAR_UNSET TSRMLS_CC);
        if (free_op2.var) {zval_ptr_dtor(&free_op2.var);};
-       ;
+
        if (EX_T(opline->result.u.var).var.ptr_ptr == NULL) {
                zend_error_noreturn(E_ERROR, "Cannot unset string offsets");
        } else {
@@ -23130,7 +23019,7 @@ static int zend_fetch_property_address_read_helper_SPEC_CV_VAR(int type, ZEND_OP
        zend_op *opline = EX(opline);
        zval *container;
        zval **retval;
-       zend_free_op free_op1;
+       
 
        retval = &EX_T(opline->result.u.var).var.ptr;
        EX_T(opline->result.u.var).var.ptr_ptr = retval;
@@ -23143,7 +23032,7 @@ static int zend_fetch_property_address_read_helper_SPEC_CV_VAR(int type, ZEND_OP
                        PZVAL_LOCK(*retval);
                        AI_USE_PTR(EX_T(opline->result.u.var).var);
                }
-               ;
+
                ZEND_VM_NEXT_OPCODE();
        }
 
@@ -23179,7 +23068,6 @@ static int zend_fetch_property_address_read_helper_SPEC_CV_VAR(int type, ZEND_OP
                }
        }
 
-       ;
        ZEND_VM_NEXT_OPCODE();
 }
 
@@ -23191,7 +23079,7 @@ static int ZEND_FETCH_OBJ_R_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_FETCH_OBJ_W_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
        zval *property = _get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
 
        if (opline->extended_value == ZEND_FETCH_ADD_LOCK && IS_CV != IS_CV) {
@@ -23208,14 +23096,14 @@ static int ZEND_FETCH_OBJ_W_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        } else {
                if (free_op2.var) {zval_ptr_dtor(&free_op2.var);};
        }
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_FETCH_OBJ_RW_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
        zval *property = _get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
 
        if (0) {
@@ -23227,7 +23115,7 @@ static int ZEND_FETCH_OBJ_RW_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        } else {
                if (free_op2.var) {zval_ptr_dtor(&free_op2.var);};
        }
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
@@ -23242,7 +23130,7 @@ static int ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 
        if (ARG_SHOULD_BE_SENT_BY_REF(EX(fbc), opline->extended_value)) {
                /* Behave like FETCH_OBJ_W */
-               zend_free_op free_op1, free_op2;
+               zend_free_op free_op2;
                zval *property = _get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
 
                if (0) {
@@ -23254,7 +23142,7 @@ static int ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                } else {
                        if (free_op2.var) {zval_ptr_dtor(&free_op2.var);};
                }
-               ;
+
                ZEND_VM_NEXT_OPCODE();
        } else {
                return zend_fetch_property_address_read_helper_SPEC_CV_VAR(BP_VAR_R, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
@@ -23264,7 +23152,7 @@ static int ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_FETCH_OBJ_UNSET_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2, free_res;
+       zend_free_op free_op2, free_res;
        zval *property = _get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
 
        if (0) {
@@ -23276,7 +23164,6 @@ static int ZEND_FETCH_OBJ_UNSET_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        } else {
                if (free_op2.var) {zval_ptr_dtor(&free_op2.var);};
        }
-       ;
 
        PZVAL_UNLOCK(*EX_T(opline->result.u.var).var.ptr_ptr, &free_res);
        if (EX_T(opline->result.u.var).var.ptr_ptr != &EG(uninitialized_zval_ptr)) {
@@ -23291,11 +23178,11 @@ static int ZEND_ASSIGN_OBJ_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
        zend_op *op_data = opline+1;
-       zend_free_op free_op1;
+       
        zval **object_ptr = _get_zval_ptr_ptr_cv(&opline->op1, EX(Ts), BP_VAR_W TSRMLS_CC);
 
        zend_assign_to_object(&opline->result, object_ptr, &opline->op2, &op_data->op1, EX(Ts), ZEND_ASSIGN_OBJ TSRMLS_CC);
-       ;
+
        /* assign_obj has two opcodes! */
        ZEND_VM_INC_OPCODE();
        ZEND_VM_NEXT_OPCODE();
@@ -23305,7 +23192,7 @@ static int ZEND_ASSIGN_DIM_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
        zend_op *op_data = opline+1;
-       zend_free_op free_op1;
+       
        zval **object_ptr;
 
        if (IS_CV == IS_CV || EX_T(opline->op1.u.var).var.ptr_ptr) {
@@ -23329,7 +23216,7 @@ static int ZEND_ASSIGN_DIM_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                zend_assign_to_variable(&opline->result, &op_data->op2, &op_data->op1, value, (IS_TMP_FREE(free_op_data1)?IS_TMP_VAR:op_data->op1.op_type), EX(Ts) TSRMLS_CC);
                FREE_OP_IF_VAR(free_op_data1);
        }
-       ;
+
        /* assign_dim has two opcodes! */
        ZEND_VM_INC_OPCODE();
        ZEND_VM_NEXT_OPCODE();
@@ -23351,7 +23238,7 @@ static int ZEND_ASSIGN_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_ASSIGN_REF_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
        zval **variable_ptr_ptr;
        zval **value_ptr_ptr = _get_zval_ptr_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
 
@@ -23375,7 +23262,6 @@ static int ZEND_ASSIGN_REF_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                AI_USE_PTR(EX_T(opline->result.u.var).var);
        }
 
-       ;
        if (free_op2.var) {zval_ptr_dtor(&free_op2.var);};
 
        ZEND_VM_NEXT_OPCODE();
@@ -23387,7 +23273,7 @@ static int ZEND_INIT_METHOD_CALL_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        zval *function_name;
        char *function_name_strval;
        int function_name_strlen;
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        zend_ptr_stack_3_push(&EG(arg_types_stack), EX(fbc), EX(object), EX(calling_scope));
 
@@ -23439,7 +23325,6 @@ static int ZEND_INIT_METHOD_CALL_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        }
 
        if (free_op2.var) {zval_ptr_dtor(&free_op2.var);};
-       ;
 
        ZEND_VM_NEXT_OPCODE();
 }
@@ -23448,7 +23333,7 @@ static int ZEND_CASE_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
        int switch_expr_is_overloaded=0;
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
 
        if (IS_CV==IS_VAR) {
                if (EX_T(opline->op1.u.var).var.ptr_ptr) {
@@ -23469,7 +23354,7 @@ static int ZEND_CASE_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                 * other CASE opcodes (whereas string offsets
                 * are allocated at each get_zval_ptr())
                 */
-               ;
+
                EX_T(opline->op1.u.var).var.ptr_ptr = NULL;
                AI_USE_PTR(EX_T(opline->op1.u.var).var);
        }
@@ -23479,7 +23364,7 @@ static int ZEND_CASE_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_ADD_ARRAY_ELEMENT_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
        zval *array_ptr = &EX_T(opline->result.u.var).tmp_var;
        zval *expr_ptr, **expr_ptr_ptr = NULL;
        zval *offset=_get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
@@ -23545,9 +23430,9 @@ static int ZEND_ADD_ARRAY_ELEMENT_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                zend_hash_next_index_insert(array_ptr->value.ht, &expr_ptr, sizeof(zval *), NULL);
        }
        if (opline->extended_value) {
-               ;
+
        } else {
-               ;
+
        }
        ZEND_VM_NEXT_OPCODE();
 }
@@ -23560,7 +23445,7 @@ static int ZEND_INIT_ARRAY_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_UNSET_DIM_OBJ_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
        zval **container = _get_zval_ptr_ptr_cv(&opline->op1, EX(Ts), BP_VAR_UNSET TSRMLS_CC);
        zval *offset = _get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
        long index;
@@ -23658,7 +23543,6 @@ static int ZEND_UNSET_DIM_OBJ_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                /* overloaded element */
                if (free_op2.var) {zval_ptr_dtor(&free_op2.var);};
        }
-       ;
 
        ZEND_VM_NEXT_OPCODE();
 }
@@ -23666,7 +23550,7 @@ static int ZEND_UNSET_DIM_OBJ_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int zend_isset_isempty_dim_prop_obj_handler_SPEC_CV_VAR(int prop_dim, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1;
+       
        zval **container = _get_zval_ptr_ptr_cv(&opline->op1, EX(Ts), BP_VAR_IS TSRMLS_CC);
        zval **value = NULL;
        int result = 0;
@@ -23783,8 +23667,6 @@ static int zend_isset_isempty_dim_prop_obj_handler_SPEC_CV_VAR(int prop_dim, ZEN
                        break;
        }
 
-       ;
-
        ZEND_VM_NEXT_OPCODE();
 }
 
@@ -23802,7 +23684,7 @@ static int zend_binary_assign_op_obj_helper_SPEC_CV_UNUSED(int (*binary_op)(zval
 {
        zend_op *opline = EX(opline);
        zend_op *op_data = opline+1;
-       zend_free_op free_op1, free_op2, free_op_data1;
+       zend_free_op free_op_data1;
        zval **object_ptr = _get_zval_ptr_ptr_cv(&opline->op1, EX(Ts), BP_VAR_W TSRMLS_CC);
        zval *object;
        zval *property = NULL;
@@ -23817,7 +23699,7 @@ static int zend_binary_assign_op_obj_helper_SPEC_CV_UNUSED(int (*binary_op)(zval
 
        if (object->type != IS_OBJECT) {
                zend_error(E_WARNING, "Attempt to assign property of non-object");
-               ;
+
                FREE_OP(free_op_data1);
 
                if (!RETURN_VALUE_UNUSED(result)) {
@@ -23899,12 +23781,11 @@ static int zend_binary_assign_op_obj_helper_SPEC_CV_UNUSED(int (*binary_op)(zval
                if (0) {
                        zval_ptr_dtor(&property);
                } else {
-                       ;
+
                }
                FREE_OP(free_op_data1);
        }
 
-       ;
        /* assign_obj has two opcodes! */
        ZEND_VM_INC_OPCODE();
        ZEND_VM_NEXT_OPCODE();
@@ -23913,7 +23794,7 @@ static int zend_binary_assign_op_obj_helper_SPEC_CV_UNUSED(int (*binary_op)(zval
 static int zend_binary_assign_op_helper_SPEC_CV_UNUSED(int (*binary_op)(zval *result, zval *op1, zval *op2 TSRMLS_DC), ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2, free_op_data2, free_op_data1;
+       zend_free_op free_op1, free_op_data2, free_op_data1;
        zval **var_ptr;
        zval *value;
        zend_bool increment_opline = 0;
@@ -23959,8 +23840,8 @@ static int zend_binary_assign_op_helper_SPEC_CV_UNUSED(int (*binary_op)(zval *re
                        PZVAL_LOCK(*EX_T(opline->result.u.var).var.ptr_ptr);
                        AI_USE_PTR(EX_T(opline->result.u.var).var);
                }
-               ;
-               ;
+
+
                if (increment_opline) {
                        ZEND_VM_INC_OPCODE();
                }
@@ -23986,13 +23867,12 @@ static int zend_binary_assign_op_helper_SPEC_CV_UNUSED(int (*binary_op)(zval *re
                PZVAL_LOCK(*var_ptr);
                AI_USE_PTR(EX_T(opline->result.u.var).var);
        }
-       ;
 
        if (increment_opline) {
                ZEND_VM_INC_OPCODE();
                FREE_OP_VAR_PTR(free_op_data2);
        }
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
@@ -24054,12 +23934,12 @@ static int ZEND_ASSIGN_BW_XOR_SPEC_CV_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_FETCH_DIM_W_SPEC_CV_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
        zval *dim = NULL;
 
        zend_fetch_dimension_address(RETURN_VALUE_UNUSED(&opline->result)?NULL:&EX_T(opline->result.u.var), _get_zval_ptr_ptr_cv(&opline->op1, EX(Ts), BP_VAR_W TSRMLS_CC), dim, 0, BP_VAR_W TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
@@ -24067,7 +23947,7 @@ static int ZEND_ASSIGN_DIM_SPEC_CV_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
        zend_op *op_data = opline+1;
-       zend_free_op free_op1;
+       
        zval **object_ptr;
 
        if (IS_CV == IS_CV || EX_T(opline->op1.u.var).var.ptr_ptr) {
@@ -24080,18 +23960,17 @@ static int ZEND_ASSIGN_DIM_SPEC_CV_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        if (object_ptr && (*object_ptr)->type == IS_OBJECT) {
                zend_assign_to_object(&opline->result, object_ptr, &opline->op2, &op_data->op1, EX(Ts), ZEND_ASSIGN_DIM TSRMLS_CC);
        } else {
-               zend_free_op free_op2, free_op_data1;
+               zend_free_op free_op_data1;
                zval *value;
                zval *dim = NULL;
 
                zend_fetch_dimension_address(&EX_T(op_data->op2.u.var), object_ptr, dim, 0, BP_VAR_W TSRMLS_CC);
-               ;
 
                value = get_zval_ptr(&op_data->op1, EX(Ts), &free_op_data1, BP_VAR_R);
                zend_assign_to_variable(&opline->result, &op_data->op2, &op_data->op1, value, (IS_TMP_FREE(free_op_data1)?IS_TMP_VAR:op_data->op1.op_type), EX(Ts) TSRMLS_CC);
                FREE_OP_IF_VAR(free_op_data1);
        }
-       ;
+
        /* assign_dim has two opcodes! */
        ZEND_VM_INC_OPCODE();
        ZEND_VM_NEXT_OPCODE();
@@ -24100,7 +23979,7 @@ static int ZEND_ASSIGN_DIM_SPEC_CV_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_ADD_ARRAY_ELEMENT_SPEC_CV_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
        zval *array_ptr = &EX_T(opline->result.u.var).tmp_var;
        zval *expr_ptr, **expr_ptr_ptr = NULL;
        zval *offset=NULL;
@@ -24161,14 +24040,14 @@ static int ZEND_ADD_ARRAY_ELEMENT_SPEC_CV_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARG
                                /* do nothing */
                                break;
                }
-               ;
+
        } else {
                zend_hash_next_index_insert(array_ptr->value.ht, &expr_ptr, sizeof(zval *), NULL);
        }
        if (opline->extended_value) {
-               ;
+
        } else {
-               ;
+
        }
        ZEND_VM_NEXT_OPCODE();
 }
@@ -24181,234 +24060,234 @@ static int ZEND_INIT_ARRAY_SPEC_CV_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_ADD_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
 
        add_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC),
                _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_SUB_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
 
        sub_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC),
                _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_MUL_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
 
        mul_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC),
                _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_DIV_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
 
        div_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC),
                _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_MOD_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
 
        mod_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC),
                _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_SL_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
 
        shift_left_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC),
                _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_SR_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
 
        shift_right_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC),
                _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_CONCAT_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
 
        concat_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC),
                _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_IS_IDENTICAL_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
 
        is_identical_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC),
                _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_IS_NOT_IDENTICAL_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
 
        is_not_identical_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC),
                _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_IS_EQUAL_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
 
        is_equal_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC),
                _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_IS_NOT_EQUAL_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
 
        is_not_equal_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC),
                _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_IS_SMALLER_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
 
        is_smaller_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC),
                _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_IS_SMALLER_OR_EQUAL_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
 
        is_smaller_or_equal_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC),
                _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_BW_OR_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
 
        bitwise_or_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC),
                _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_BW_AND_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
 
        bitwise_and_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC),
                _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_BW_XOR_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
 
        bitwise_xor_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC),
                _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_BOOL_XOR_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
 
        boolean_xor_function(&EX_T(opline->result.u.var).tmp_var,
                _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC),
                _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
@@ -24416,7 +24295,7 @@ static int zend_binary_assign_op_obj_helper_SPEC_CV_CV(int (*binary_op)(zval *re
 {
        zend_op *opline = EX(opline);
        zend_op *op_data = opline+1;
-       zend_free_op free_op1, free_op2, free_op_data1;
+       zend_free_op free_op_data1;
        zval **object_ptr = _get_zval_ptr_ptr_cv(&opline->op1, EX(Ts), BP_VAR_W TSRMLS_CC);
        zval *object;
        zval *property = _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC);
@@ -24431,7 +24310,7 @@ static int zend_binary_assign_op_obj_helper_SPEC_CV_CV(int (*binary_op)(zval *re
 
        if (object->type != IS_OBJECT) {
                zend_error(E_WARNING, "Attempt to assign property of non-object");
-               ;
+
                FREE_OP(free_op_data1);
 
                if (!RETURN_VALUE_UNUSED(result)) {
@@ -24513,12 +24392,11 @@ static int zend_binary_assign_op_obj_helper_SPEC_CV_CV(int (*binary_op)(zval *re
                if (0) {
                        zval_ptr_dtor(&property);
                } else {
-                       ;
+
                }
                FREE_OP(free_op_data1);
        }
 
-       ;
        /* assign_obj has two opcodes! */
        ZEND_VM_INC_OPCODE();
        ZEND_VM_NEXT_OPCODE();
@@ -24527,7 +24405,7 @@ static int zend_binary_assign_op_obj_helper_SPEC_CV_CV(int (*binary_op)(zval *re
 static int zend_binary_assign_op_helper_SPEC_CV_CV(int (*binary_op)(zval *result, zval *op1, zval *op2 TSRMLS_DC), ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2, free_op_data2, free_op_data1;
+       zend_free_op free_op1, free_op_data2, free_op_data1;
        zval **var_ptr;
        zval *value;
        zend_bool increment_opline = 0;
@@ -24573,8 +24451,8 @@ static int zend_binary_assign_op_helper_SPEC_CV_CV(int (*binary_op)(zval *result
                        PZVAL_LOCK(*EX_T(opline->result.u.var).var.ptr_ptr);
                        AI_USE_PTR(EX_T(opline->result.u.var).var);
                }
-               ;
-               ;
+
+
                if (increment_opline) {
                        ZEND_VM_INC_OPCODE();
                }
@@ -24600,13 +24478,12 @@ static int zend_binary_assign_op_helper_SPEC_CV_CV(int (*binary_op)(zval *result
                PZVAL_LOCK(*var_ptr);
                AI_USE_PTR(EX_T(opline->result.u.var).var);
        }
-       ;
 
        if (increment_opline) {
                ZEND_VM_INC_OPCODE();
                FREE_OP_VAR_PTR(free_op_data2);
        }
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
@@ -24668,7 +24545,7 @@ static int ZEND_ASSIGN_BW_XOR_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int zend_pre_incdec_property_helper_SPEC_CV_CV(incdec_t incdec_op, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
        zval **object_ptr = _get_zval_ptr_ptr_cv(&opline->op1, EX(Ts), BP_VAR_W TSRMLS_CC);
        zval *object;
        zval *property = _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC);
@@ -24680,12 +24557,12 @@ static int zend_pre_incdec_property_helper_SPEC_CV_CV(incdec_t incdec_op, ZEND_O
 
        if (object->type != IS_OBJECT) {
                zend_error(E_WARNING, "Attempt to increment/decrement property of non-object");
-               ;
+
                if (!RETURN_VALUE_UNUSED(&opline->result)) {
                        *retval = EG(uninitialized_zval_ptr);
                        PZVAL_LOCK(*retval);
                }
-               ;
+
                ZEND_VM_NEXT_OPCODE();
        }
 
@@ -24741,9 +24618,9 @@ static int zend_pre_incdec_property_helper_SPEC_CV_CV(incdec_t incdec_op, ZEND_O
        if (0) {
                zval_ptr_dtor(&property);
        } else {
-               ;
+
        }
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
@@ -24760,7 +24637,7 @@ static int ZEND_PRE_DEC_OBJ_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int zend_post_incdec_property_helper_SPEC_CV_CV(incdec_t incdec_op, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
        zval **object_ptr = _get_zval_ptr_ptr_cv(&opline->op1, EX(Ts), BP_VAR_W TSRMLS_CC);
        zval *object;
        zval *property = _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC);
@@ -24772,9 +24649,9 @@ static int zend_post_incdec_property_helper_SPEC_CV_CV(incdec_t incdec_op, ZEND_
 
        if (object->type != IS_OBJECT) {
                zend_error(E_WARNING, "Attempt to increment/decrement property of non-object");
-               ;
+
                *retval = *EG(uninitialized_zval_ptr);
-               ;
+
                ZEND_VM_NEXT_OPCODE();
        }
 
@@ -24832,9 +24709,9 @@ static int zend_post_incdec_property_helper_SPEC_CV_CV(incdec_t incdec_op, ZEND_
        if (0) {
                zval_ptr_dtor(&property);
        } else {
-               ;
+
        }
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
@@ -24851,71 +24728,71 @@ static int ZEND_POST_DEC_OBJ_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_FETCH_DIM_R_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
        zval *dim = _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC);
 
        if (opline->extended_value == ZEND_FETCH_ADD_LOCK && IS_CV != IS_CV) {
                PZVAL_LOCK(*EX_T(opline->op1.u.var).var.ptr_ptr);
        }
        zend_fetch_dimension_address(RETURN_VALUE_UNUSED(&opline->result)?NULL:&EX_T(opline->result.u.var), _get_zval_ptr_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC), dim, 0, BP_VAR_R TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_FETCH_DIM_W_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
        zval *dim = _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC);
 
        zend_fetch_dimension_address(RETURN_VALUE_UNUSED(&opline->result)?NULL:&EX_T(opline->result.u.var), _get_zval_ptr_ptr_cv(&opline->op1, EX(Ts), BP_VAR_W TSRMLS_CC), dim, 0, BP_VAR_W TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_FETCH_DIM_RW_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
        zval *dim = _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC);
 
        zend_fetch_dimension_address(RETURN_VALUE_UNUSED(&opline->result)?NULL:&EX_T(opline->result.u.var), _get_zval_ptr_ptr_cv(&opline->op1, EX(Ts), BP_VAR_RW TSRMLS_CC), dim, 0, BP_VAR_RW TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_FETCH_DIM_IS_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
        zval *dim = _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC);
 
        zend_fetch_dimension_address(RETURN_VALUE_UNUSED(&opline->result)?NULL:&EX_T(opline->result.u.var), _get_zval_ptr_ptr_cv(&opline->op1, EX(Ts), BP_VAR_IS TSRMLS_CC), dim, 0, BP_VAR_IS TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_FETCH_DIM_FUNC_ARG_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
        int type = ARG_SHOULD_BE_SENT_BY_REF(EX(fbc), opline->extended_value)?BP_VAR_W:BP_VAR_R;
        zval *dim = _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC);
 
        zend_fetch_dimension_address(RETURN_VALUE_UNUSED(&opline->result)?NULL:&EX_T(opline->result.u.var), _get_zval_ptr_ptr_cv(&opline->op1, EX(Ts), type TSRMLS_CC), dim, 0, type TSRMLS_CC);
-       ;
-       ;
+
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_FETCH_DIM_UNSET_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
        zval *dim = _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC);
 
        /* Not needed in DIM_UNSET
@@ -24924,8 +24801,8 @@ static int ZEND_FETCH_DIM_UNSET_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        }
        */
        zend_fetch_dimension_address(RETURN_VALUE_UNUSED(&opline->result)?NULL:&EX_T(opline->result.u.var), _get_zval_ptr_ptr_cv(&opline->op1, EX(Ts), BP_VAR_UNSET TSRMLS_CC), dim, 0, BP_VAR_UNSET TSRMLS_CC);
-       ;
-       ;
+
+
        if (EX_T(opline->result.u.var).var.ptr_ptr == NULL) {
                zend_error_noreturn(E_ERROR, "Cannot unset string offsets");
        } else {
@@ -24946,7 +24823,7 @@ static int zend_fetch_property_address_read_helper_SPEC_CV_CV(int type, ZEND_OPC
        zend_op *opline = EX(opline);
        zval *container;
        zval **retval;
-       zend_free_op free_op1;
+       
 
        retval = &EX_T(opline->result.u.var).var.ptr;
        EX_T(opline->result.u.var).var.ptr_ptr = retval;
@@ -24959,7 +24836,7 @@ static int zend_fetch_property_address_read_helper_SPEC_CV_CV(int type, ZEND_OPC
                        PZVAL_LOCK(*retval);
                        AI_USE_PTR(EX_T(opline->result.u.var).var);
                }
-               ;
+
                ZEND_VM_NEXT_OPCODE();
        }
 
@@ -24970,7 +24847,7 @@ static int zend_fetch_property_address_read_helper_SPEC_CV_CV(int type, ZEND_OPC
                SELECTIVE_PZVAL_LOCK(*retval, &opline->result);
                AI_USE_PTR(EX_T(opline->result.u.var).var);
        } else {
-               zend_free_op free_op2;
+               
                zval *offset  = _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC);
 
                if (0) {
@@ -24991,11 +24868,10 @@ static int zend_fetch_property_address_read_helper_SPEC_CV_CV(int type, ZEND_OPC
                if (0) {
                        zval_ptr_dtor(&offset);
                } else {
-                       ;
+
                }
        }
 
-       ;
        ZEND_VM_NEXT_OPCODE();
 }
 
@@ -25007,7 +24883,7 @@ static int ZEND_FETCH_OBJ_R_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_FETCH_OBJ_W_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
        zval *property = _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC);
 
        if (opline->extended_value == ZEND_FETCH_ADD_LOCK && IS_CV != IS_CV) {
@@ -25022,16 +24898,16 @@ static int ZEND_FETCH_OBJ_W_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        if (0) {
                zval_ptr_dtor(&property);
        } else {
-               ;
+
        }
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
 static int ZEND_FETCH_OBJ_RW_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
        zval *property = _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC);
 
        if (0) {
@@ -25041,9 +24917,9 @@ static int ZEND_FETCH_OBJ_RW_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        if (0) {
                zval_ptr_dtor(&property);
        } else {
-               ;
+
        }
-       ;
+
        ZEND_VM_NEXT_OPCODE();
 }
 
@@ -25058,7 +24934,7 @@ static int ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 
        if (ARG_SHOULD_BE_SENT_BY_REF(EX(fbc), opline->extended_value)) {
                /* Behave like FETCH_OBJ_W */
-               zend_free_op free_op1, free_op2;
+               
                zval *property = _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC);
 
                if (0) {
@@ -25068,9 +24944,9 @@ static int ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                if (0) {
                        zval_ptr_dtor(&property);
                } else {
-                       ;
+
                }
-               ;
+
                ZEND_VM_NEXT_OPCODE();
        } else {
                return zend_fetch_property_address_read_helper_SPEC_CV_CV(BP_VAR_R, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
@@ -25080,7 +24956,7 @@ static int ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_FETCH_OBJ_UNSET_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2, free_res;
+       zend_free_op free_res;
        zval *property = _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC);
 
        if (0) {
@@ -25090,9 +24966,8 @@ static int ZEND_FETCH_OBJ_UNSET_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        if (0) {
                zval_ptr_dtor(&property);
        } else {
-               ;
+
        }
-       ;
 
        PZVAL_UNLOCK(*EX_T(opline->result.u.var).var.ptr_ptr, &free_res);
        if (EX_T(opline->result.u.var).var.ptr_ptr != &EG(uninitialized_zval_ptr)) {
@@ -25107,11 +24982,11 @@ static int ZEND_ASSIGN_OBJ_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
        zend_op *op_data = opline+1;
-       zend_free_op free_op1;
+       
        zval **object_ptr = _get_zval_ptr_ptr_cv(&opline->op1, EX(Ts), BP_VAR_W TSRMLS_CC);
 
        zend_assign_to_object(&opline->result, object_ptr, &opline->op2, &op_data->op1, EX(Ts), ZEND_ASSIGN_OBJ TSRMLS_CC);
-       ;
+
        /* assign_obj has two opcodes! */
        ZEND_VM_INC_OPCODE();
        ZEND_VM_NEXT_OPCODE();
@@ -25121,7 +24996,7 @@ static int ZEND_ASSIGN_DIM_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
        zend_op *op_data = opline+1;
-       zend_free_op free_op1;
+       
        zval **object_ptr;
 
        if (IS_CV == IS_CV || EX_T(opline->op1.u.var).var.ptr_ptr) {
@@ -25134,18 +25009,17 @@ static int ZEND_ASSIGN_DIM_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        if (object_ptr && (*object_ptr)->type == IS_OBJECT) {
                zend_assign_to_object(&opline->result, object_ptr, &opline->op2, &op_data->op1, EX(Ts), ZEND_ASSIGN_DIM TSRMLS_CC);
        } else {
-               zend_free_op free_op2, free_op_data1;
+               zend_free_op free_op_data1;
                zval *value;
                zval *dim = _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC);
 
                zend_fetch_dimension_address(&EX_T(op_data->op2.u.var), object_ptr, dim, 0, BP_VAR_W TSRMLS_CC);
-               ;
 
                value = get_zval_ptr(&op_data->op1, EX(Ts), &free_op_data1, BP_VAR_R);
                zend_assign_to_variable(&opline->result, &op_data->op2, &op_data->op1, value, (IS_TMP_FREE(free_op_data1)?IS_TMP_VAR:op_data->op1.op_type), EX(Ts) TSRMLS_CC);
                FREE_OP_IF_VAR(free_op_data1);
        }
-       ;
+
        /* assign_dim has two opcodes! */
        ZEND_VM_INC_OPCODE();
        ZEND_VM_NEXT_OPCODE();
@@ -25154,12 +25028,11 @@ static int ZEND_ASSIGN_DIM_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_ASSIGN_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op2;
+       
        zval *value = _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC);
 
        zend_assign_to_variable(&opline->result, &opline->op1, &opline->op2, value, (0?IS_TMP_VAR:IS_CV), EX(Ts) TSRMLS_CC);
        /* zend_assign_to_variable() always takes care of op2, never free it! */
-       ;
 
        ZEND_VM_NEXT_OPCODE();
 }
@@ -25167,7 +25040,7 @@ static int ZEND_ASSIGN_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_ASSIGN_REF_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       zend_free_op free_op2;
        zval **variable_ptr_ptr;
        zval **value_ptr_ptr = _get_zval_ptr_ptr_cv(&opline->op2, EX(Ts), BP_VAR_W TSRMLS_CC);
 
@@ -25191,8 +25064,6 @@ static int ZEND_ASSIGN_REF_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                AI_USE_PTR(EX_T(opline->result.u.var).var);
        }
 
-       ;
-       ;
 
        ZEND_VM_NEXT_OPCODE();
 }
@@ -25203,7 +25074,7 @@ static int ZEND_INIT_METHOD_CALL_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        zval *function_name;
        char *function_name_strval;
        int function_name_strlen;
-       zend_free_op free_op1, free_op2;
+       
 
        zend_ptr_stack_3_push(&EG(arg_types_stack), EX(fbc), EX(object), EX(calling_scope));
 
@@ -25254,8 +25125,6 @@ static int ZEND_INIT_METHOD_CALL_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                EX(calling_scope) = NULL;
        }
 
-       ;
-       ;
 
        ZEND_VM_NEXT_OPCODE();
 }
@@ -25264,7 +25133,7 @@ static int ZEND_CASE_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
        int switch_expr_is_overloaded=0;
-       zend_free_op free_op1, free_op2;
+       
 
        if (IS_CV==IS_VAR) {
                if (EX_T(opline->op1.u.var).var.ptr_ptr) {
@@ -25278,14 +25147,13 @@ static int ZEND_CASE_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                                 _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC),
                                 _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC) TSRMLS_CC);
 
-       ;
        if (switch_expr_is_overloaded) {
                /* We only free op1 if this is a string offset,
                 * Since if it is a TMP_VAR, it'll be reused by
                 * other CASE opcodes (whereas string offsets
                 * are allocated at each get_zval_ptr())
                 */
-               ;
+
                EX_T(opline->op1.u.var).var.ptr_ptr = NULL;
                AI_USE_PTR(EX_T(opline->op1.u.var).var);
        }
@@ -25295,7 +25163,7 @@ static int ZEND_CASE_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_ADD_ARRAY_ELEMENT_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
        zval *array_ptr = &EX_T(opline->result.u.var).tmp_var;
        zval *expr_ptr, **expr_ptr_ptr = NULL;
        zval *offset=_get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC);
@@ -25356,14 +25224,14 @@ static int ZEND_ADD_ARRAY_ELEMENT_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                                /* do nothing */
                                break;
                }
-               ;
+
        } else {
                zend_hash_next_index_insert(array_ptr->value.ht, &expr_ptr, sizeof(zval *), NULL);
        }
        if (opline->extended_value) {
-               ;
+
        } else {
-               ;
+
        }
        ZEND_VM_NEXT_OPCODE();
 }
@@ -25376,7 +25244,7 @@ static int ZEND_INIT_ARRAY_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_UNSET_DIM_OBJ_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
+       
        zval **container = _get_zval_ptr_ptr_cv(&opline->op1, EX(Ts), BP_VAR_UNSET TSRMLS_CC);
        zval *offset = _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC);
        long index;
@@ -25433,7 +25301,7 @@ static int ZEND_UNSET_DIM_OBJ_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                                                        zend_error(E_WARNING, "Illegal offset type in unset");
                                                        break;
                                        }
-                                       ;
+
                                        break;
                                }
                                case IS_OBJECT:
@@ -25447,14 +25315,14 @@ static int ZEND_UNSET_DIM_OBJ_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                                        if (0) {
                                                zval_ptr_dtor(&offset);
                                        } else {
-                                               ;
+
                                        }
                                        break;
                                case IS_STRING:
                                        zend_error_noreturn(E_ERROR, "Cannot unset string offsets");
                                        ZEND_VM_CONTINUE(); /* bailed out before */
                                default:
-                                       ;
+
                                        break;
                        }
                } else { /* ZEND_UNSET_OBJ */
@@ -25466,15 +25334,14 @@ static int ZEND_UNSET_DIM_OBJ_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                                if (0) {
                                        zval_ptr_dtor(&offset);
                                } else {
-                                       ;
+
                                }
                        }
                }
        } else {
                /* overloaded element */
-               ;
+
        }
-       ;
 
        ZEND_VM_NEXT_OPCODE();
 }
@@ -25482,14 +25349,14 @@ static int ZEND_UNSET_DIM_OBJ_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int zend_isset_isempty_dim_prop_obj_handler_SPEC_CV_CV(int prop_dim, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
-       zend_free_op free_op1;
+       
        zval **container = _get_zval_ptr_ptr_cv(&opline->op1, EX(Ts), BP_VAR_IS TSRMLS_CC);
        zval **value = NULL;
        int result = 0;
        long index;
 
        if (container) {
-               zend_free_op free_op2;
+               
                zval *offset = _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC);
 
                if ((*container)->type == IS_ARRAY) {
@@ -25544,7 +25411,7 @@ static int zend_isset_isempty_dim_prop_obj_handler_SPEC_CV_CV(int prop_dim, ZEND
                                        }
                                        break;
                        }
-                       ;
+
                } else if ((*container)->type == IS_OBJECT) {
                        if (0) {
                                MAKE_REAL_ZVAL_PTR(offset);
@@ -25557,7 +25424,7 @@ static int zend_isset_isempty_dim_prop_obj_handler_SPEC_CV_CV(int prop_dim, ZEND
                        if (0) {
                                zval_ptr_dtor(&offset);
                        } else {
-                               ;
+
                        }
                } else if ((*container)->type == IS_STRING && !prop_dim) { /* string offsets */
                        zval tmp;
@@ -25582,9 +25449,9 @@ static int zend_isset_isempty_dim_prop_obj_handler_SPEC_CV_CV(int prop_dim, ZEND
                                                break;
                                }
                        }
-                       ;
+
                } else {
-                       ;
+
                }
        }
 
@@ -25599,8 +25466,6 @@ static int zend_isset_isempty_dim_prop_obj_handler_SPEC_CV_CV(int prop_dim, ZEND
                        break;
        }
 
-       ;
-
        ZEND_VM_NEXT_OPCODE();
 }
 
@@ -29403,3824 +29268,8 @@ void zend_init_opcodes_handlers()
   };
   zend_opcode_handlers = (opcode_handler_t*)labels;
 }
-
-/* Old executor */
-
-#undef EX
-#define EX(element) execute_data.element
-
-#undef ZEND_VM_CONTINUE
-
-#undef ZEND_VM_RETURN
-
-#undef ZEND_VM_DISPATCH
-
-#undef ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_INTERNAL
-
-static opcode_handler_t zend_vm_get_opcode_handler(zend_uchar opcode, zend_op* op);
-
-
-#define ZEND_VM_CONTINUE()   return 0
-#define ZEND_VM_RETURN()     return 1
-#define ZEND_VM_DISPATCH(op) return zend_vm_get_opcode_handler(op->opcode, op)(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
-
-#define ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_INTERNAL execute_data TSRMLS_CC
-
-ZEND_API void old_execute(zend_op_array *op_array TSRMLS_DC)
-{
-       zend_execute_data execute_data;
-
-
-       /* Initialize execute_data */
-       EX(fbc) = NULL;
-       EX(object) = NULL;
-       if (op_array->T < TEMP_VAR_STACK_LIMIT) {
-               EX(Ts) = (temp_variable *) do_alloca(sizeof(temp_variable) * op_array->T);
-       } else {
-               EX(Ts) = (temp_variable *) safe_emalloc(sizeof(temp_variable), op_array->T, 0);
-       }
-       EX(CVs) = (zval***)do_alloca(sizeof(zval**) * op_array->last_var);
-       memset(EX(CVs), 0, sizeof(zval**) * op_array->last_var);
-       EX(op_array) = op_array;
-       EX(original_in_execution) = EG(in_execution);
-       EX(symbol_table) = EG(active_symbol_table);
-       EX(prev_execute_data) = EG(current_execute_data);
-       EG(current_execute_data) = &execute_data;
-
-       EG(in_execution) = 1;
-       if (op_array->start_op) {
-               ZEND_VM_SET_OPCODE(op_array->start_op);
-       } else {
-               ZEND_VM_SET_OPCODE(op_array->opcodes);
-       }
-
-       if (op_array->uses_this && EG(This)) {
-               EG(This)->refcount++; /* For $this pointer */
-               if (zend_hash_add(EG(active_symbol_table), "this", sizeof("this"), &EG(This), sizeof(zval *), NULL)==FAILURE) {
-                       EG(This)->refcount--;
-               }
-       }
-
-       EG(opline_ptr) = &EX(opline);
-
-       EX(function_state).function = (zend_function *) op_array;
-       EG(function_state_ptr) = &EX(function_state);
-#if ZEND_DEBUG
-       /* function_state.function_symbol_table is saved as-is to a stack,
-        * which is an intentional UMR.  Shut it up if we're in DEBUG.
-        */
-       EX(function_state).function_symbol_table = NULL;
-#endif
-       
-       while (1) {
-#ifdef ZEND_WIN32
-               if (EG(timed_out)) {
-                       zend_timeout(0);
-               }
-#endif
-
-               if (EX(opline)->handler(&execute_data TSRMLS_CC) > 0) {
-      return;
-               }
-
-       }
-       zend_error_noreturn(E_ERROR, "Arrived at end of main loop which shouldn't happen");
-}
-
-#undef EX
-#define EX(element) execute_data->element
-
-static int ZEND_ADD_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
-
-       add_function(&EX_T(opline->result.u.var).tmp_var,
-               get_zval_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_R),
-               get_zval_ptr(&opline->op2, EX(Ts), &free_op2, BP_VAR_R) TSRMLS_CC);
-       FREE_OP(free_op1);
-       FREE_OP(free_op2);
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_SUB_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
+static opcode_handler_t zend_vm_get_opcode_handler(zend_uchar opcode, zend_op* op)
 {
-       zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
-
-       sub_function(&EX_T(opline->result.u.var).tmp_var,
-               get_zval_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_R),
-               get_zval_ptr(&opline->op2, EX(Ts), &free_op2, BP_VAR_R) TSRMLS_CC);
-       FREE_OP(free_op1);
-       FREE_OP(free_op2);
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_MUL_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
-
-       mul_function(&EX_T(opline->result.u.var).tmp_var,
-               get_zval_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_R),
-               get_zval_ptr(&opline->op2, EX(Ts), &free_op2, BP_VAR_R) TSRMLS_CC);
-       FREE_OP(free_op1);
-       FREE_OP(free_op2);
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_DIV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
-
-       div_function(&EX_T(opline->result.u.var).tmp_var,
-               get_zval_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_R),
-               get_zval_ptr(&opline->op2, EX(Ts), &free_op2, BP_VAR_R) TSRMLS_CC);
-       FREE_OP(free_op1);
-       FREE_OP(free_op2);
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_MOD_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
-
-       mod_function(&EX_T(opline->result.u.var).tmp_var,
-               get_zval_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_R),
-               get_zval_ptr(&opline->op2, EX(Ts), &free_op2, BP_VAR_R) TSRMLS_CC);
-       FREE_OP(free_op1);
-       FREE_OP(free_op2);
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_SL_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
-
-       shift_left_function(&EX_T(opline->result.u.var).tmp_var,
-               get_zval_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_R),
-               get_zval_ptr(&opline->op2, EX(Ts), &free_op2, BP_VAR_R) TSRMLS_CC);
-       FREE_OP(free_op1);
-       FREE_OP(free_op2);
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_SR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
-
-       shift_right_function(&EX_T(opline->result.u.var).tmp_var,
-               get_zval_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_R),
-               get_zval_ptr(&opline->op2, EX(Ts), &free_op2, BP_VAR_R) TSRMLS_CC);
-       FREE_OP(free_op1);
-       FREE_OP(free_op2);
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_CONCAT_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
-
-       concat_function(&EX_T(opline->result.u.var).tmp_var,
-               get_zval_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_R),
-               get_zval_ptr(&opline->op2, EX(Ts), &free_op2, BP_VAR_R) TSRMLS_CC);
-       FREE_OP(free_op1);
-       FREE_OP(free_op2);
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_IS_IDENTICAL_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
-
-       is_identical_function(&EX_T(opline->result.u.var).tmp_var,
-               get_zval_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_R),
-               get_zval_ptr(&opline->op2, EX(Ts), &free_op2, BP_VAR_R) TSRMLS_CC);
-       FREE_OP(free_op1);
-       FREE_OP(free_op2);
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_IS_NOT_IDENTICAL_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
-
-       is_not_identical_function(&EX_T(opline->result.u.var).tmp_var,
-               get_zval_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_R),
-               get_zval_ptr(&opline->op2, EX(Ts), &free_op2, BP_VAR_R) TSRMLS_CC);
-       FREE_OP(free_op1);
-       FREE_OP(free_op2);
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_IS_EQUAL_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
-
-       is_equal_function(&EX_T(opline->result.u.var).tmp_var,
-               get_zval_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_R),
-               get_zval_ptr(&opline->op2, EX(Ts), &free_op2, BP_VAR_R) TSRMLS_CC);
-       FREE_OP(free_op1);
-       FREE_OP(free_op2);
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_IS_NOT_EQUAL_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
-
-       is_not_equal_function(&EX_T(opline->result.u.var).tmp_var,
-               get_zval_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_R),
-               get_zval_ptr(&opline->op2, EX(Ts), &free_op2, BP_VAR_R) TSRMLS_CC);
-       FREE_OP(free_op1);
-       FREE_OP(free_op2);
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_IS_SMALLER_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
-
-       is_smaller_function(&EX_T(opline->result.u.var).tmp_var,
-               get_zval_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_R),
-               get_zval_ptr(&opline->op2, EX(Ts), &free_op2, BP_VAR_R) TSRMLS_CC);
-       FREE_OP(free_op1);
-       FREE_OP(free_op2);
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_IS_SMALLER_OR_EQUAL_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
-
-       is_smaller_or_equal_function(&EX_T(opline->result.u.var).tmp_var,
-               get_zval_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_R),
-               get_zval_ptr(&opline->op2, EX(Ts), &free_op2, BP_VAR_R) TSRMLS_CC);
-       FREE_OP(free_op1);
-       FREE_OP(free_op2);
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_BW_OR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
-
-       bitwise_or_function(&EX_T(opline->result.u.var).tmp_var,
-               get_zval_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_R),
-               get_zval_ptr(&opline->op2, EX(Ts), &free_op2, BP_VAR_R) TSRMLS_CC);
-       FREE_OP(free_op1);
-       FREE_OP(free_op2);
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_BW_AND_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
-
-       bitwise_and_function(&EX_T(opline->result.u.var).tmp_var,
-               get_zval_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_R),
-               get_zval_ptr(&opline->op2, EX(Ts), &free_op2, BP_VAR_R) TSRMLS_CC);
-       FREE_OP(free_op1);
-       FREE_OP(free_op2);
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_BW_XOR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
-
-       bitwise_xor_function(&EX_T(opline->result.u.var).tmp_var,
-               get_zval_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_R),
-               get_zval_ptr(&opline->op2, EX(Ts), &free_op2, BP_VAR_R) TSRMLS_CC);
-       FREE_OP(free_op1);
-       FREE_OP(free_op2);
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_BOOL_XOR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
-
-       boolean_xor_function(&EX_T(opline->result.u.var).tmp_var,
-               get_zval_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_R),
-               get_zval_ptr(&opline->op2, EX(Ts), &free_op2, BP_VAR_R) TSRMLS_CC);
-       FREE_OP(free_op1);
-       FREE_OP(free_op2);
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_BW_NOT_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zend_free_op free_op1;
-
-       bitwise_not_function(&EX_T(opline->result.u.var).tmp_var,
-               get_zval_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_R) TSRMLS_CC);
-       FREE_OP(free_op1);
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_BOOL_NOT_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zend_free_op free_op1;
-
-       boolean_not_function(&EX_T(opline->result.u.var).tmp_var,
-               get_zval_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_R) TSRMLS_CC);
-       FREE_OP(free_op1);
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int zend_binary_assign_op_obj_helper(int (*binary_op)(zval *result, zval *op1, zval *op2 TSRMLS_DC), ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zend_op *op_data = opline+1;
-       zend_free_op free_op1, free_op2, free_op_data1;
-       zval **object_ptr = get_obj_zval_ptr_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_W);
-       zval *object;
-       zval *property = get_zval_ptr(&opline->op2, EX(Ts), &free_op2, BP_VAR_R);
-       zval *value = get_zval_ptr(&op_data->op1, EX(Ts), &free_op_data1, BP_VAR_R);
-       znode *result = &opline->result;
-       zval **retval = &EX_T(result->u.var).var.ptr;
-       int have_get_ptr = 0;
-
-       EX_T(result->u.var).var.ptr_ptr = NULL;
-       make_real_object(object_ptr TSRMLS_CC);
-       object = *object_ptr;
-
-       if (object->type != IS_OBJECT) {
-               zend_error(E_WARNING, "Attempt to assign property of non-object");
-               FREE_OP(free_op2);
-               FREE_OP(free_op_data1);
-
-               if (!RETURN_VALUE_UNUSED(result)) {
-                       *retval = EG(uninitialized_zval_ptr);
-                       PZVAL_LOCK(*retval);
-               }
-       } else {
-               /* here we are sure we are dealing with an object */
-               if (IS_TMP_FREE(free_op2)) {
-                       MAKE_REAL_ZVAL_PTR(property);
-               }
-
-               /* here property is a string */
-               if (opline->extended_value == ZEND_ASSIGN_OBJ
-                       && Z_OBJ_HT_P(object)->get_property_ptr_ptr) {
-                       zval **zptr = Z_OBJ_HT_P(object)->get_property_ptr_ptr(object, property TSRMLS_CC);
-                       if (zptr != NULL) {                     /* NULL means no success in getting PTR */
-                               SEPARATE_ZVAL_IF_NOT_REF(zptr);
-
-                               have_get_ptr = 1;
-                               binary_op(*zptr, *zptr, value TSRMLS_CC);
-                               if (!RETURN_VALUE_UNUSED(result)) {
-                                       *retval = *zptr;
-                                       PZVAL_LOCK(*retval);
-                               }
-                       }
-               }
-
-               if (!have_get_ptr) {
-                       zval *z = NULL;
-
-                       switch (opline->extended_value) {
-                               case ZEND_ASSIGN_OBJ:
-                                       if (Z_OBJ_HT_P(object)->read_property) {
-                                               z = Z_OBJ_HT_P(object)->read_property(object, property, BP_VAR_RW TSRMLS_CC);
-                                       }
-                                       break;
-                               case ZEND_ASSIGN_DIM:
-                                       if (Z_OBJ_HT_P(object)->read_dimension) {
-                                               z = Z_OBJ_HT_P(object)->read_dimension(object, property, BP_VAR_RW TSRMLS_CC);
-                                       }
-                                       break;
-                       }
-                       if (z) {
-                               if (z->type == IS_OBJECT && Z_OBJ_HT_P(z)->get) {
-                                       zval *value = Z_OBJ_HT_P(z)->get(z TSRMLS_CC);
-
-                                       if (z->refcount == 0) {
-                                               zval_dtor(z);
-                                               FREE_ZVAL(z);
-                                       }
-                                       z = value;
-                               }
-                               z->refcount++;
-                               SEPARATE_ZVAL_IF_NOT_REF(&z);
-                               binary_op(z, z, value TSRMLS_CC);
-                               switch (opline->extended_value) {
-                                       case ZEND_ASSIGN_OBJ:
-                                               Z_OBJ_HT_P(object)->write_property(object, property, z TSRMLS_CC);
-                                               break;
-                                       case ZEND_ASSIGN_DIM:
-                                               Z_OBJ_HT_P(object)->write_dimension(object, property, z TSRMLS_CC);
-                                               break;
-                               }
-                               if (!RETURN_VALUE_UNUSED(result)) {
-                                       *retval = z;
-                                       PZVAL_LOCK(*retval);
-                               }
-                               zval_ptr_dtor(&z);
-                       } else {
-                               zend_error(E_WARNING, "Attempt to assign property of non-object");
-                               if (!RETURN_VALUE_UNUSED(result)) {
-                                       *retval = EG(uninitialized_zval_ptr);
-                                       PZVAL_LOCK(*retval);
-                               }
-                       }
-               }
-
-               if (IS_TMP_FREE(free_op2)) {
-                       zval_ptr_dtor(&property);
-               } else {
-                       FREE_OP(free_op2);
-               }
-               FREE_OP(free_op_data1);
-       }
-
-       if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-       /* assign_obj has two opcodes! */
-       ZEND_VM_INC_OPCODE();
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int zend_binary_assign_op_helper(int (*binary_op)(zval *result, zval *op1, zval *op2 TSRMLS_DC), ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2, free_op_data2, free_op_data1;
-       zval **var_ptr;
-       zval *value;
-       zend_bool increment_opline = 0;
-
-       switch (opline->extended_value) {
-               case ZEND_ASSIGN_OBJ:
-                       return zend_binary_assign_op_obj_helper(binary_op, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
-                       break;
-               case ZEND_ASSIGN_DIM: {
-                               zval **object_ptr = get_obj_zval_ptr_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_W);
-
-                               if (opline->op1.op_type != IS_CV && free_op1.var == NULL) {
-                                       (*object_ptr)->refcount++;  /* undo the effect of get_obj_zval_ptr_ptr() */
-                               }
-
-                               if ((*object_ptr)->type == IS_OBJECT) {
-                                       return zend_binary_assign_op_obj_helper(binary_op, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
-                               } else {
-                                       zend_op *op_data = opline+1;
-                                       zval *dim = get_zval_ptr(&opline->op2, EX(Ts), &free_op2, BP_VAR_R);
-
-                                       zend_fetch_dimension_address(&EX_T(op_data->op2.u.var), get_zval_ptr_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_RW), dim, IS_TMP_FREE(free_op2), BP_VAR_RW TSRMLS_CC);
-                                       value = get_zval_ptr(&op_data->op1, EX(Ts), &free_op_data1, BP_VAR_R);
-                                       var_ptr = get_zval_ptr_ptr(&op_data->op2, EX(Ts), &free_op_data2, BP_VAR_RW);
-                                       increment_opline = 1;
-                               }
-                       }
-                       break;
-               default:
-                       value = get_zval_ptr(&opline->op2, EX(Ts), &free_op2, BP_VAR_R);
-                       var_ptr = get_zval_ptr_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_RW);
-                       /* do nothing */
-                       break;
-       }
-
-       if (!var_ptr) {
-               zend_error_noreturn(E_ERROR, "Cannot use assign-op operators with overloaded objects nor string offsets");
-       }
-
-       if (*var_ptr == EG(error_zval_ptr)) {
-               if (!RETURN_VALUE_UNUSED(&opline->result)) {
-                       EX_T(opline->result.u.var).var.ptr_ptr = &EG(uninitialized_zval_ptr);
-                       PZVAL_LOCK(*EX_T(opline->result.u.var).var.ptr_ptr);
-                       AI_USE_PTR(EX_T(opline->result.u.var).var);
-               }
-               FREE_OP(free_op2);
-               if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-               if (increment_opline) {
-                       ZEND_VM_INC_OPCODE();
-               }
-               ZEND_VM_NEXT_OPCODE();
-       }
-
-       SEPARATE_ZVAL_IF_NOT_REF(var_ptr);
-
-       if(Z_TYPE_PP(var_ptr) == IS_OBJECT && Z_OBJ_HANDLER_PP(var_ptr, get)
-          && Z_OBJ_HANDLER_PP(var_ptr, set)) {
-               /* proxy object */
-               zval *objval = Z_OBJ_HANDLER_PP(var_ptr, get)(*var_ptr TSRMLS_CC);
-               objval->refcount++;
-               binary_op(objval, objval, value TSRMLS_CC);
-               Z_OBJ_HANDLER_PP(var_ptr, set)(var_ptr, objval TSRMLS_CC);
-               zval_ptr_dtor(&objval);
-       } else {
-               binary_op(*var_ptr, *var_ptr, value TSRMLS_CC);
-       }
-
-       if (!RETURN_VALUE_UNUSED(&opline->result)) {
-               EX_T(opline->result.u.var).var.ptr_ptr = var_ptr;
-               PZVAL_LOCK(*var_ptr);
-               AI_USE_PTR(EX_T(opline->result.u.var).var);
-       }
-       FREE_OP(free_op2);
-
-       if (increment_opline) {
-               ZEND_VM_INC_OPCODE();
-               FREE_OP_VAR_PTR(free_op_data2);
-       }
-       if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_ASSIGN_ADD_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       return zend_binary_assign_op_helper(add_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
-}
-
-static int ZEND_ASSIGN_SUB_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       return zend_binary_assign_op_helper(sub_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
-}
-
-static int ZEND_ASSIGN_MUL_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       return zend_binary_assign_op_helper(mul_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
-}
-
-static int ZEND_ASSIGN_DIV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       return zend_binary_assign_op_helper(div_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
-}
-
-static int ZEND_ASSIGN_MOD_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       return zend_binary_assign_op_helper(mod_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
-}
-
-static int ZEND_ASSIGN_SL_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       return zend_binary_assign_op_helper(shift_left_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
-}
-
-static int ZEND_ASSIGN_SR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       return zend_binary_assign_op_helper(shift_right_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
-}
-
-static int ZEND_ASSIGN_CONCAT_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       return zend_binary_assign_op_helper(concat_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
-}
-
-static int ZEND_ASSIGN_BW_OR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       return zend_binary_assign_op_helper(bitwise_or_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
-}
-
-static int ZEND_ASSIGN_BW_AND_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       return zend_binary_assign_op_helper(bitwise_and_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
-}
-
-static int ZEND_ASSIGN_BW_XOR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       return zend_binary_assign_op_helper(bitwise_xor_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
-}
-
-static int zend_pre_incdec_property_helper(incdec_t incdec_op, ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
-       zval **object_ptr = get_obj_zval_ptr_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_W);
-       zval *object;
-       zval *property = get_zval_ptr(&opline->op2, EX(Ts), &free_op2, BP_VAR_R);
-       zval **retval = &EX_T(opline->result.u.var).var.ptr;
-       int have_get_ptr = 0;
-
-       make_real_object(object_ptr TSRMLS_CC); /* this should modify object only if it's empty */
-       object = *object_ptr;
-
-       if (object->type != IS_OBJECT) {
-               zend_error(E_WARNING, "Attempt to increment/decrement property of non-object");
-               FREE_OP(free_op2);
-               if (!RETURN_VALUE_UNUSED(&opline->result)) {
-                       *retval = EG(uninitialized_zval_ptr);
-                       PZVAL_LOCK(*retval);
-               }
-               if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-               ZEND_VM_NEXT_OPCODE();
-       }
-
-       /* here we are sure we are dealing with an object */
-
-       if (IS_TMP_FREE(free_op2)) {
-               MAKE_REAL_ZVAL_PTR(property);
-       }
-
-       if (Z_OBJ_HT_P(object)->get_property_ptr_ptr) {
-               zval **zptr = Z_OBJ_HT_P(object)->get_property_ptr_ptr(object, property TSRMLS_CC);
-               if (zptr != NULL) {                     /* NULL means no success in getting PTR */
-                       SEPARATE_ZVAL_IF_NOT_REF(zptr);
-
-                       have_get_ptr = 1;
-                       incdec_op(*zptr);
-                       if (!RETURN_VALUE_UNUSED(&opline->result)) {
-                               *retval = *zptr;
-                               PZVAL_LOCK(*retval);
-                       }
-               }
-       }
-
-       if (!have_get_ptr) {
-               if (Z_OBJ_HT_P(object)->read_property && Z_OBJ_HT_P(object)->write_property) {
-                       zval *z = Z_OBJ_HT_P(object)->read_property(object, property, BP_VAR_RW TSRMLS_CC);
-
-                       if (z->type == IS_OBJECT && Z_OBJ_HT_P(z)->get) {
-                               zval *value = Z_OBJ_HT_P(z)->get(z TSRMLS_CC);
-
-                               if (z->refcount == 0) {
-                                       zval_dtor(z);
-                                       FREE_ZVAL(z);
-                               }
-                               z = value;
-                       }
-                       z->refcount++;
-                       SEPARATE_ZVAL_IF_NOT_REF(&z);
-                       incdec_op(z);
-                       *retval = z;
-                       Z_OBJ_HT_P(object)->write_property(object, property, z TSRMLS_CC);
-                       SELECTIVE_PZVAL_LOCK(*retval, &opline->result);
-                       zval_ptr_dtor(&z);
-               } else {
-                       zend_error(E_WARNING, "Attempt to increment/decrement property of non-object");
-                       if (!RETURN_VALUE_UNUSED(&opline->result)) {
-                               *retval = EG(uninitialized_zval_ptr);
-                               PZVAL_LOCK(*retval);
-                       }
-               }
-       }
-
-       if (IS_TMP_FREE(free_op2)) {
-               zval_ptr_dtor(&property);
-       } else {
-               FREE_OP(free_op2);
-       }
-       if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_PRE_INC_OBJ_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       return zend_pre_incdec_property_helper(increment_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
-}
-
-static int ZEND_PRE_DEC_OBJ_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       return zend_pre_incdec_property_helper(decrement_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
-}
-
-static int zend_post_incdec_property_helper(incdec_t incdec_op, ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
-       zval **object_ptr = get_obj_zval_ptr_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_W);
-       zval *object;
-       zval *property = get_zval_ptr(&opline->op2, EX(Ts), &free_op2, BP_VAR_R);
-       zval *retval = &EX_T(opline->result.u.var).tmp_var;
-       int have_get_ptr = 0;
-
-       make_real_object(object_ptr TSRMLS_CC); /* this should modify object only if it's empty */
-       object = *object_ptr;
-
-       if (object->type != IS_OBJECT) {
-               zend_error(E_WARNING, "Attempt to increment/decrement property of non-object");
-               FREE_OP(free_op2);
-               *retval = *EG(uninitialized_zval_ptr);
-               if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-               ZEND_VM_NEXT_OPCODE();
-       }
-
-       /* here we are sure we are dealing with an object */
-
-       if (IS_TMP_FREE(free_op2)) {
-               MAKE_REAL_ZVAL_PTR(property);
-       }
-
-       if (Z_OBJ_HT_P(object)->get_property_ptr_ptr) {
-               zval **zptr = Z_OBJ_HT_P(object)->get_property_ptr_ptr(object, property TSRMLS_CC);
-               if (zptr != NULL) {                     /* NULL means no success in getting PTR */
-                       have_get_ptr = 1;
-                       SEPARATE_ZVAL_IF_NOT_REF(zptr);
-
-                       *retval = **zptr;
-                       zendi_zval_copy_ctor(*retval);
-
-                       incdec_op(*zptr);
-
-               }
-       }
-
-       if (!have_get_ptr) {
-               if (Z_OBJ_HT_P(object)->read_property && Z_OBJ_HT_P(object)->write_property) {
-                       zval *z = Z_OBJ_HT_P(object)->read_property(object, property, BP_VAR_RW TSRMLS_CC);
-                       zval *z_copy;
-
-                       if (z->type == IS_OBJECT && Z_OBJ_HT_P(z)->get) {
-                               zval *value = Z_OBJ_HT_P(z)->get(z TSRMLS_CC);
-
-                               if (z->refcount == 0) {
-                                       zval_dtor(z);
-                                       FREE_ZVAL(z);
-                               }
-                               z = value;
-                       }
-                       *retval = *z;
-                       zendi_zval_copy_ctor(*retval);
-                       ALLOC_ZVAL(z_copy);
-                       *z_copy = *z;
-                       zendi_zval_copy_ctor(*z_copy);
-                       INIT_PZVAL(z_copy);
-                       incdec_op(z_copy);
-                       z->refcount++;
-                       Z_OBJ_HT_P(object)->write_property(object, property, z_copy TSRMLS_CC);
-                       zval_ptr_dtor(&z_copy);
-                       zval_ptr_dtor(&z);
-               } else {
-                       zend_error(E_WARNING, "Attempt to increment/decrement property of non-object");
-                       *retval = *EG(uninitialized_zval_ptr);
-               }
-       }
-
-       if (IS_TMP_FREE(free_op2)) {
-               zval_ptr_dtor(&property);
-       } else {
-               FREE_OP(free_op2);
-       }
-       if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_POST_INC_OBJ_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       return zend_post_incdec_property_helper(increment_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
-}
-
-static int ZEND_POST_DEC_OBJ_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       return zend_post_incdec_property_helper(decrement_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
-}
-
-static int ZEND_PRE_INC_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zend_free_op free_op1;
-       zval **var_ptr = get_zval_ptr_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_RW);
-
-       if (!var_ptr) {
-               zend_error_noreturn(E_ERROR, "Cannot increment/decrement overloaded objects nor string offsets");
-       }
-       if (*var_ptr == EG(error_zval_ptr)) {
-               if (!RETURN_VALUE_UNUSED(&opline->result)) {
-                       EX_T(opline->result.u.var).var.ptr_ptr = &EG(uninitialized_zval_ptr);
-                       PZVAL_LOCK(*EX_T(opline->result.u.var).var.ptr_ptr);
-                       AI_USE_PTR(EX_T(opline->result.u.var).var);
-               }
-               if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-               ZEND_VM_NEXT_OPCODE();
-       }
-
-       SEPARATE_ZVAL_IF_NOT_REF(var_ptr);
-
-       if(Z_TYPE_PP(var_ptr) == IS_OBJECT && Z_OBJ_HANDLER_PP(var_ptr, get)
-          && Z_OBJ_HANDLER_PP(var_ptr, set)) {
-               /* proxy object */
-               zval *val = Z_OBJ_HANDLER_PP(var_ptr, get)(*var_ptr TSRMLS_CC);
-               val->refcount++;
-               increment_function(val);
-               Z_OBJ_HANDLER_PP(var_ptr, set)(var_ptr, val TSRMLS_CC);
-               zval_ptr_dtor(&val);
-       } else {
-               increment_function(*var_ptr);
-       }
-
-       if (!RETURN_VALUE_UNUSED(&opline->result)) {
-               EX_T(opline->result.u.var).var.ptr_ptr = var_ptr;
-               PZVAL_LOCK(*var_ptr);
-               AI_USE_PTR(EX_T(opline->result.u.var).var);
-       }
-
-       if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_PRE_DEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zend_free_op free_op1;
-       zval **var_ptr = get_zval_ptr_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_RW);
-
-       if (!var_ptr) {
-               zend_error_noreturn(E_ERROR, "Cannot increment/decrement overloaded objects nor string offsets");
-       }
-       if (*var_ptr == EG(error_zval_ptr)) {
-               if (!RETURN_VALUE_UNUSED(&opline->result)) {
-                       EX_T(opline->result.u.var).var.ptr_ptr = &EG(uninitialized_zval_ptr);
-                       PZVAL_LOCK(*EX_T(opline->result.u.var).var.ptr_ptr);
-                       AI_USE_PTR(EX_T(opline->result.u.var).var);
-               }
-               if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-               ZEND_VM_NEXT_OPCODE();
-       }
-
-       SEPARATE_ZVAL_IF_NOT_REF(var_ptr);
-
-       if(Z_TYPE_PP(var_ptr) == IS_OBJECT && Z_OBJ_HANDLER_PP(var_ptr, get)
-          && Z_OBJ_HANDLER_PP(var_ptr, set)) {
-               /* proxy object */
-               zval *val = Z_OBJ_HANDLER_PP(var_ptr, get)(*var_ptr TSRMLS_CC);
-               val->refcount++;
-               decrement_function(val);
-               Z_OBJ_HANDLER_PP(var_ptr, set)(var_ptr, val TSRMLS_CC);
-               zval_ptr_dtor(&val);
-       } else {
-               decrement_function(*var_ptr);
-       }
-
-       if (!RETURN_VALUE_UNUSED(&opline->result)) {
-               EX_T(opline->result.u.var).var.ptr_ptr = var_ptr;
-               PZVAL_LOCK(*var_ptr);
-               AI_USE_PTR(EX_T(opline->result.u.var).var);
-       }
-
-       if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_POST_INC_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zend_free_op free_op1;
-       zval **var_ptr = get_zval_ptr_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_RW);
-
-       if (!var_ptr) {
-               zend_error_noreturn(E_ERROR, "Cannot increment/decrement overloaded objects nor string offsets");
-       }
-       if (*var_ptr == EG(error_zval_ptr)) {
-               if (!RETURN_VALUE_UNUSED(&opline->result)) {
-                       EX_T(opline->result.u.var).tmp_var = *EG(uninitialized_zval_ptr);
-               }
-               if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-               ZEND_VM_NEXT_OPCODE();
-       }
-
-       EX_T(opline->result.u.var).tmp_var = **var_ptr;
-       zendi_zval_copy_ctor(EX_T(opline->result.u.var).tmp_var);
-
-       SEPARATE_ZVAL_IF_NOT_REF(var_ptr);
-
-       if(Z_TYPE_PP(var_ptr) == IS_OBJECT && Z_OBJ_HANDLER_PP(var_ptr, get)
-          && Z_OBJ_HANDLER_PP(var_ptr, set)) {
-               /* proxy object */
-               zval *val = Z_OBJ_HANDLER_PP(var_ptr, get)(*var_ptr TSRMLS_CC);
-               val->refcount++;
-               increment_function(val);
-               Z_OBJ_HANDLER_PP(var_ptr, set)(var_ptr, val TSRMLS_CC);
-               zval_ptr_dtor(&val);
-       } else {
-               increment_function(*var_ptr);
-       }
-
-       if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_POST_DEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zend_free_op free_op1;
-       zval **var_ptr = get_zval_ptr_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_RW);
-
-       if (!var_ptr) {
-               zend_error_noreturn(E_ERROR, "Cannot increment/decrement overloaded objects nor string offsets");
-       }
-       if (*var_ptr == EG(error_zval_ptr)) {
-               if (!RETURN_VALUE_UNUSED(&opline->result)) {
-                       EX_T(opline->result.u.var).tmp_var = *EG(uninitialized_zval_ptr);
-               }
-               if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-               ZEND_VM_NEXT_OPCODE();
-       }
-
-       EX_T(opline->result.u.var).tmp_var = **var_ptr;
-       zendi_zval_copy_ctor(EX_T(opline->result.u.var).tmp_var);
-
-       SEPARATE_ZVAL_IF_NOT_REF(var_ptr);
-
-       if(Z_TYPE_PP(var_ptr) == IS_OBJECT && Z_OBJ_HANDLER_PP(var_ptr, get)
-          && Z_OBJ_HANDLER_PP(var_ptr, set)) {
-               /* proxy object */
-               zval *val = Z_OBJ_HANDLER_PP(var_ptr, get)(*var_ptr TSRMLS_CC);
-               val->refcount++;
-               decrement_function(val);
-               Z_OBJ_HANDLER_PP(var_ptr, set)(var_ptr, val TSRMLS_CC);
-               zval_ptr_dtor(&val);
-       } else {
-               decrement_function(*var_ptr);
-       }
-
-       if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_ECHO_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zend_free_op free_op1;
-       zval z_copy;
-       zval *z = get_zval_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_R);
-
-       if (Z_TYPE_P(z) == IS_OBJECT && Z_OBJ_HT_P(z)->get_method != NULL &&
-               zend_std_cast_object_tostring(z, &z_copy, IS_STRING, 0 TSRMLS_CC) == SUCCESS) {
-               zend_print_variable(&z_copy);
-               zval_dtor(&z_copy);
-       } else {
-               zend_print_variable(z);
-       }
-
-       FREE_OP(free_op1);
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_PRINT_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-
-       EX_T(opline->result.u.var).tmp_var.value.lval = 1;
-       EX_T(opline->result.u.var).tmp_var.type = IS_LONG;
-
-       return ZEND_ECHO_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
-}
-
-static int zend_fetch_var_address_helper(int type, ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zend_free_op free_op1;
-       zval *varname = get_zval_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_R);
-       zval **retval;
-       zval tmp_varname;
-       HashTable *target_symbol_table;
-
-       if (varname->type != IS_STRING) {
-               tmp_varname = *varname;
-               zval_copy_ctor(&tmp_varname);
-               convert_to_string(&tmp_varname);
-               varname = &tmp_varname;
-       }
-
-       if (opline->op2.u.EA.type == ZEND_FETCH_STATIC_MEMBER) {
-               retval = zend_std_get_static_property(EX_T(opline->op2.u.var).class_entry, Z_STRVAL_P(varname), Z_STRLEN_P(varname), 0 TSRMLS_CC);
-       } else {
-               if (opline->op2.u.EA.type == ZEND_FETCH_GLOBAL && opline->op1.op_type == IS_VAR) {
-                       varname->refcount++;
-               }
-               target_symbol_table = zend_get_target_symbol_table(opline, EX(Ts), type, varname TSRMLS_CC);
-/*
-               if (!target_symbol_table) {
-                       ZEND_VM_NEXT_OPCODE();
-               }
-*/
-               if (zend_hash_find(target_symbol_table, varname->value.str.val, varname->value.str.len+1, (void **) &retval) == FAILURE) {
-                       switch (type) {
-                               case BP_VAR_R:
-                               case BP_VAR_UNSET:
-                                       zend_error(E_NOTICE,"Undefined variable: %s", varname->value.str.val);
-                                       /* break missing intentionally */
-                               case BP_VAR_IS:
-                                       retval = &EG(uninitialized_zval_ptr);
-                                       break;
-                               case BP_VAR_RW:
-                                       zend_error(E_NOTICE,"Undefined variable: %s", varname->value.str.val);
-                                       /* break missing intentionally */
-                               case BP_VAR_W: {
-                                               zval *new_zval = &EG(uninitialized_zval);
-
-                                               new_zval->refcount++;
-                                               zend_hash_update(target_symbol_table, varname->value.str.val, varname->value.str.len+1, &new_zval, sizeof(zval *), (void **) &retval);
-                                       }
-                                       break;
-                               EMPTY_SWITCH_DEFAULT_CASE()
-                       }
-               }
-               switch (opline->op2.u.EA.type) {
-                       case ZEND_FETCH_GLOBAL:
-                       case ZEND_FETCH_LOCAL:
-                               FREE_OP(free_op1);
-                               break;
-                       case ZEND_FETCH_STATIC:
-                               zval_update_constant(retval, (void*) 1 TSRMLS_CC);
-                               break;
-               }
-       }
-
-
-       if (varname == &tmp_varname) {
-               zval_dtor(varname);
-       }
-       if (!RETURN_VALUE_UNUSED(&opline->result)) {
-               EX_T(opline->result.u.var).var.ptr_ptr = retval;
-               PZVAL_LOCK(*retval);
-               switch (type) {
-                       case BP_VAR_R:
-                       case BP_VAR_IS:
-                               AI_USE_PTR(EX_T(opline->result.u.var).var);
-                               break;
-                       case BP_VAR_UNSET: {
-                               zend_free_op free_res;
-
-                               PZVAL_UNLOCK(*EX_T(opline->result.u.var).var.ptr_ptr, &free_res);
-                               if (EX_T(opline->result.u.var).var.ptr_ptr != &EG(uninitialized_zval_ptr)) {
-                                       SEPARATE_ZVAL_IF_NOT_REF(EX_T(opline->result.u.var).var.ptr_ptr);
-                               }
-                               PZVAL_LOCK(*EX_T(opline->result.u.var).var.ptr_ptr);
-                               FREE_OP_VAR_PTR(free_res);
-                               break;
-                       }
-               }
-       }
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_FETCH_R_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       return zend_fetch_var_address_helper(BP_VAR_R, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
-}
-
-static int ZEND_FETCH_W_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       return zend_fetch_var_address_helper(BP_VAR_W, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
-}
-
-static int ZEND_FETCH_RW_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       return zend_fetch_var_address_helper(BP_VAR_RW, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
-}
-
-static int ZEND_FETCH_FUNC_ARG_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       return zend_fetch_var_address_helper(ARG_SHOULD_BE_SENT_BY_REF(EX(fbc), EX(opline)->extended_value)?BP_VAR_W:BP_VAR_R, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
-}
-
-static int ZEND_FETCH_UNSET_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       return zend_fetch_var_address_helper(BP_VAR_UNSET, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
-}
-
-static int ZEND_FETCH_IS_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       return zend_fetch_var_address_helper(BP_VAR_IS, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
-}
-
-static int ZEND_FETCH_DIM_R_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
-       zval *dim = get_zval_ptr(&opline->op2, EX(Ts), &free_op2, BP_VAR_R);
-
-       if (opline->extended_value == ZEND_FETCH_ADD_LOCK && opline->op1.op_type != IS_CV) {
-               PZVAL_LOCK(*EX_T(opline->op1.u.var).var.ptr_ptr);
-       }
-       zend_fetch_dimension_address(RETURN_VALUE_UNUSED(&opline->result)?NULL:&EX_T(opline->result.u.var), get_zval_ptr_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_R), dim, IS_TMP_FREE(free_op2), BP_VAR_R TSRMLS_CC);
-       FREE_OP(free_op2);
-       if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_FETCH_DIM_W_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
-       zval *dim = get_zval_ptr(&opline->op2, EX(Ts), &free_op2, BP_VAR_R);
-
-       zend_fetch_dimension_address(RETURN_VALUE_UNUSED(&opline->result)?NULL:&EX_T(opline->result.u.var), get_zval_ptr_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_W), dim, IS_TMP_FREE(free_op2), BP_VAR_W TSRMLS_CC);
-       FREE_OP(free_op2);
-       if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_FETCH_DIM_RW_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
-       zval *dim = get_zval_ptr(&opline->op2, EX(Ts), &free_op2, BP_VAR_R);
-
-       zend_fetch_dimension_address(RETURN_VALUE_UNUSED(&opline->result)?NULL:&EX_T(opline->result.u.var), get_zval_ptr_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_RW), dim, IS_TMP_FREE(free_op2), BP_VAR_RW TSRMLS_CC);
-       FREE_OP(free_op2);
-       if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_FETCH_DIM_IS_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
-       zval *dim = get_zval_ptr(&opline->op2, EX(Ts), &free_op2, BP_VAR_R);
-
-       zend_fetch_dimension_address(RETURN_VALUE_UNUSED(&opline->result)?NULL:&EX_T(opline->result.u.var), get_zval_ptr_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_IS), dim, IS_TMP_FREE(free_op2), BP_VAR_IS TSRMLS_CC);
-       FREE_OP(free_op2);
-       if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_FETCH_DIM_FUNC_ARG_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
-       int type = ARG_SHOULD_BE_SENT_BY_REF(EX(fbc), opline->extended_value)?BP_VAR_W:BP_VAR_R;
-       zval *dim = get_zval_ptr(&opline->op2, EX(Ts), &free_op2, BP_VAR_R);
-
-       zend_fetch_dimension_address(RETURN_VALUE_UNUSED(&opline->result)?NULL:&EX_T(opline->result.u.var), get_zval_ptr_ptr(&opline->op1, EX(Ts), &free_op1, type), dim, IS_TMP_FREE(free_op2), type TSRMLS_CC);
-       FREE_OP(free_op2);
-       if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_FETCH_DIM_UNSET_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
-       zval *dim = get_zval_ptr(&opline->op2, EX(Ts), &free_op2, BP_VAR_R);
-
-       /* Not needed in DIM_UNSET
-       if (opline->extended_value == ZEND_FETCH_ADD_LOCK) {
-               PZVAL_LOCK(*EX_T(opline->op1.u.var).var.ptr_ptr);
-       }
-       */
-       zend_fetch_dimension_address(RETURN_VALUE_UNUSED(&opline->result)?NULL:&EX_T(opline->result.u.var), get_zval_ptr_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_UNSET), dim, IS_TMP_FREE(free_op2), BP_VAR_UNSET TSRMLS_CC);
-       FREE_OP(free_op2);
-       if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-       if (EX_T(opline->result.u.var).var.ptr_ptr == NULL) {
-               zend_error_noreturn(E_ERROR, "Cannot unset string offsets");
-       } else {
-               zend_free_op free_res;
-
-               PZVAL_UNLOCK(*EX_T(opline->result.u.var).var.ptr_ptr, &free_res);
-               if (EX_T(opline->result.u.var).var.ptr_ptr != &EG(uninitialized_zval_ptr)) {
-                       SEPARATE_ZVAL_IF_NOT_REF(EX_T(opline->result.u.var).var.ptr_ptr);
-               }
-               PZVAL_LOCK(*EX_T(opline->result.u.var).var.ptr_ptr);
-               FREE_OP_VAR_PTR(free_res);
-       }
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int zend_fetch_property_address_read_helper(int type, ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zval *container;
-       zval **retval;
-       zend_free_op free_op1;
-
-       retval = &EX_T(opline->result.u.var).var.ptr;
-       EX_T(opline->result.u.var).var.ptr_ptr = retval;
-
-       container = get_obj_zval_ptr(&opline->op1, EX(Ts), &free_op1, type);
-
-       if (container == EG(error_zval_ptr)) {
-               if (!RETURN_VALUE_UNUSED(&opline->result)) {
-                       *retval = EG(error_zval_ptr);
-                       PZVAL_LOCK(*retval);
-                       AI_USE_PTR(EX_T(opline->result.u.var).var);
-               }
-               FREE_OP(free_op1);
-               ZEND_VM_NEXT_OPCODE();
-       }
-
-
-       if (container->type != IS_OBJECT || !Z_OBJ_HT_P(container)->read_property) {
-               zend_error(E_NOTICE, "Trying to get property of non-object");
-               *retval = EG(uninitialized_zval_ptr);
-               SELECTIVE_PZVAL_LOCK(*retval, &opline->result);
-               AI_USE_PTR(EX_T(opline->result.u.var).var);
-       } else {
-               zend_free_op free_op2;
-               zval *offset  = get_zval_ptr(&opline->op2, EX(Ts), &free_op2, BP_VAR_R);
-
-               if (IS_TMP_FREE(free_op2)) {
-                       MAKE_REAL_ZVAL_PTR(offset);
-               }
-
-               /* here we are sure we are dealing with an object */
-               *retval = Z_OBJ_HT_P(container)->read_property(container, offset, type TSRMLS_CC);
-
-               if (RETURN_VALUE_UNUSED(&opline->result) && ((*retval)->refcount == 0)) {
-                       zval_dtor(*retval);
-                       FREE_ZVAL(*retval);
-               } else {
-                       SELECTIVE_PZVAL_LOCK(*retval, &opline->result);
-                       AI_USE_PTR(EX_T(opline->result.u.var).var);
-               }
-
-               if (IS_TMP_FREE(free_op2)) {
-                       zval_ptr_dtor(&offset);
-               } else {
-                       FREE_OP(free_op2);
-               }
-       }
-
-       FREE_OP(free_op1);
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_FETCH_OBJ_R_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       return zend_fetch_property_address_read_helper(BP_VAR_R, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
-}
-
-static int ZEND_FETCH_OBJ_W_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
-       zval *property = get_zval_ptr(&opline->op2, EX(Ts), &free_op2, BP_VAR_R);
-
-       if (opline->extended_value == ZEND_FETCH_ADD_LOCK && opline->op1.op_type != IS_CV) {
-               PZVAL_LOCK(*EX_T(opline->op1.u.var).var.ptr_ptr);
-               EX_T(opline->op1.u.var).var.ptr = *EX_T(opline->op1.u.var).var.ptr_ptr;
-       }
-
-       if (IS_TMP_FREE(free_op2)) {
-               MAKE_REAL_ZVAL_PTR(property);
-       }
-       zend_fetch_property_address(RETURN_VALUE_UNUSED(&opline->result)?NULL:&EX_T(opline->result.u.var), get_obj_zval_ptr_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_W), property, BP_VAR_W TSRMLS_CC);
-       if (IS_TMP_FREE(free_op2)) {
-               zval_ptr_dtor(&property);
-       } else {
-               FREE_OP(free_op2);
-       }
-       if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_FETCH_OBJ_RW_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
-       zval *property = get_zval_ptr(&opline->op2, EX(Ts), &free_op2, BP_VAR_R);
-
-       if (IS_TMP_FREE(free_op2)) {
-               MAKE_REAL_ZVAL_PTR(property);
-       }
-       zend_fetch_property_address(RETURN_VALUE_UNUSED(&opline->result)?NULL:&EX_T(opline->result.u.var), get_obj_zval_ptr_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_RW), property, BP_VAR_RW TSRMLS_CC);
-       if (IS_TMP_FREE(free_op2)) {
-               zval_ptr_dtor(&property);
-       } else {
-               FREE_OP(free_op2);
-       }
-       if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_FETCH_OBJ_IS_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       return zend_fetch_property_address_read_helper(BP_VAR_IS, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
-}
-
-static int ZEND_FETCH_OBJ_FUNC_ARG_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-
-       if (ARG_SHOULD_BE_SENT_BY_REF(EX(fbc), opline->extended_value)) {
-               /* Behave like FETCH_OBJ_W */
-               zend_free_op free_op1, free_op2;
-               zval *property = get_zval_ptr(&opline->op2, EX(Ts), &free_op2, BP_VAR_R);
-
-               if (IS_TMP_FREE(free_op2)) {
-                       MAKE_REAL_ZVAL_PTR(property);
-               }
-               zend_fetch_property_address(RETURN_VALUE_UNUSED(&opline->result)?NULL:&EX_T(opline->result.u.var), get_obj_zval_ptr_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_W), property, BP_VAR_W TSRMLS_CC);
-               if (IS_TMP_FREE(free_op2)) {
-                       zval_ptr_dtor(&property);
-               } else {
-                       FREE_OP(free_op2);
-               }
-               if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-               ZEND_VM_NEXT_OPCODE();
-       } else {
-               return zend_fetch_property_address_read_helper(BP_VAR_R, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
-       }
-}
-
-static int ZEND_FETCH_OBJ_UNSET_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2, free_res;
-       zval *property = get_zval_ptr(&opline->op2, EX(Ts), &free_op2, BP_VAR_R);
-
-       if (IS_TMP_FREE(free_op2)) {
-               MAKE_REAL_ZVAL_PTR(property);
-       }
-       zend_fetch_property_address(RETURN_VALUE_UNUSED(&opline->result)?NULL:&EX_T(opline->result.u.var), get_obj_zval_ptr_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_R), property, BP_VAR_R TSRMLS_CC);
-       if (IS_TMP_FREE(free_op2)) {
-               zval_ptr_dtor(&property);
-       } else {
-               FREE_OP(free_op2);
-       }
-       if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-
-       PZVAL_UNLOCK(*EX_T(opline->result.u.var).var.ptr_ptr, &free_res);
-       if (EX_T(opline->result.u.var).var.ptr_ptr != &EG(uninitialized_zval_ptr)) {
-               SEPARATE_ZVAL_IF_NOT_REF(EX_T(opline->result.u.var).var.ptr_ptr);
-       }
-       PZVAL_LOCK(*EX_T(opline->result.u.var).var.ptr_ptr);
-       FREE_OP_VAR_PTR(free_res);
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_FETCH_DIM_TMP_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zend_free_op free_op1;
-       zval *container = get_zval_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_R);
-
-       if (container->type != IS_ARRAY) {
-               if (!RETURN_VALUE_UNUSED(&opline->result)) {
-                       EX_T(opline->result.u.var).var.ptr_ptr = &EG(uninitialized_zval_ptr);
-                       PZVAL_LOCK(*EX_T(opline->result.u.var).var.ptr_ptr);
-               }
-       } else {
-               zend_free_op free_op2;
-               zval *dim = get_zval_ptr(&opline->op2, EX(Ts), &free_op2, BP_VAR_R);
-
-               EX_T(opline->result.u.var).var.ptr_ptr = zend_fetch_dimension_address_inner(container->value.ht, dim, BP_VAR_R TSRMLS_CC);
-               SELECTIVE_PZVAL_LOCK(*EX_T(opline->result.u.var).var.ptr_ptr, &opline->result);
-               FREE_OP(free_op2);
-       }
-       AI_USE_PTR(EX_T(opline->result.u.var).var);
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_ASSIGN_OBJ_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zend_op *op_data = opline+1;
-       zend_free_op free_op1;
-       zval **object_ptr = get_obj_zval_ptr_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_W);
-
-       zend_assign_to_object(&opline->result, object_ptr, &opline->op2, &op_data->op1, EX(Ts), ZEND_ASSIGN_OBJ TSRMLS_CC);
-       if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-       /* assign_obj has two opcodes! */
-       ZEND_VM_INC_OPCODE();
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_ASSIGN_DIM_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zend_op *op_data = opline+1;
-       zend_free_op free_op1;
-       zval **object_ptr;
-
-       if (opline->op1.op_type == IS_CV || EX_T(opline->op1.u.var).var.ptr_ptr) {
-               /* not an array offset */
-               object_ptr = get_obj_zval_ptr_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_W);
-       } else {
-               object_ptr = NULL;
-       }
-
-       if (object_ptr && (*object_ptr)->type == IS_OBJECT) {
-               zend_assign_to_object(&opline->result, object_ptr, &opline->op2, &op_data->op1, EX(Ts), ZEND_ASSIGN_DIM TSRMLS_CC);
-       } else {
-               zend_free_op free_op2, free_op_data1;
-               zval *value;
-               zval *dim = get_zval_ptr(&opline->op2, EX(Ts), &free_op2, BP_VAR_R);
-
-               zend_fetch_dimension_address(&EX_T(op_data->op2.u.var), object_ptr, dim, IS_TMP_FREE(free_op2), BP_VAR_W TSRMLS_CC);
-               FREE_OP(free_op2);
-
-               value = get_zval_ptr(&op_data->op1, EX(Ts), &free_op_data1, BP_VAR_R);
-               zend_assign_to_variable(&opline->result, &op_data->op2, &op_data->op1, value, (IS_TMP_FREE(free_op_data1)?IS_TMP_VAR:op_data->op1.op_type), EX(Ts) TSRMLS_CC);
-               FREE_OP_IF_VAR(free_op_data1);
-       }
-       if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-       /* assign_dim has two opcodes! */
-       ZEND_VM_INC_OPCODE();
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_ASSIGN_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zend_free_op free_op2;
-       zval *value = get_zval_ptr(&opline->op2, EX(Ts), &free_op2, BP_VAR_R);
-
-       zend_assign_to_variable(&opline->result, &opline->op1, &opline->op2, value, (IS_TMP_FREE(free_op2)?IS_TMP_VAR:opline->op2.op_type), EX(Ts) TSRMLS_CC);
-       /* zend_assign_to_variable() always takes care of op2, never free it! */
-       FREE_OP_IF_VAR(free_op2);
-
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_ASSIGN_REF_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
-       zval **variable_ptr_ptr;
-       zval **value_ptr_ptr = get_zval_ptr_ptr(&opline->op2, EX(Ts), &free_op2, BP_VAR_W);
-
-       if (opline->op2.op_type == IS_VAR &&
-           !(*value_ptr_ptr)->is_ref &&
-           opline->extended_value == ZEND_RETURNS_FUNCTION && 
-           !EX_T(opline->op2.u.var).var.fcall_returned_reference) {
-               if (free_op2.var == NULL) {
-                       PZVAL_LOCK(*value_ptr_ptr); /* undo the effect of get_zval_ptr_ptr() */
-               }
-               zend_error(E_STRICT, "Only variables should be assigned by reference");
-               return ZEND_ASSIGN_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
-       }
-
-       variable_ptr_ptr = get_zval_ptr_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_W);
-       zend_assign_to_variable_reference(variable_ptr_ptr, value_ptr_ptr TSRMLS_CC);
-
-       if (!RETURN_VALUE_UNUSED(&opline->result)) {
-               EX_T(opline->result.u.var).var.ptr_ptr = variable_ptr_ptr;
-               PZVAL_LOCK(*variable_ptr_ptr);
-               AI_USE_PTR(EX_T(opline->result.u.var).var);
-       }
-
-       if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-       if (free_op2.var) {zval_ptr_dtor(&free_op2.var);};
-
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_JMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-#if DEBUG_ZEND>=2
-       printf("Jumping to %d\n", opline->op1.u.opline_num);
-#endif
-       ZEND_VM_SET_OPCODE(EX(opline)->op1.u.jmp_addr);
-       ZEND_VM_CONTINUE(); /* CHECK_ME */
-}
-
-static int ZEND_JMPZ_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zend_free_op free_op1;
-       int ret = i_zend_is_true(get_zval_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_R));
-
-       FREE_OP(free_op1);
-       if (!ret) {
-#if DEBUG_ZEND>=2
-               printf("Conditional jmp to %d\n", opline->op2.u.opline_num);
-#endif
-               ZEND_VM_SET_OPCODE(opline->op2.u.jmp_addr);
-               ZEND_VM_CONTINUE_JMP();
-       }
-
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_JMPNZ_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zend_free_op free_op1;
-       int ret = i_zend_is_true(get_zval_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_R));
-
-       FREE_OP(free_op1);
-       if (ret) {
-#if DEBUG_ZEND>=2
-               printf("Conditional jmp to %d\n", opline->op2.u.opline_num);
-#endif
-               ZEND_VM_SET_OPCODE(opline->op2.u.jmp_addr);
-               ZEND_VM_CONTINUE_JMP();
-       }
-
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_JMPZNZ_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zend_free_op free_op1;
-       int retval = i_zend_is_true(get_zval_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_R));
-
-       FREE_OP(free_op1);
-       if (retval) {
-#if DEBUG_ZEND>=2
-               printf("Conditional jmp on true to %d\n", opline->extended_value);
-#endif
-               ZEND_VM_SET_OPCODE(&EX(op_array)->opcodes[opline->extended_value]);
-               ZEND_VM_CONTINUE(); /* CHECK_ME */
-       } else {
-#if DEBUG_ZEND>=2
-               printf("Conditional jmp on false to %d\n", opline->op2.u.opline_num);
-#endif
-               ZEND_VM_SET_OPCODE(&EX(op_array)->opcodes[opline->op2.u.opline_num]);
-               ZEND_VM_CONTINUE_JMP();
-       }
-}
-
-static int ZEND_JMPZ_EX_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zend_free_op free_op1;
-       int retval = i_zend_is_true(get_zval_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_R));
-
-       FREE_OP(free_op1);
-       EX_T(opline->result.u.var).tmp_var.value.lval = retval;
-       EX_T(opline->result.u.var).tmp_var.type = IS_BOOL;
-       if (!retval) {
-#if DEBUG_ZEND>=2
-               printf("Conditional jmp to %d\n", opline->op2.u.opline_num);
-#endif
-               ZEND_VM_SET_OPCODE(opline->op2.u.jmp_addr);
-               ZEND_VM_CONTINUE_JMP();
-       }
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_JMPNZ_EX_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zend_free_op free_op1;
-       int retval = i_zend_is_true(get_zval_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_R));
-
-       FREE_OP(free_op1);
-       EX_T(opline->result.u.var).tmp_var.value.lval = retval;
-       EX_T(opline->result.u.var).tmp_var.type = IS_BOOL;
-       if (retval) {
-#if DEBUG_ZEND>=2
-               printf("Conditional jmp to %d\n", opline->op2.u.opline_num);
-#endif
-               ZEND_VM_SET_OPCODE(opline->op2.u.jmp_addr);
-               ZEND_VM_CONTINUE_JMP();
-       }
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_FREE_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zendi_zval_dtor(EX_T(EX(opline)->op1.u.var).tmp_var);
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_INIT_STRING_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zval *tmp = &EX_T(EX(opline)->result.u.var).tmp_var;
-
-       tmp->value.str.val = emalloc(1);
-       tmp->value.str.val[0] = 0;
-       tmp->value.str.len = 0;
-       tmp->refcount = 1;
-       tmp->type = IS_STRING;
-       tmp->is_ref = 0;
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_ADD_CHAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zend_free_op free_op1;
-
-       add_char_to_string(&EX_T(opline->result.u.var).tmp_var,
-               get_zval_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_NA),
-               &opline->op2.u.constant);
-       /* FREE_OP is missing intentionally here - we're always working on the same temporary variable */
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_ADD_STRING_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zend_free_op free_op1;
-
-       add_string_to_string(&EX_T(opline->result.u.var).tmp_var,
-               get_zval_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_NA),
-               &opline->op2.u.constant);
-       /* FREE_OP is missing intentionally here - we're always working on the same temporary variable */
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_ADD_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
-       zval *var = get_zval_ptr(&opline->op2, EX(Ts), &free_op2, BP_VAR_R);
-       zval var_copy;
-       int use_copy;
-
-       zend_make_printable_zval(var, &var_copy, &use_copy);
-       if (use_copy) {
-               var = &var_copy;
-       }
-       add_string_to_string(   &EX_T(opline->result.u.var).tmp_var,
-                                                       get_zval_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_NA),
-                                                       var);
-       if (use_copy) {
-               zval_dtor(var);
-       }
-       /* original comment, possibly problematic:
-        * FREE_OP is missing intentionally here - we're always working on the same temporary variable
-        * (Zeev):  I don't think it's problematic, we only use variables
-        * which aren't affected by FREE_OP(Ts, )'s anyway, unless they're
-        * string offsets or overloaded objects
-        */
-       FREE_OP(free_op2);
-
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_FETCH_CLASS_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zval *class_name;
-       zend_free_op free_op2;
-
-
-       if (opline->op2.op_type == IS_UNUSED) {
-               EX_T(opline->result.u.var).class_entry = zend_fetch_class(NULL, ZEND_FETCH_CLASS_AUTO, opline->extended_value TSRMLS_CC);
-               ZEND_VM_NEXT_OPCODE();
-       }
-
-       class_name = get_zval_ptr(&opline->op2, EX(Ts), &free_op2, BP_VAR_R);
-
-       switch (class_name->type) {
-               case IS_OBJECT:
-                       EX_T(opline->result.u.var).class_entry = Z_OBJCE_P(class_name);
-                       break;
-               case IS_STRING:
-                       EX_T(opline->result.u.var).class_entry = zend_fetch_class(Z_STRVAL_P(class_name), Z_STRLEN_P(class_name), ZEND_FETCH_CLASS_DEFAULT TSRMLS_CC);
-                       break;
-               default:
-                       zend_error_noreturn(E_ERROR, "Class name must be a valid object or a string");
-                       break;
-       }
-
-       FREE_OP(free_op2);
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_INIT_METHOD_CALL_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zval *function_name;
-       char *function_name_strval;
-       int function_name_strlen;
-       zend_free_op free_op1, free_op2;
-
-       zend_ptr_stack_3_push(&EG(arg_types_stack), EX(fbc), EX(object), EX(calling_scope));
-
-       function_name = get_zval_ptr(&opline->op2, EX(Ts), &free_op2, BP_VAR_R);
-
-       if (Z_TYPE_P(function_name)!=IS_STRING) {
-               zend_error_noreturn(E_ERROR, "Method name must be a string");
-       }
-
-       function_name_strval = function_name->value.str.val;
-       function_name_strlen = function_name->value.str.len;
-
-       EX(calling_scope) = EG(scope);
-
-       EX(object) = get_obj_zval_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_R);
-
-       if (EX(object) && EX(object)->type == IS_OBJECT) {
-               if (Z_OBJ_HT_P(EX(object))->get_method == NULL) {
-                       zend_error_noreturn(E_ERROR, "Object does not support method calls");
-               }
-
-               /* First, locate the function. */
-               EX(fbc) = Z_OBJ_HT_P(EX(object))->get_method(&EX(object), function_name_strval, function_name_strlen TSRMLS_CC);
-               if (!EX(fbc)) {
-                       zend_error_noreturn(E_ERROR, "Call to undefined method %s::%s()", Z_OBJ_CLASS_NAME_P(EX(object)), function_name_strval);
-               }
-       } else {
-               zend_error_noreturn(E_ERROR, "Call to a member function %s() on a non-object", function_name_strval);
-       }
-
-       if (EX(fbc)->common.fn_flags & ZEND_ACC_STATIC) {
-               EX(object) = NULL;
-       } else {
-               if (!PZVAL_IS_REF(EX(object))) {
-                       EX(object)->refcount++; /* For $this pointer */
-               } else {
-                       zval *this_ptr;
-                       ALLOC_ZVAL(this_ptr);
-                       INIT_PZVAL_COPY(this_ptr, EX(object));
-                       zval_copy_ctor(this_ptr);
-                       EX(object) = this_ptr;
-               }
-       }
-
-       if (EX(fbc)->type == ZEND_USER_FUNCTION) {
-               EX(calling_scope) = EX(fbc)->common.scope;
-       } else {
-               EX(calling_scope) = NULL;
-       }
-
-       FREE_OP(free_op2);
-       FREE_OP_IF_VAR(free_op1);
-
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_INIT_STATIC_METHOD_CALL_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zval *function_name;
-       zend_class_entry *ce;
-
-       zend_ptr_stack_3_push(&EG(arg_types_stack), EX(fbc), EX(object), EX(calling_scope));
-
-       ce = EX_T(opline->op1.u.var).class_entry;
-       if(opline->op2.op_type != IS_UNUSED) {
-               char *function_name_strval;
-               int function_name_strlen;
-               zend_bool is_const = (opline->op2.op_type == IS_CONST);
-               zend_free_op free_op2;
-
-               if (is_const) {
-                       function_name_strval = opline->op2.u.constant.value.str.val;
-                       function_name_strlen = opline->op2.u.constant.value.str.len;
-               } else {
-                       function_name = get_zval_ptr(&opline->op2, EX(Ts), &free_op2, BP_VAR_R);
-
-                       if (Z_TYPE_P(function_name) != IS_STRING) {
-                               zend_error_noreturn(E_ERROR, "Function name must be a string");
-                       }
-                       function_name_strval = zend_str_tolower_dup(function_name->value.str.val, function_name->value.str.len);
-                       function_name_strlen = function_name->value.str.len;
-               }
-
-               EX(fbc) = zend_std_get_static_method(ce, function_name_strval, function_name_strlen TSRMLS_CC);
-
-               if (!is_const) {
-                       efree(function_name_strval);
-                       FREE_OP(free_op2);
-               }
-       } else {
-               if(!ce->constructor) {
-                       zend_error_noreturn(E_ERROR, "Can not call constructor");
-               }
-               EX(fbc) = ce->constructor;
-       }
-
-       EX(calling_scope) = EX(fbc)->common.scope;
-
-       if (EX(fbc)->common.fn_flags & ZEND_ACC_STATIC) {
-               EX(object) = NULL;
-       } else {
-               if ((EX(object) = EG(This))) {
-                       EX(object)->refcount++;
-               }
-       }
-
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_INIT_FCALL_BY_NAME_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zval *function_name;
-       zend_function *function;
-       char *function_name_strval, *lcname;
-       int function_name_strlen;
-       zend_free_op free_op2;
-
-       zend_ptr_stack_3_push(&EG(arg_types_stack), EX(fbc), EX(object), EX(calling_scope));
-
-       if (opline->op2.op_type == IS_CONST) {
-#if 1
-               free_op2.var = NULL;
-#endif
-               function_name_strval = opline->op2.u.constant.value.str.val;
-               function_name_strlen = opline->op2.u.constant.value.str.len;
-       } else {
-               function_name = get_zval_ptr(&opline->op2, EX(Ts), &free_op2, BP_VAR_R);
-
-               if (Z_TYPE_P(function_name) != IS_STRING) {
-                       zend_error_noreturn(E_ERROR, "Function name must be a string");
-               }
-               function_name_strval = function_name->value.str.val;
-               function_name_strlen = function_name->value.str.len;
-       }
-
-       lcname = zend_str_tolower_dup(function_name_strval, function_name_strlen);
-       if (zend_hash_find(EG(function_table), lcname, function_name_strlen+1, (void **) &function)==FAILURE) {
-               efree(lcname);
-               zend_error_noreturn(E_ERROR, "Call to undefined function %s()", function_name_strval);
-       }
-
-       efree(lcname);
-       FREE_OP(free_op2);
-
-       EX(calling_scope) = function->common.scope;
-       EX(object) = NULL;
-
-       EX(fbc) = function;
-
-       ZEND_VM_NEXT_OPCODE();
-}
-
-
-static int zend_do_fcall_common_helper(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zval **original_return_value;
-       zend_class_entry *current_scope;
-       zval *current_this;
-       int return_value_used = RETURN_VALUE_USED(opline);
-       zend_bool should_change_scope;
-
-       if (EX(function_state).function->common.fn_flags & ZEND_ACC_ABSTRACT) {
-               zend_error_noreturn(E_ERROR, "Cannot call abstract method %s::%s()", EX(function_state).function->common.scope->name, EX(function_state).function->common.function_name);
-               ZEND_VM_NEXT_OPCODE(); /* Never reached */
-       }
-
-       zend_ptr_stack_2_push(&EG(argument_stack), (void *) opline->extended_value, NULL);
-
-       EX_T(opline->result.u.var).var.ptr_ptr = &EX_T(opline->result.u.var).var.ptr;
-
-       if (EX(function_state).function->type == ZEND_USER_FUNCTION
-               || EX(function_state).function->common.scope) {
-               should_change_scope = 1;
-               current_this = EG(This);
-               EG(This) = EX(object);
-               current_scope = EG(scope);
-               EG(scope) = EX(calling_scope);
-       } else {
-               should_change_scope = 0;
-       }
-
-       EX_T(opline->result.u.var).var.fcall_returned_reference = 0;
-
-       if (EX(function_state).function->common.scope) {
-               if (!EG(This) && !(EX(function_state).function->common.fn_flags & ZEND_ACC_STATIC)) {
-                       int severity;
-                       char *severity_word;
-                       if (EX(function_state).function->common.fn_flags & ZEND_ACC_ALLOW_STATIC) {
-                               severity = E_STRICT;
-                               severity_word = "should not";
-                       } else {
-                               severity = E_ERROR;
-                               severity_word = "cannot";
-                       }
-                       zend_error(severity, "Non-static method %s::%s() %s be called statically", EX(function_state).function->common.scope->name, EX(function_state).function->common.function_name, severity_word);
-               }
-       }
-       if (EX(function_state).function->type == ZEND_INTERNAL_FUNCTION) {
-               ALLOC_ZVAL(EX_T(opline->result.u.var).var.ptr);
-               INIT_ZVAL(*(EX_T(opline->result.u.var).var.ptr));
-
-               if (EX(function_state).function->common.arg_info) {
-                       zend_uint i=0;
-                       zval **p;
-                       ulong arg_count;
-
-                       p = (zval **) EG(argument_stack).top_element-2;
-                       arg_count = (ulong) *p;
-
-                       while (arg_count>0) {
-                               zend_verify_arg_type(EX(function_state).function, ++i, *(p-arg_count) TSRMLS_CC);
-                               arg_count--;
-                       }
-               }
-               if (!zend_execute_internal) {
-                       /* saves one function call if zend_execute_internal is not used */
-                       ((zend_internal_function *) EX(function_state).function)->handler(opline->extended_value, EX_T(opline->result.u.var).var.ptr, EX(object), return_value_used TSRMLS_CC);
-               } else {
-                       zend_execute_internal(execute_data, return_value_used TSRMLS_CC);
-               }
-
-               EG(current_execute_data) = execute_data;
-               EX_T(opline->result.u.var).var.ptr->is_ref = 0;
-               EX_T(opline->result.u.var).var.ptr->refcount = 1;
-               if (!return_value_used) {
-                       zval_ptr_dtor(&EX_T(opline->result.u.var).var.ptr);
-               }
-       } else if (EX(function_state).function->type == ZEND_USER_FUNCTION) {
-               HashTable *calling_symbol_table;
-
-               EX_T(opline->result.u.var).var.ptr = NULL;
-               if (EG(symtable_cache_ptr)>=EG(symtable_cache)) {
-                       /*printf("Cache hit!  Reusing %x\n", symtable_cache[symtable_cache_ptr]);*/
-                       EX(function_state).function_symbol_table = *(EG(symtable_cache_ptr)--);
-               } else {
-                       ALLOC_HASHTABLE(EX(function_state).function_symbol_table);
-                       zend_hash_init(EX(function_state).function_symbol_table, 0, NULL, ZVAL_PTR_DTOR, 0);
-                       /*printf("Cache miss!  Initialized %x\n", function_state.function_symbol_table);*/
-               }
-               calling_symbol_table = EG(active_symbol_table);
-               EG(active_symbol_table) = EX(function_state).function_symbol_table;
-               original_return_value = EG(return_value_ptr_ptr);
-               EG(return_value_ptr_ptr) = EX_T(opline->result.u.var).var.ptr_ptr;
-               EG(active_op_array) = (zend_op_array *) EX(function_state).function;
-
-               zend_execute(EG(active_op_array) TSRMLS_CC);
-               EX_T(opline->result.u.var).var.fcall_returned_reference = EG(active_op_array)->return_reference;
-
-               if (return_value_used && !EX_T(opline->result.u.var).var.ptr) {
-                       if (!EG(exception)) {
-                               ALLOC_ZVAL(EX_T(opline->result.u.var).var.ptr);
-                               INIT_ZVAL(*EX_T(opline->result.u.var).var.ptr);
-                       }
-               } else if (!return_value_used && EX_T(opline->result.u.var).var.ptr) {
-                       zval_ptr_dtor(&EX_T(opline->result.u.var).var.ptr);
-               }
-
-               EG(opline_ptr) = &EX(opline);
-               EG(active_op_array) = EX(op_array);
-               EG(return_value_ptr_ptr)=original_return_value;
-               if (EG(symtable_cache_ptr)>=EG(symtable_cache_limit)) {
-                       zend_hash_destroy(EX(function_state).function_symbol_table);
-                       FREE_HASHTABLE(EX(function_state).function_symbol_table);
-               } else {
-                       /* clean before putting into the cache, since clean
-                          could call dtors, which could use cached hash */
-                       zend_hash_clean(EX(function_state).function_symbol_table);
-                       *(++EG(symtable_cache_ptr)) = EX(function_state).function_symbol_table;
-               }
-               EG(active_symbol_table) = calling_symbol_table;
-       } else { /* ZEND_OVERLOADED_FUNCTION */
-               ALLOC_ZVAL(EX_T(opline->result.u.var).var.ptr);
-               INIT_ZVAL(*(EX_T(opline->result.u.var).var.ptr));
-
-                       /* Not sure what should be done here if it's a static method */
-               if (EX(object)) {
-                       Z_OBJ_HT_P(EX(object))->call_method(EX(fbc)->common.function_name, opline->extended_value, EX_T(opline->result.u.var).var.ptr, EX(object), return_value_used TSRMLS_CC);
-               } else {
-                       zend_error_noreturn(E_ERROR, "Cannot call overloaded function for non-object");
-               }
-
-               if (EX(function_state).function->type == ZEND_OVERLOADED_FUNCTION_TEMPORARY) {
-                       efree(EX(function_state).function->common.function_name);
-               }
-               efree(EX(fbc));
-
-               if (!return_value_used) {
-                       zval_ptr_dtor(&EX_T(opline->result.u.var).var.ptr);
-               } else {
-                       EX_T(opline->result.u.var).var.ptr->is_ref = 0;
-                       EX_T(opline->result.u.var).var.ptr->refcount = 1;
-               }
-       }
-
-       if (EG(This)) {
-               if (EG(exception) && EX(fbc) && EX(fbc)->common.fn_flags&ZEND_ACC_CTOR) {
-                       EG(This)->refcount--;
-                       if (EG(This)->refcount == 1) {
-                               zend_object_store_ctor_failed(EG(This) TSRMLS_CC);
-                       }
-                       if (should_change_scope && EG(This) != current_this) {
-                               zval_ptr_dtor(&EG(This));
-                       }
-               } else if (should_change_scope) {
-                       zval_ptr_dtor(&EG(This));
-               }
-       }
-
-       if (should_change_scope) {
-               EG(This) = current_this;
-               EG(scope) = current_scope;
-       }
-       zend_ptr_stack_3_pop(&EG(arg_types_stack), (void**)&EX(calling_scope), (void**)&EX(object), (void**)&EX(fbc));
-
-       EX(function_state).function = (zend_function *) EX(op_array);
-       EG(function_state_ptr) = &EX(function_state);
-       zend_ptr_stack_clear_multiple(TSRMLS_C);
-
-       if (EG(exception)) {
-               zend_throw_exception_internal(NULL TSRMLS_CC);
-               if (return_value_used && EX_T(opline->result.u.var).var.ptr) {
-                       zval_ptr_dtor(&EX_T(opline->result.u.var).var.ptr);
-               }
-       }
-
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_DO_FCALL_BY_NAME_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       EX(function_state).function = EX(fbc);
-       return zend_do_fcall_common_helper(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
-}
-
-static int ZEND_DO_FCALL_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zend_free_op free_op1;
-       zval *fname = get_zval_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_R);
-
-       zend_ptr_stack_3_push(&EG(arg_types_stack), EX(fbc), EX(object), EX(calling_scope));
-
-       if (zend_hash_find(EG(function_table), fname->value.str.val, fname->value.str.len+1, (void **) &EX(function_state).function)==FAILURE) {
-               zend_error_noreturn(E_ERROR, "Unknown function:  %s()\n", fname->value.str.val);
-       }
-       EX(object) = NULL;
-       EX(calling_scope) = EX(function_state).function->common.scope;
-
-       FREE_OP(free_op1);
-
-       return zend_do_fcall_common_helper(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
-}
-
-static int ZEND_RETURN_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zval *retval_ptr;
-       zval **retval_ptr_ptr;
-       zend_free_op free_op1;
-
-       if (EG(active_op_array)->return_reference == ZEND_RETURN_REF) {
-
-               if (opline->op1.op_type == IS_CONST || opline->op1.op_type == IS_TMP_VAR) {
-                       /* Not supposed to happen, but we'll allow it */
-                       zend_error(E_STRICT, "Only variable references should be returned by reference");
-                       goto return_by_value;
-               }
-
-               retval_ptr_ptr = get_zval_ptr_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_W);
-
-               if (!retval_ptr_ptr) {
-                       zend_error_noreturn(E_ERROR, "Cannot return string offsets by reference");
-               }
-
-               if (opline->op1.op_type == IS_VAR && !(*retval_ptr_ptr)->is_ref) {
-                       if (EX_T(opline->op1.u.var).var.ptr_ptr == &EX_T(opline->op1.u.var).var.ptr
-                               || (opline->extended_value == ZEND_RETURNS_FUNCTION && !EX_T(opline->op1.u.var).var.fcall_returned_reference)) {
-                               if (opline->op1.op_type == IS_VAR && free_op1.var == NULL) {
-                                       PZVAL_LOCK(*retval_ptr_ptr); /* undo the effect of get_zval_ptr_ptr() */
-                               }
-                               zend_error(E_STRICT, "Only variable references should be returned by reference");
-                               goto return_by_value;
-                       }
-               }
-
-               SEPARATE_ZVAL_TO_MAKE_IS_REF(retval_ptr_ptr);
-               (*retval_ptr_ptr)->refcount++;
-
-               (*EG(return_value_ptr_ptr)) = (*retval_ptr_ptr);
-       } else {
-return_by_value:
-
-               retval_ptr = get_zval_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_R);
-
-               if (EG(ze1_compatibility_mode) && Z_TYPE_P(retval_ptr) == IS_OBJECT) {
-                       zval *ret;
-
-                       ALLOC_ZVAL(ret);
-                       INIT_PZVAL_COPY(ret, retval_ptr);
-                       if (Z_OBJ_HT_P(retval_ptr)->clone_obj == NULL) {
-                               zend_error_noreturn(E_ERROR, "Trying to clone an uncloneable object of class %s",  Z_OBJCE_P(retval_ptr)->name);
-                       }
-                       zend_error(E_STRICT, "Implicit cloning object of class '%s' because of 'zend.ze1_compatibility_mode'", Z_OBJCE_P(retval_ptr)->name);
-                       ret->value.obj = Z_OBJ_HT_P(retval_ptr)->clone_obj(retval_ptr TSRMLS_CC);
-                       *EG(return_value_ptr_ptr) = ret;
-               } else if (!IS_TMP_FREE(free_op1)) { /* Not a temp var */
-                       if (EG(active_op_array)->return_reference == ZEND_RETURN_REF ||
-                           (PZVAL_IS_REF(retval_ptr) && retval_ptr->refcount > 0)) {
-                               zval *ret;
-
-                               ALLOC_ZVAL(ret);
-                               INIT_PZVAL_COPY(ret, retval_ptr);
-                               zval_copy_ctor(ret);
-                               *EG(return_value_ptr_ptr) = ret;
-                       } else {
-                               *EG(return_value_ptr_ptr) = retval_ptr;
-                               retval_ptr->refcount++;
-                       }
-               } else {
-                       zval *ret;
-
-                       ALLOC_ZVAL(ret);
-                       INIT_PZVAL_COPY(ret, retval_ptr);
-                       *EG(return_value_ptr_ptr) = ret;
-               }
-       }
-       FREE_OP_IF_VAR(free_op1);
-       ZEND_VM_RETURN_FROM_EXECUTE_LOOP();
-}
-
-static int ZEND_THROW_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zval *value;
-       zval *exception;
-       zend_free_op free_op1;
-
-       value = get_zval_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_R);
-
-       if (value->type != IS_OBJECT) {
-               zend_error_noreturn(E_ERROR, "Can only throw objects");
-       }
-       /* Not sure if a complete copy is what we want here */
-       ALLOC_ZVAL(exception);
-       INIT_PZVAL_COPY(exception, value);
-       if (!IS_TMP_FREE(free_op1)) {
-               zval_copy_ctor(exception);
-       }
-
-       zend_throw_exception_object(exception TSRMLS_CC);
-       FREE_OP_IF_VAR(free_op1);
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_CATCH_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zend_class_entry *ce;
-
-       /* Check whether an exception has been thrown, if not, jump over code */
-       if (EG(exception) == NULL) {
-               ZEND_VM_SET_OPCODE(&EX(op_array)->opcodes[opline->extended_value]);
-               ZEND_VM_CONTINUE(); /* CHECK_ME */
-       }
-       ce = Z_OBJCE_P(EG(exception));
-       if (ce != EX_T(opline->op1.u.var).class_entry) {
-               if (!instanceof_function(ce, EX_T(opline->op1.u.var).class_entry TSRMLS_CC)) {
-                       if (opline->op1.u.EA.type) {
-                               zend_throw_exception_internal(NULL TSRMLS_CC);
-                               ZEND_VM_NEXT_OPCODE();
-                       }
-                       ZEND_VM_SET_OPCODE(&EX(op_array)->opcodes[opline->extended_value]);
-                       ZEND_VM_CONTINUE(); /* CHECK_ME */
-               }
-       }
-
-       zend_hash_update(EG(active_symbol_table), opline->op2.u.constant.value.str.val,
-               opline->op2.u.constant.value.str.len+1, &EG(exception), sizeof(zval *), (void **) NULL);
-       EG(exception) = NULL;
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_SEND_VAL_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       if (opline->extended_value==ZEND_DO_FCALL_BY_NAME
-               && ARG_SHOULD_BE_SENT_BY_REF(EX(fbc), opline->op2.u.opline_num)) {
-                       zend_error_noreturn(E_ERROR, "Cannot pass parameter %d by reference", opline->op2.u.opline_num);
-       }
-       {
-               zval *valptr;
-               zval *value;
-               zend_free_op free_op1;
-
-               value = get_zval_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_R);
-
-               ALLOC_ZVAL(valptr);
-               INIT_PZVAL_COPY(valptr, value);
-               if (!IS_TMP_FREE(free_op1)) {
-                       zval_copy_ctor(valptr);
-               }
-               zend_ptr_stack_push(&EG(argument_stack), valptr);
-               FREE_OP_IF_VAR(free_op1);
-       }
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int zend_send_by_var_helper(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zval *varptr;
-       zend_free_op free_op1;
-       varptr = get_zval_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_R);
-
-       if (varptr == &EG(uninitialized_zval)) {
-               ALLOC_ZVAL(varptr);
-               INIT_ZVAL(*varptr);
-               varptr->refcount = 0;
-       } else if (PZVAL_IS_REF(varptr)) {
-               zval *original_var = varptr;
-
-               ALLOC_ZVAL(varptr);
-               *varptr = *original_var;
-               varptr->is_ref = 0;
-               varptr->refcount = 0;
-               zval_copy_ctor(varptr);
-       }
-       varptr->refcount++;
-       zend_ptr_stack_push(&EG(argument_stack), varptr);
-       FREE_OP(free_op1);  /* for string offsets */
-
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_SEND_VAR_NO_REF_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       if (opline->extended_value & ZEND_ARG_COMPILE_TIME_BOUND) { /* Had function_ptr at compile_time */
-               if (!(opline->extended_value & ZEND_ARG_SEND_BY_REF)) {
-                       return zend_send_by_var_helper(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
-               }
-       } else if (!ARG_SHOULD_BE_SENT_BY_REF(EX(fbc), opline->op2.u.opline_num)) {
-               return zend_send_by_var_helper(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
-       }
-       {
-               zval *varptr;
-               zend_free_op free_op1;
-               varptr = get_zval_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_R);
-
-               if (varptr != &EG(uninitialized_zval) && (PZVAL_IS_REF(varptr) || varptr->refcount == 1)) {
-                       varptr->is_ref = 1;
-                       varptr->refcount++;
-                       zend_ptr_stack_push(&EG(argument_stack), varptr);
-                       FREE_OP_IF_VAR(free_op1);
-                       ZEND_VM_NEXT_OPCODE();
-               }
-               zend_error_noreturn(E_ERROR, "Only variables can be passed by reference");
-       }
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_SEND_REF_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zend_free_op free_op1;
-       zval **varptr_ptr;
-       zval *varptr;
-       varptr_ptr = get_zval_ptr_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_W);
-
-       if (!varptr_ptr) {
-               zend_error_noreturn(E_ERROR, "Only variables can be passed by reference");
-       }
-
-       SEPARATE_ZVAL_TO_MAKE_IS_REF(varptr_ptr);
-       varptr = *varptr_ptr;
-       varptr->refcount++;
-       zend_ptr_stack_push(&EG(argument_stack), varptr);
-
-       if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_SEND_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-
-       if ((opline->extended_value == ZEND_DO_FCALL_BY_NAME)
-               && ARG_SHOULD_BE_SENT_BY_REF(EX(fbc), opline->op2.u.opline_num)) {
-               return ZEND_SEND_REF_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
-       }
-       return zend_send_by_var_helper(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
-}
-
-static int ZEND_RECV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zval **param;
-       zend_uint arg_num = opline->op1.u.constant.value.lval;
-
-       if (zend_ptr_stack_get_arg(arg_num, (void **) &param TSRMLS_CC)==FAILURE) {
-               char *space;
-               char *class_name = get_active_class_name(&space TSRMLS_CC);
-               zend_execute_data *ptr = EX(prev_execute_data);
-
-               zend_verify_arg_type((zend_function *) EG(active_op_array), arg_num, NULL TSRMLS_CC);
-               if(ptr && ptr->op_array) {
-                       zend_error(E_WARNING, "Missing argument %ld for %s%s%s(), called in %s on line %d and defined", opline->op1.u.constant.value.lval, class_name, space, get_active_function_name(TSRMLS_C), ptr->op_array->filename, ptr->opline->lineno);
-               } else {
-                       zend_error(E_WARNING, "Missing argument %ld for %s%s%s()", opline->op1.u.constant.value.lval, class_name, space, get_active_function_name(TSRMLS_C));
-               }
-               if (opline->result.op_type == IS_VAR) {
-                       PZVAL_UNLOCK_FREE(*EX_T(opline->result.u.var).var.ptr_ptr);
-               }
-       } else {
-               zend_free_op free_res;
-               zval **var_ptr;
-
-               zend_verify_arg_type((zend_function *) EG(active_op_array), arg_num, *param TSRMLS_CC);
-               var_ptr = get_zval_ptr_ptr(&opline->result, EX(Ts), &free_res, BP_VAR_W);
-               if (PZVAL_IS_REF(*param)) {
-                       zend_assign_to_variable_reference(var_ptr, param TSRMLS_CC);
-               } else {
-                       zend_receive(var_ptr, *param TSRMLS_CC);
-               }
-       }
-
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_RECV_INIT_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zval **param, *assignment_value;
-       zend_uint arg_num = opline->op1.u.constant.value.lval;
-       zend_free_op free_res;
-
-       if (zend_ptr_stack_get_arg(arg_num, (void **) &param TSRMLS_CC)==FAILURE) {
-               if (opline->op2.u.constant.type == IS_CONSTANT || opline->op2.u.constant.type==IS_CONSTANT_ARRAY) {
-                       zval *default_value;
-
-                       ALLOC_ZVAL(default_value);
-                       *default_value = opline->op2.u.constant;
-                       if (opline->op2.u.constant.type==IS_CONSTANT_ARRAY) {
-                               zval_copy_ctor(default_value);
-                       }
-                       default_value->refcount=1;
-                       zval_update_constant(&default_value, 0 TSRMLS_CC);
-                       default_value->refcount=0;
-                       default_value->is_ref=0;
-                       param = &default_value;
-                       assignment_value = default_value;
-               } else {
-                       param = NULL;
-                       assignment_value = &opline->op2.u.constant;
-               }
-               zend_verify_arg_type((zend_function *) EG(active_op_array), arg_num, assignment_value TSRMLS_CC);
-               zend_assign_to_variable(NULL, &opline->result, NULL, assignment_value, IS_VAR, EX(Ts) TSRMLS_CC);
-       } else {
-               zval **var_ptr = get_zval_ptr_ptr(&opline->result, EX(Ts), &free_res, BP_VAR_W);
-
-               assignment_value = *param;
-               zend_verify_arg_type((zend_function *) EG(active_op_array), arg_num, assignment_value TSRMLS_CC);
-               if (PZVAL_IS_REF(assignment_value)) {
-                       zend_assign_to_variable_reference(var_ptr, param TSRMLS_CC);
-               } else {
-                       zend_receive(var_ptr, assignment_value TSRMLS_CC);
-               }
-       }
-
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_BOOL_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zend_free_op free_op1;
-
-       /* PHP 3.0 returned "" for false and 1 for true, here we use 0 and 1 for now */
-       EX_T(opline->result.u.var).tmp_var.value.lval = i_zend_is_true(get_zval_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_R));
-       EX_T(opline->result.u.var).tmp_var.type = IS_BOOL;
-       FREE_OP(free_op1);
-
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_BRK_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zend_free_op free_op2;
-
-       ZEND_VM_SET_OPCODE(EX(op_array)->opcodes +
-         zend_brk_cont(get_zval_ptr(&opline->op2, EX(Ts), &free_op2, BP_VAR_R),
-           opline->op1.u.opline_num,
-           EX(op_array), EX(Ts) TSRMLS_CC)->brk);
-       FREE_OP(free_op2);
-       ZEND_VM_CONTINUE(); /* CHECK_ME */
-}
-
-static int ZEND_CONT_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zend_free_op free_op2;
-
-       ZEND_VM_SET_OPCODE(EX(op_array)->opcodes +
-         zend_brk_cont(get_zval_ptr(&opline->op2, EX(Ts), &free_op2, BP_VAR_R),
-           opline->op1.u.opline_num,
-           EX(op_array), EX(Ts) TSRMLS_CC)->cont);
-       FREE_OP(free_op2);
-       ZEND_VM_CONTINUE(); /* CHECK_ME */
-}
-
-static int ZEND_CASE_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       int switch_expr_is_overloaded=0;
-       zend_free_op free_op1, free_op2;
-
-       if (opline->op1.op_type==IS_VAR) {
-               if (EX_T(opline->op1.u.var).var.ptr_ptr) {
-                       PZVAL_LOCK(EX_T(opline->op1.u.var).var.ptr);
-               } else {
-                       switch_expr_is_overloaded = 1;
-                       EX_T(opline->op1.u.var).str_offset.str->refcount++;
-               }
-       }
-       is_equal_function(&EX_T(opline->result.u.var).tmp_var,
-                                get_zval_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_R),
-                                get_zval_ptr(&opline->op2, EX(Ts), &free_op2, BP_VAR_R) TSRMLS_CC);
-
-       FREE_OP(free_op2);
-       if (switch_expr_is_overloaded) {
-               /* We only free op1 if this is a string offset,
-                * Since if it is a TMP_VAR, it'll be reused by
-                * other CASE opcodes (whereas string offsets
-                * are allocated at each get_zval_ptr())
-                */
-               FREE_OP(free_op1);
-               EX_T(opline->op1.u.var).var.ptr_ptr = NULL;
-               AI_USE_PTR(EX_T(opline->op1.u.var).var);
-       }
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_SWITCH_FREE_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_switch_free(EX(opline), EX(Ts) TSRMLS_CC);
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_NEW_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zval *object_zval;
-       zend_function *constructor;
-
-       if (EX_T(opline->op1.u.var).class_entry->ce_flags & (ZEND_ACC_INTERFACE|ZEND_ACC_IMPLICIT_ABSTRACT_CLASS|ZEND_ACC_EXPLICIT_ABSTRACT_CLASS)) {
-               char *class_type;
-
-               if (EX_T(opline->op1.u.var).class_entry->ce_flags & ZEND_ACC_INTERFACE) {
-                       class_type = "interface";
-               } else {
-                       class_type = "abstract class";
-               }
-               zend_error_noreturn(E_ERROR, "Cannot instantiate %s %s", class_type,  EX_T(opline->op1.u.var).class_entry->name);
-       }
-       ALLOC_ZVAL(object_zval);
-       object_init_ex(object_zval, EX_T(opline->op1.u.var).class_entry);
-       INIT_PZVAL(object_zval);
-
-       constructor = Z_OBJ_HT_P(object_zval)->get_constructor(object_zval TSRMLS_CC);
-
-       if (constructor == NULL) {
-               EX(fbc_constructor) = NULL;
-               if (RETURN_VALUE_USED(opline)) {
-                       EX_T(opline->result.u.var).var.ptr_ptr = &EX_T(opline->result.u.var).var.ptr;
-                       EX_T(opline->result.u.var).var.ptr = object_zval;
-               } else {
-                       zval_ptr_dtor(&object_zval);
-               }
-               ZEND_VM_SET_OPCODE(EX(op_array)->opcodes + opline->op2.u.opline_num);
-               ZEND_VM_CONTINUE_JMP();
-       } else {
-               EX(fbc_constructor) = constructor;
-
-               SELECTIVE_PZVAL_LOCK(object_zval, &opline->result);
-               EX_T(opline->result.u.var).var.ptr_ptr = &EX_T(opline->result.u.var).var.ptr;
-               EX_T(opline->result.u.var).var.ptr = object_zval;
-               
-               zend_ptr_stack_3_push(&EG(arg_types_stack), EX(fbc), EX(object), EX(calling_scope));
-
-               /* We are not handling overloaded classes right now */
-               EX(object) = object_zval;
-
-               EX(fbc) = EX(fbc_constructor);
-
-               if (EX(fbc)->type == ZEND_USER_FUNCTION) { /* HACK!! */
-                       EX(calling_scope) = EX(fbc)->common.scope;
-               } else {
-                       EX(calling_scope) = NULL;
-               }
-               ZEND_VM_NEXT_OPCODE();
-       }
-}
-
-static int ZEND_CLONE_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zend_free_op free_op1;
-       zval *obj = get_obj_zval_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_R);
-       zend_class_entry *ce;
-       zend_function *clone;
-       zend_object_clone_obj_t clone_call;
-
-       if (!obj || Z_TYPE_P(obj) != IS_OBJECT) {
-               zend_error(E_WARNING, "__clone method called on non-object");
-               EX_T(opline->result.u.var).var.ptr = EG(error_zval_ptr);
-               EX_T(opline->result.u.var).var.ptr->refcount++;
-               FREE_OP_IF_VAR(free_op1);
-               ZEND_VM_NEXT_OPCODE();
-       }
-
-       ce = Z_OBJCE_P(obj);
-       clone = ce ? ce->clone : NULL;
-       clone_call =  Z_OBJ_HT_P(obj)->clone_obj;
-       if (!clone_call) {
-               zend_error_noreturn(E_ERROR, "Trying to clone an uncloneable object of class %s", ce->name);
-               EX_T(opline->result.u.var).var.ptr = EG(error_zval_ptr);
-               EX_T(opline->result.u.var).var.ptr->refcount++;
-       }
-
-       if (ce && clone) {
-               if (clone->op_array.fn_flags & ZEND_ACC_PRIVATE) {
-                       /* Ensure that if we're calling a private function, we're allowed to do so.
-                        */
-                       if (ce != EG(scope)) {
-                               zend_error_noreturn(E_ERROR, "Call to private %s::__clone() from context '%s'", ce->name, EG(scope) ? EG(scope)->name : "");
-                       }
-               } else if ((clone->common.fn_flags & ZEND_ACC_PROTECTED)) {
-                       /* Ensure that if we're calling a protected function, we're allowed to do so.
-                        */
-                       if (!zend_check_protected(clone->common.scope, EG(scope))) {
-                               zend_error_noreturn(E_ERROR, "Call to protected %s::__clone() from context '%s'", ce->name, EG(scope) ? EG(scope)->name : "");
-                       }
-               }
-       }
-
-       EX_T(opline->result.u.var).var.ptr_ptr = &EX_T(opline->result.u.var).var.ptr;
-       ALLOC_ZVAL(EX_T(opline->result.u.var).var.ptr);
-       EX_T(opline->result.u.var).var.ptr->value.obj = clone_call(obj TSRMLS_CC);
-       if (EG(exception)) {
-               FREE_ZVAL(EX_T(opline->result.u.var).var.ptr);
-       } else {
-               EX_T(opline->result.u.var).var.ptr->type = IS_OBJECT;
-               EX_T(opline->result.u.var).var.ptr->refcount=1;
-               EX_T(opline->result.u.var).var.ptr->is_ref=1;
-       }
-       FREE_OP_IF_VAR(free_op1);
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_FETCH_CONSTANT_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zend_class_entry *ce = NULL;
-       zval **value;
-
-       if (opline->op1.op_type == IS_UNUSED) {
-/* This seems to be a reminant of namespaces
-               if (EG(scope)) {
-                       ce = EG(scope);
-                       if (zend_hash_find(&ce->constants_table, opline->op2.u.constant.value.str.val, opline->op2.u.constant.value.str.len+1, (void **) &value) == SUCCESS) {
-                               zval_update_constant(value, (void *) 1 TSRMLS_CC);
-                               EX_T(opline->result.u.var).tmp_var = **value;
-                               zval_copy_ctor(&EX_T(opline->result.u.var).tmp_var);
-                               ZEND_VM_NEXT_OPCODE();
-                       }
-               }
-*/
-               if (!zend_get_constant(opline->op2.u.constant.value.str.val, opline->op2.u.constant.value.str.len, &EX_T(opline->result.u.var).tmp_var TSRMLS_CC)) {
-                       zend_error(E_NOTICE, "Use of undefined constant %s - assumed '%s'",
-                                               opline->op2.u.constant.value.str.val,
-                                               opline->op2.u.constant.value.str.val);
-                       EX_T(opline->result.u.var).tmp_var = opline->op2.u.constant;
-                       zval_copy_ctor(&EX_T(opline->result.u.var).tmp_var);
-               }
-               ZEND_VM_NEXT_OPCODE();
-       }
-
-       ce = EX_T(opline->op1.u.var).class_entry;
-
-       if (zend_hash_find(&ce->constants_table, opline->op2.u.constant.value.str.val, opline->op2.u.constant.value.str.len+1, (void **) &value) == SUCCESS) {
-               zval_update_constant(value, (void *) 1 TSRMLS_CC);
-               EX_T(opline->result.u.var).tmp_var = **value;
-               zval_copy_ctor(&EX_T(opline->result.u.var).tmp_var);
-       } else {
-               zend_error_noreturn(E_ERROR, "Undefined class constant '%s'", opline->op2.u.constant.value.str.val);
-       }
-
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_ADD_ARRAY_ELEMENT_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
-       zval *array_ptr = &EX_T(opline->result.u.var).tmp_var;
-       zval *expr_ptr, **expr_ptr_ptr = NULL;
-       zval *offset=get_zval_ptr(&opline->op2, EX(Ts), &free_op2, BP_VAR_R);
-
-       if (opline->extended_value) {
-               expr_ptr_ptr=get_zval_ptr_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_W);
-               expr_ptr = *expr_ptr_ptr;
-       } else {
-               expr_ptr=get_zval_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_R);
-       }
-
-       if (opline->opcode == ZEND_INIT_ARRAY) {
-               array_init(array_ptr);
-               if (!expr_ptr) {
-                       ZEND_VM_NEXT_OPCODE();
-               }
-       }
-       if (!opline->extended_value && IS_TMP_FREE(free_op1)) { /* temporary variable */
-               zval *new_expr;
-
-               ALLOC_ZVAL(new_expr);
-               INIT_PZVAL_COPY(new_expr, expr_ptr);
-               expr_ptr = new_expr;
-       } else {
-               if (opline->extended_value) {
-                       SEPARATE_ZVAL_TO_MAKE_IS_REF(expr_ptr_ptr);
-                       expr_ptr = *expr_ptr_ptr;
-                       expr_ptr->refcount++;
-               } else if (PZVAL_IS_REF(expr_ptr)) {
-                       zval *new_expr;
-
-                       ALLOC_ZVAL(new_expr);
-                       INIT_PZVAL_COPY(new_expr, expr_ptr);
-                       expr_ptr = new_expr;
-                       zendi_zval_copy_ctor(*expr_ptr);
-               } else {
-                       expr_ptr->refcount++;
-               }
-       }
-       if (offset) {
-               switch (offset->type) {
-                       case IS_DOUBLE:
-                               zend_hash_index_update(array_ptr->value.ht, (long) offset->value.dval, &expr_ptr, sizeof(zval *), NULL);
-                               break;
-                       case IS_LONG:
-                       case IS_BOOL:
-                               zend_hash_index_update(array_ptr->value.ht, offset->value.lval, &expr_ptr, sizeof(zval *), NULL);
-                               break;
-                       case IS_STRING:
-                               zend_symtable_update(array_ptr->value.ht, offset->value.str.val, offset->value.str.len+1, &expr_ptr, sizeof(zval *), NULL);
-                               break;
-                       case IS_NULL:
-                               zend_hash_update(array_ptr->value.ht, "", sizeof(""), &expr_ptr, sizeof(zval *), NULL);
-                               break;
-                       default:
-                               zend_error(E_WARNING, "Illegal offset type");
-                               zval_ptr_dtor(&expr_ptr);
-                               /* do nothing */
-                               break;
-               }
-               FREE_OP(free_op2);
-       } else {
-               zend_hash_next_index_insert(array_ptr->value.ht, &expr_ptr, sizeof(zval *), NULL);
-       }
-       if (opline->extended_value) {
-               if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-       } else {
-               FREE_OP_IF_VAR(free_op1);
-       }
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_INIT_ARRAY_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       return ZEND_ADD_ARRAY_ELEMENT_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
-}
-
-static int ZEND_CAST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zend_free_op free_op1;
-       zval *expr = get_zval_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_R);
-       zval *result = &EX_T(opline->result.u.var).tmp_var;
-
-       *result = *expr;
-       if (!IS_TMP_FREE(free_op1)) {
-               zendi_zval_copy_ctor(*result);
-       }
-       switch (opline->extended_value) {
-               case IS_NULL:
-                       convert_to_null(result);
-                       break;
-               case IS_BOOL:
-                       convert_to_boolean(result);
-                       break;
-               case IS_LONG:
-                       convert_to_long(result);
-                       break;
-               case IS_DOUBLE:
-                       convert_to_double(result);
-                       break;
-               case IS_STRING: {
-                       zval var_copy;
-                       int use_copy;
-
-                       zend_make_printable_zval(result, &var_copy, &use_copy);
-                       if (use_copy) {
-                               zval_dtor(result);
-                               *result = var_copy;
-                       }
-                       break;
-               }
-               case IS_ARRAY:
-                       convert_to_array(result);
-                       break;
-               case IS_OBJECT:
-                       convert_to_object(result);
-                       break;
-       }
-       FREE_OP_IF_VAR(free_op1);
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_INCLUDE_OR_EVAL_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zend_op_array *new_op_array=NULL;
-       zval **original_return_value = EG(return_value_ptr_ptr);
-       int return_value_used;
-       zend_free_op free_op1;
-       zval *inc_filename = get_zval_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_R);
-       zval tmp_inc_filename;
-       zend_bool failure_retval=0;
-
-       if (inc_filename->type!=IS_STRING) {
-               tmp_inc_filename = *inc_filename;
-               zval_copy_ctor(&tmp_inc_filename);
-               convert_to_string(&tmp_inc_filename);
-               inc_filename = &tmp_inc_filename;
-       }
-
-       return_value_used = RETURN_VALUE_USED(opline);
-
-       switch (opline->op2.u.constant.value.lval) {
-               case ZEND_INCLUDE_ONCE:
-               case ZEND_REQUIRE_ONCE: {
-                               int dummy = 1;
-                               zend_file_handle file_handle;
-
-                               if (SUCCESS == zend_stream_open(inc_filename->value.str.val, &file_handle TSRMLS_CC)) {
-
-                                       if (!file_handle.opened_path) {
-                                               file_handle.opened_path = estrndup(inc_filename->value.str.val, inc_filename->value.str.len);
-                                       }
-
-                                       if (zend_hash_add(&EG(included_files), file_handle.opened_path, strlen(file_handle.opened_path)+1, (void *)&dummy, sizeof(int), NULL)==SUCCESS) {
-                                               new_op_array = zend_compile_file(&file_handle, (opline->op2.u.constant.value.lval==ZEND_INCLUDE_ONCE?ZEND_INCLUDE:ZEND_REQUIRE) TSRMLS_CC);
-                                               zend_destroy_file_handle(&file_handle TSRMLS_CC);
-                                       } else {
-                                               zend_file_handle_dtor(&file_handle);
-                                               failure_retval=1;
-                                       }
-                               } else {
-                                       if (opline->op2.u.constant.value.lval==ZEND_INCLUDE_ONCE) {
-                                               zend_message_dispatcher(ZMSG_FAILED_INCLUDE_FOPEN, inc_filename->value.str.val);
-                                       } else {
-                                               zend_message_dispatcher(ZMSG_FAILED_REQUIRE_FOPEN, inc_filename->value.str.val);
-                                       }
-                               }
-                               break;
-                       }
-                       break;
-               case ZEND_INCLUDE:
-               case ZEND_REQUIRE:
-                       new_op_array = compile_filename(opline->op2.u.constant.value.lval, inc_filename TSRMLS_CC);
-                       break;
-               case ZEND_EVAL: {
-                               char *eval_desc = zend_make_compiled_string_description("eval()'d code" TSRMLS_CC);
-
-                               new_op_array = compile_string(inc_filename, eval_desc TSRMLS_CC);
-                               efree(eval_desc);
-                       }
-                       break;
-               EMPTY_SWITCH_DEFAULT_CASE()
-       }
-       if (inc_filename==&tmp_inc_filename) {
-               zval_dtor(&tmp_inc_filename);
-       }
-       FREE_OP(free_op1);
-       EX_T(opline->result.u.var).var.ptr_ptr = &EX_T(opline->result.u.var).var.ptr;
-       if (new_op_array) {
-               zval *saved_object;
-               zend_function *saved_function;
-
-               EG(return_value_ptr_ptr) = EX_T(opline->result.u.var).var.ptr_ptr;
-               EG(active_op_array) = new_op_array;
-               EX_T(opline->result.u.var).var.ptr = NULL;
-
-               saved_object = EX(object);
-               saved_function = EX(function_state).function;
-
-               EX(function_state).function = (zend_function *) new_op_array;
-               EX(object) = NULL;
-
-               zend_execute(new_op_array TSRMLS_CC);
-
-               EX(function_state).function = saved_function;
-               EX(object) = saved_object;
-
-               if (!return_value_used) {
-                       if (EX_T(opline->result.u.var).var.ptr) {
-                               zval_ptr_dtor(&EX_T(opline->result.u.var).var.ptr);
-                       }
-               } else { /* return value is used */
-                       if (!EX_T(opline->result.u.var).var.ptr) { /* there was no return statement */
-                               ALLOC_ZVAL(EX_T(opline->result.u.var).var.ptr);
-                               INIT_PZVAL(EX_T(opline->result.u.var).var.ptr);
-                               EX_T(opline->result.u.var).var.ptr->value.lval = 1;
-                               EX_T(opline->result.u.var).var.ptr->type = IS_BOOL;
-                       }
-               }
-
-               EG(opline_ptr) = &EX(opline);
-               EG(active_op_array) = EX(op_array);
-               EG(function_state_ptr) = &EX(function_state);
-               destroy_op_array(new_op_array TSRMLS_CC);
-               efree(new_op_array);
-               if (EG(exception)) {
-                       zend_throw_exception_internal(NULL TSRMLS_CC);
-               }
-       } else {
-               if (return_value_used) {
-                       ALLOC_ZVAL(EX_T(opline->result.u.var).var.ptr);
-                       INIT_ZVAL(*EX_T(opline->result.u.var).var.ptr);
-                       EX_T(opline->result.u.var).var.ptr->value.lval = failure_retval;
-                       EX_T(opline->result.u.var).var.ptr->type = IS_BOOL;
-               }
-       }
-       EG(return_value_ptr_ptr) = original_return_value;
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_UNSET_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zval tmp, *varname;
-       HashTable *target_symbol_table;
-       zend_free_op free_op1;
-
-       varname = get_zval_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_R);
-
-       if (varname->type != IS_STRING) {
-               tmp = *varname;
-               zval_copy_ctor(&tmp);
-               convert_to_string(&tmp);
-               varname = &tmp;
-       }
-
-       if (opline->op2.u.EA.type == ZEND_FETCH_STATIC_MEMBER) {
-               zend_std_unset_static_property(EX_T(opline->op2.u.var).class_entry, Z_STRVAL_P(varname), Z_STRLEN_P(varname) TSRMLS_CC);
-       } else {
-               target_symbol_table = zend_get_target_symbol_table(opline, EX(Ts), BP_VAR_IS, varname TSRMLS_CC);               
-               if (zend_hash_del(target_symbol_table, varname->value.str.val, varname->value.str.len+1) == SUCCESS) {          
-                       zend_execute_data *ex = execute_data; 
-                       ulong hash_value = zend_inline_hash_func(varname->value.str.val, varname->value.str.len+1);
-
-                       do {
-                               int i;
-
-                               for (i = 0; i < ex->op_array->last_var; i++) {
-                                       if (ex->op_array->vars[i].hash_value == hash_value &&
-                                               ex->op_array->vars[i].name_len == varname->value.str.len &&
-                                               !memcmp(ex->op_array->vars[i].name, varname->value.str.val, varname->value.str.len)) {
-                                               ex->CVs[i] = NULL;
-                                               break;
-                                       }
-                               }
-                 ex = ex->prev_execute_data;
-                 } while (ex && ex->symbol_table == target_symbol_table);
-               }
-       }
-
-       if (varname == &tmp) {
-               zval_dtor(&tmp);
-       }
-       FREE_OP(free_op1);
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_UNSET_DIM_OBJ_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zend_free_op free_op1, free_op2;
-       zval **container = get_obj_zval_ptr_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_UNSET);
-       zval *offset = get_zval_ptr(&opline->op2, EX(Ts), &free_op2, BP_VAR_R);
-       long index;
-
-       if (container) {
-
-               if (opline->op1.op_type == IS_CV && container != &EG(uninitialized_zval_ptr)) {
-                       SEPARATE_ZVAL_IF_NOT_REF(container);
-               }
-               if (opline->extended_value == ZEND_UNSET_DIM) {
-                       switch (Z_TYPE_PP(container)) {
-                               case IS_ARRAY: {
-                                       HashTable *ht = Z_ARRVAL_PP(container);
-
-                                       switch (offset->type) {
-                                               case IS_DOUBLE:
-                                               case IS_RESOURCE:
-                                               case IS_BOOL:
-                                               case IS_LONG:
-                                                       if (offset->type == IS_DOUBLE) {
-                                                               index = (long) offset->value.dval;
-                                                       } else {
-                                                               index = offset->value.lval;
-                                                       }
-
-                                                       zend_hash_index_del(ht, index);
-                                                       break;
-                                               case IS_STRING:
-                                                       if (zend_symtable_del(ht, offset->value.str.val, offset->value.str.len+1) == SUCCESS &&
-                                                   ht == &EG(symbol_table)) {
-                                                               zend_execute_data *ex;
-                                                               ulong hash_value = zend_inline_hash_func(offset->value.str.val, offset->value.str.len+1);
-
-                                                               for (ex = execute_data; ex; ex = ex->prev_execute_data) {
-                                                                       if (ex->symbol_table == ht) {
-                                                                               int i;
-
-                                                                               for (i = 0; i < ex->op_array->last_var; i++) {
-                                                                                       if (ex->op_array->vars[i].hash_value == hash_value &&
-                                                                                           ex->op_array->vars[i].name_len == offset->value.str.len &&
-                                                                                           !memcmp(ex->op_array->vars[i].name, offset->value.str.val, offset->value.str.len)) {
-                                                                                               ex->CVs[i] = NULL;
-                                                                                               break;
-                                                                                       }
-                                                                               }
-                                                                       }
-                                                               }
-                                                       }
-                                                       break;
-                                               case IS_NULL:
-                                                       zend_hash_del(ht, "", sizeof(""));
-                                                       break;
-                                               default:
-                                                       zend_error(E_WARNING, "Illegal offset type in unset");
-                                                       break;
-                                       }
-                                       FREE_OP(free_op2);
-                                       break;
-                               }
-                               case IS_OBJECT:
-                                       if (!Z_OBJ_HT_P(*container)->unset_dimension) {
-                                               zend_error_noreturn(E_ERROR, "Cannot use object as array");
-                                       }
-                                       if (IS_TMP_FREE(free_op2)) {
-                                               MAKE_REAL_ZVAL_PTR(offset);
-                                       }
-                                       Z_OBJ_HT_P(*container)->unset_dimension(*container, offset TSRMLS_CC);
-                                       if (IS_TMP_FREE(free_op2)) {
-                                               zval_ptr_dtor(&offset);
-                                       } else {
-                                               FREE_OP(free_op2);
-                                       }
-                                       break;
-                               case IS_STRING:
-                                       zend_error_noreturn(E_ERROR, "Cannot unset string offsets");
-                                       ZEND_VM_CONTINUE(); /* bailed out before */
-                               default:
-                                       FREE_OP(free_op2);
-                                       break;
-                       }
-               } else { /* ZEND_UNSET_OBJ */
-                       if (Z_TYPE_PP(container) == IS_OBJECT) {
-                               if (IS_TMP_FREE(free_op2)) {
-                                       MAKE_REAL_ZVAL_PTR(offset);
-                               }
-                               Z_OBJ_HT_P(*container)->unset_property(*container, offset TSRMLS_CC);
-                               if (IS_TMP_FREE(free_op2)) {
-                                       zval_ptr_dtor(&offset);
-                               } else {
-                                       FREE_OP(free_op2);
-                               }
-                       }
-               }
-       } else {
-               /* overloaded element */
-               FREE_OP(free_op2);
-       }
-       if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_FE_RESET_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zend_free_op free_op1;
-       zval *array_ptr, **array_ptr_ptr;
-       HashTable *fe_ht;
-       zend_object_iterator *iter = NULL;
-       zend_class_entry *ce = NULL;
-       zend_bool is_empty = 0;
-
-       if (opline->extended_value) {
-               array_ptr_ptr = get_zval_ptr_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_R);
-               if (array_ptr_ptr == NULL) {
-                       ALLOC_INIT_ZVAL(array_ptr);
-               } else if (Z_TYPE_PP(array_ptr_ptr) == IS_OBJECT) {
-                       ce = Z_OBJCE_PP(array_ptr_ptr);
-                       if (!ce || ce->get_iterator == NULL) {
-                               SEPARATE_ZVAL_IF_NOT_REF(array_ptr_ptr);
-                               (*array_ptr_ptr)->refcount++;
-                       }
-                       array_ptr = *array_ptr_ptr;
-               } else {
-                       SEPARATE_ZVAL_IF_NOT_REF(array_ptr_ptr);
-                       array_ptr = *array_ptr_ptr;
-                       array_ptr->refcount++;
-               }
-       } else {
-               array_ptr = get_zval_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_R);
-               if (IS_TMP_FREE(free_op1)) { /* IS_TMP_VAR */
-                       zval *tmp;
-
-                       ALLOC_ZVAL(tmp);
-                       INIT_PZVAL_COPY(tmp, array_ptr);
-                       array_ptr = tmp;
-               } else if (Z_TYPE_P(array_ptr) == IS_OBJECT) {
-                       ce = Z_OBJCE_P(array_ptr);
-               } else {
-                       array_ptr->refcount++;
-               }
-       }
-
-       if (ce && ce->get_iterator) {
-               iter = ce->get_iterator(ce, array_ptr TSRMLS_CC);
-
-               if (iter && !EG(exception)) {
-                       array_ptr = zend_iterator_wrap(iter TSRMLS_CC);
-               } else {
-                       if (opline->extended_value) {
-                               if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-                       } else {
-                               FREE_OP_IF_VAR(free_op1);
-                       }
-                       if (!EG(exception)) {
-                               zend_throw_exception_ex(NULL, 0 TSRMLS_CC, "Object of type %s did not create an Iterator", ce->name);
-                       }
-                       zend_throw_exception_internal(NULL TSRMLS_CC);
-                       ZEND_VM_NEXT_OPCODE();
-               }
-       }
-
-       PZVAL_LOCK(array_ptr);
-       EX_T(opline->result.u.var).var.ptr = array_ptr;
-       EX_T(opline->result.u.var).var.ptr_ptr = &EX_T(opline->result.u.var).var.ptr;
-
-       if (iter) {
-               iter->index = 0;
-               if (iter->funcs->rewind) {
-                       iter->funcs->rewind(iter TSRMLS_CC);
-                       if (EG(exception)) {
-                               array_ptr->refcount--;
-                               zval_ptr_dtor(&array_ptr);
-                               ZEND_VM_NEXT_OPCODE();
-                       }
-               }
-               is_empty = iter->funcs->valid(iter TSRMLS_CC) != SUCCESS;
-               if (EG(exception)) {
-                       array_ptr->refcount--;
-                       zval_ptr_dtor(&array_ptr);
-                       ZEND_VM_NEXT_OPCODE();
-               }
-       } else if ((fe_ht = HASH_OF(array_ptr)) != NULL) {
-               zend_hash_internal_pointer_reset(fe_ht);
-               if (ce) {
-                       zend_object *zobj = zend_objects_get_address(array_ptr TSRMLS_CC);
-                       while (zend_hash_has_more_elements(fe_ht) == SUCCESS) {
-                               char *str_key;
-                               uint str_key_len;
-                               ulong int_key;
-                               if (zend_hash_get_current_key_ex(fe_ht, &str_key, &str_key_len, &int_key, 0, NULL) == HASH_KEY_IS_STRING 
-                               && zend_check_property_access(zobj, str_key TSRMLS_CC) == SUCCESS) {
-                                       break;
-                               }
-                               zend_hash_move_forward(fe_ht);
-                       }
-               }
-               is_empty = zend_hash_has_more_elements(fe_ht) != SUCCESS;
-       } else {
-               zend_error(E_WARNING, "Invalid argument supplied for foreach()");
-               is_empty = 1;
-       }
-
-       if (opline->extended_value) {
-               if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-       } else {
-               FREE_OP_IF_VAR(free_op1);
-       }
-       if (is_empty) {
-               ZEND_VM_SET_OPCODE(EX(op_array)->opcodes+opline->op2.u.opline_num);
-               ZEND_VM_CONTINUE_JMP();
-       } else {
-               ZEND_VM_NEXT_OPCODE();
-       }
-}
-
-static int ZEND_FE_FETCH_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zend_free_op free_op1;
-       zval *array = get_zval_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_R);
-       zval **value;
-       char *str_key;
-       uint str_key_len;
-       ulong int_key;
-       HashTable *fe_ht;
-       zend_object_iterator *iter = NULL;
-       int key_type;
-       zend_bool use_key = opline->extended_value & ZEND_FE_FETCH_WITH_KEY;
-
-       PZVAL_LOCK(array);
-
-       switch (zend_iterator_unwrap(array, &iter TSRMLS_CC)) {
-               default:
-               case ZEND_ITER_INVALID:
-                       zend_error(E_WARNING, "Invalid argument supplied for foreach()");
-                       ZEND_VM_SET_OPCODE(EX(op_array)->opcodes+opline->op2.u.opline_num);
-                       ZEND_VM_CONTINUE_JMP();
-
-               case ZEND_ITER_PLAIN_OBJECT: {
-                       char *class_name, *prop_name;
-                       zend_object *zobj = zend_objects_get_address(array TSRMLS_CC);
-
-                       fe_ht = HASH_OF(array);
-                       do {
-                               if (zend_hash_get_current_data(fe_ht, (void **) &value)==FAILURE) {
-                                       /* reached end of iteration */
-                                       ZEND_VM_SET_OPCODE(EX(op_array)->opcodes+opline->op2.u.opline_num);
-                                       ZEND_VM_CONTINUE_JMP();
-                               }
-                               key_type = zend_hash_get_current_key_ex(fe_ht, &str_key, &str_key_len, &int_key, 0, NULL);
-
-                               zend_hash_move_forward(fe_ht);
-                       } while (key_type != HASH_KEY_IS_STRING || zend_check_property_access(zobj, str_key TSRMLS_CC) != SUCCESS);
-                       if (use_key) {
-                               zend_unmangle_property_name(str_key, &class_name, &prop_name);
-                               str_key_len = strlen(prop_name);
-                               str_key = estrndup(prop_name, str_key_len);
-                               str_key_len++;
-                       }
-                       break;
-               }
-
-               case ZEND_ITER_PLAIN_ARRAY:
-                       fe_ht = HASH_OF(array);
-                       if (zend_hash_get_current_data(fe_ht, (void **) &value)==FAILURE) {
-                               /* reached end of iteration */
-                               ZEND_VM_SET_OPCODE(EX(op_array)->opcodes+opline->op2.u.opline_num);
-                               ZEND_VM_CONTINUE_JMP();
-                       }
-                       if (use_key) {
-                               key_type = zend_hash_get_current_key_ex(fe_ht, &str_key, &str_key_len, &int_key, 1, NULL);
-                       }
-                       zend_hash_move_forward(fe_ht);
-                       break;
-
-               case ZEND_ITER_OBJECT:
-                       /* !iter happens from exception */
-                       if (iter && iter->index++) {
-                               /* This could cause an endless loop if index becomes zero again.
-                                * In case that ever happens we need an additional flag. */
-                               iter->funcs->move_forward(iter TSRMLS_CC);
-                               if (EG(exception)) {
-                                       array->refcount--;
-                                       zval_ptr_dtor(&array);
-                                       ZEND_VM_NEXT_OPCODE();
-                               }
-                       }
-                       if (!iter || (iter->index > 1 && iter->funcs->valid(iter TSRMLS_CC) == FAILURE)) {
-                               /* reached end of iteration */
-                               if (EG(exception)) {
-                                       array->refcount--;
-                                       zval_ptr_dtor(&array);
-                                       ZEND_VM_NEXT_OPCODE();
-                               }
-                               ZEND_VM_SET_OPCODE(EX(op_array)->opcodes+opline->op2.u.opline_num);
-                               ZEND_VM_CONTINUE_JMP();
-                       }
-                       iter->funcs->get_current_data(iter, &value TSRMLS_CC);
-                       if (EG(exception)) {
-                               array->refcount--;
-                               zval_ptr_dtor(&array);
-                               ZEND_VM_NEXT_OPCODE();
-                       }
-                       if (!value) {
-                               /* failure in get_current_data */
-                               ZEND_VM_SET_OPCODE(EX(op_array)->opcodes+opline->op2.u.opline_num);
-                               ZEND_VM_CONTINUE_JMP();
-                       }
-                       if (use_key) {
-                               if (iter->funcs->get_current_key) {
-                                       key_type = iter->funcs->get_current_key(iter, &str_key, &str_key_len, &int_key TSRMLS_CC);
-                                       if (EG(exception)) {
-                                               array->refcount--;
-                                               zval_ptr_dtor(&array);
-                                               ZEND_VM_NEXT_OPCODE();
-                                       }
-                               } else {
-                                       key_type = HASH_KEY_IS_LONG;
-                                       int_key = iter->index;
-                               }
-                       }
-
-                       break;
-       }
-
-       if (opline->extended_value & ZEND_FE_FETCH_BYREF) {
-               SEPARATE_ZVAL_IF_NOT_REF(value);
-               (*value)->is_ref = 1;
-               EX_T(opline->result.u.var).var.ptr_ptr = value;
-               (*value)->refcount++;
-       } else {
-               EX_T(opline->result.u.var).var.ptr_ptr = value;
-               PZVAL_LOCK(*EX_T(opline->result.u.var).var.ptr_ptr);
-               AI_USE_PTR(EX_T(opline->result.u.var).var);
-       }
-
-       if (use_key) {
-               zend_op *op_data = opline+1;
-               zval *key = &EX_T(op_data->result.u.var).tmp_var;
-
-               switch (key_type) {
-                       case HASH_KEY_IS_STRING:
-                               key->value.str.val = str_key;
-                               key->value.str.len = str_key_len-1;
-                               key->type = IS_STRING;
-                               break;
-                       case HASH_KEY_IS_LONG:
-                               key->value.lval = int_key;
-                               key->type = IS_LONG;
-                               break;
-                       EMPTY_SWITCH_DEFAULT_CASE()
-               }
-       }
-
-       ZEND_VM_INC_OPCODE();
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_ISSET_ISEMPTY_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zend_free_op free_op1;
-       zval tmp, *varname = get_zval_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_IS);
-       zval **value;
-       zend_bool isset = 1;
-       HashTable *target_symbol_table;
-
-       if (varname->type != IS_STRING) {
-               tmp = *varname;
-               zval_copy_ctor(&tmp);
-               convert_to_string(&tmp);
-               varname = &tmp;
-       }
-
-       if (opline->op2.u.EA.type == ZEND_FETCH_STATIC_MEMBER) {
-               value = zend_std_get_static_property(EX_T(opline->op2.u.var).class_entry, Z_STRVAL_P(varname), Z_STRLEN_P(varname), 1 TSRMLS_CC);
-               if (!value) {
-                       isset = 0;
-               }
-       } else {
-               target_symbol_table = zend_get_target_symbol_table(opline, EX(Ts), BP_VAR_IS, varname TSRMLS_CC);
-               if (zend_hash_find(target_symbol_table, varname->value.str.val, varname->value.str.len+1, (void **) &value) == FAILURE) {
-                       isset = 0;
-               }
-       }
-
-       EX_T(opline->result.u.var).tmp_var.type = IS_BOOL;
-
-       switch (opline->extended_value) {
-               case ZEND_ISSET:
-                       if (isset && Z_TYPE_PP(value) == IS_NULL) {
-                               EX_T(opline->result.u.var).tmp_var.value.lval = 0;
-                       } else {
-                               EX_T(opline->result.u.var).tmp_var.value.lval = isset;
-                       }
-                       break;
-               case ZEND_ISEMPTY:
-                       if (!isset || !i_zend_is_true(*value)) {
-                               EX_T(opline->result.u.var).tmp_var.value.lval = 1;
-                       } else {
-                               EX_T(opline->result.u.var).tmp_var.value.lval = 0;
-                       }
-                       break;
-       }
-
-       if (varname == &tmp) {
-               zval_dtor(&tmp);
-       }
-       FREE_OP(free_op1);
-
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int zend_isset_isempty_dim_prop_obj_handler(int prop_dim, ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zend_free_op free_op1;
-       zval **container = get_obj_zval_ptr_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_IS);
-       zval **value = NULL;
-       int result = 0;
-       long index;
-
-       if (container) {
-               zend_free_op free_op2;
-               zval *offset = get_zval_ptr(&opline->op2, EX(Ts), &free_op2, BP_VAR_R);
-
-               if ((*container)->type == IS_ARRAY) {
-                       HashTable *ht;
-                       int isset = 0;
-
-                       ht = (*container)->value.ht;
-
-                       switch (offset->type) {
-                               case IS_DOUBLE:
-                               case IS_RESOURCE:
-                               case IS_BOOL:
-                               case IS_LONG:
-                                       if (offset->type == IS_DOUBLE) {
-                                               index = (long) offset->value.dval;
-                                       } else {
-                                               index = offset->value.lval;
-                                       }
-                                       if (zend_hash_index_find(ht, index, (void **) &value) == SUCCESS) {
-                                               isset = 1;
-                                       }
-                                       break;
-                               case IS_STRING:
-                                       if (zend_symtable_find(ht, offset->value.str.val, offset->value.str.len+1, (void **) &value) == SUCCESS) {
-                                               isset = 1;
-                                       }
-                                       break;
-                               case IS_NULL:
-                                       if (zend_hash_find(ht, "", sizeof(""), (void **) &value) == SUCCESS) {
-                                               isset = 1;
-                                       }
-                                       break;
-                               default:
-                                       zend_error(E_WARNING, "Illegal offset type in unset");
-
-                                       break;
-                       }
-
-                       switch (opline->extended_value) {
-                               case ZEND_ISSET:
-                                       if (isset && Z_TYPE_PP(value) == IS_NULL) {
-                                               result = 0;
-                                       } else {
-                                               result = isset;
-                                       }
-                                       break;
-                               case ZEND_ISEMPTY:
-                                       if (!isset || !i_zend_is_true(*value)) {
-                                               result = 0;
-                                       } else {
-                                               result = 1;
-                                       }
-                                       break;
-                       }
-                       FREE_OP(free_op2);
-               } else if ((*container)->type == IS_OBJECT) {
-                       if (IS_TMP_FREE(free_op2)) {
-                               MAKE_REAL_ZVAL_PTR(offset);
-                       }
-                       if (prop_dim) {
-                               result = Z_OBJ_HT_P(*container)->has_property(*container, offset, (opline->extended_value == ZEND_ISEMPTY) TSRMLS_CC);
-                       } else {
-                               result = Z_OBJ_HT_P(*container)->has_dimension(*container, offset, (opline->extended_value == ZEND_ISEMPTY) TSRMLS_CC);
-                       }
-                       if (IS_TMP_FREE(free_op2)) {
-                               zval_ptr_dtor(&offset);
-                       } else {
-                               FREE_OP(free_op2);
-                       }
-               } else if ((*container)->type == IS_STRING && !prop_dim) { /* string offsets */
-                       zval tmp;
-
-                       if (offset->type != IS_LONG) {
-                               tmp = *offset;
-                               zval_copy_ctor(&tmp);
-                               convert_to_long(&tmp);
-                               offset = &tmp;
-                       }
-                       if (offset->type == IS_LONG) {
-                               switch (opline->extended_value) {
-                                       case ZEND_ISSET:
-                                               if (offset->value.lval >= 0 && offset->value.lval < Z_STRLEN_PP(container)) {
-                                                       result = 1;
-                                               }
-                                               break;
-                                       case ZEND_ISEMPTY:
-                                               if (offset->value.lval >= 0 && offset->value.lval < Z_STRLEN_PP(container) && Z_STRVAL_PP(container)[offset->value.lval] != '0') {
-                                                       result = 1;
-                                               }
-                                               break;
-                               }
-                       }
-                       FREE_OP(free_op2);
-               } else {
-                       FREE_OP(free_op2);
-               }
-       }
-
-       EX_T(opline->result.u.var).tmp_var.type = IS_BOOL;
-
-       switch (opline->extended_value) {
-               case ZEND_ISSET:
-                       EX_T(opline->result.u.var).tmp_var.value.lval = result;
-                       break;
-               case ZEND_ISEMPTY:
-                       EX_T(opline->result.u.var).tmp_var.value.lval = !result;
-                       break;
-       }
-
-       if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_ISSET_ISEMPTY_DIM_OBJ_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       return zend_isset_isempty_dim_prop_obj_handler(0, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
-}
-
-static int ZEND_ISSET_ISEMPTY_PROP_OBJ_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       return zend_isset_isempty_dim_prop_obj_handler(1, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
-}
-
-static int ZEND_EXIT_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-
-       if (opline->op1.op_type != IS_UNUSED) {
-               zval *ptr;
-               zend_free_op free_op1;
-
-               ptr = get_zval_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_R);
-               if (Z_TYPE_P(ptr) == IS_LONG) {
-                       EG(exit_status) = Z_LVAL_P(ptr);
-               } else {
-                       zend_print_variable(ptr);
-               }
-               FREE_OP(free_op1);
-       }
-       zend_bailout();
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_BEGIN_SILENCE_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-
-       EX_T(opline->result.u.var).tmp_var.value.lval = EG(error_reporting);
-       EX_T(opline->result.u.var).tmp_var.type = IS_LONG;  /* shouldn't be necessary */
-       zend_alter_ini_entry("error_reporting", sizeof("error_reporting"), "0", 1, ZEND_INI_USER, ZEND_INI_STAGE_RUNTIME);
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_RAISE_ABSTRACT_ERROR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_error_noreturn(E_ERROR, "Cannot call abstract method %s::%s()", EG(scope)->name, EX(op_array)->function_name);
-       ZEND_VM_NEXT_OPCODE(); /* Never reached */
-}
-
-static int ZEND_END_SILENCE_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zval restored_error_reporting;
-
-       if (!EG(error_reporting)) {
-               restored_error_reporting.type = IS_LONG;
-               restored_error_reporting.value.lval = EX_T(opline->op1.u.var).tmp_var.value.lval;
-               convert_to_string(&restored_error_reporting);
-               zend_alter_ini_entry("error_reporting", sizeof("error_reporting"), Z_STRVAL(restored_error_reporting), Z_STRLEN(restored_error_reporting), ZEND_INI_USER, ZEND_INI_STAGE_RUNTIME);
-               zendi_zval_dtor(restored_error_reporting);
-       }
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_QM_ASSIGN_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zend_free_op free_op1;
-       zval *value = get_zval_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_R);
-
-       EX_T(opline->result.u.var).tmp_var = *value;
-       if (!IS_TMP_FREE(free_op1)) {
-               zval_copy_ctor(&EX_T(opline->result.u.var).tmp_var);
-       }
-       FREE_OP_IF_VAR(free_op1);
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_EXT_STMT_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       if (!EG(no_extensions)) {
-               zend_llist_apply_with_argument(&zend_extensions, (llist_apply_with_arg_func_t) zend_extension_statement_handler, EX(op_array) TSRMLS_CC);
-       }
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_EXT_FCALL_BEGIN_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       if (!EG(no_extensions)) {
-               zend_llist_apply_with_argument(&zend_extensions, (llist_apply_with_arg_func_t) zend_extension_fcall_begin_handler, EX(op_array) TSRMLS_CC);
-       }
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_EXT_FCALL_END_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       if (!EG(no_extensions)) {
-               zend_llist_apply_with_argument(&zend_extensions, (llist_apply_with_arg_func_t) zend_extension_fcall_end_handler, EX(op_array) TSRMLS_CC);
-       }
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_DECLARE_CLASS_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-
-       EX_T(opline->result.u.var).class_entry = do_bind_class(opline, EG(class_table), 0 TSRMLS_CC);
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_DECLARE_INHERITED_CLASS_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-
-       EX_T(opline->result.u.var).class_entry = do_bind_inherited_class(opline, EG(class_table), EX_T(opline->extended_value).class_entry, 0 TSRMLS_CC);
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_DECLARE_FUNCTION_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       do_bind_function(EX(opline), EG(function_table), 0);
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_TICKS_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-
-       if (++EG(ticks_count)>=opline->op1.u.constant.value.lval) {
-               EG(ticks_count)=0;
-               if (zend_ticks_function) {
-                       zend_ticks_function(opline->op1.u.constant.value.lval);
-               }
-       }
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_INSTANCEOF_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zend_free_op free_op1;
-       zval *expr = get_zval_ptr(&opline->op1, EX(Ts), &free_op1, BP_VAR_R);
-       zend_bool result;
-
-       if (Z_TYPE_P(expr) == IS_OBJECT) {
-               result = instanceof_function(Z_OBJCE_P(expr), EX_T(opline->op2.u.var).class_entry TSRMLS_CC);
-       } else {
-               result = 0;
-       }
-       ZVAL_BOOL(&EX_T(opline->result.u.var).tmp_var, result);
-       FREE_OP(free_op1);
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_EXT_NOP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_NOP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_ADD_INTERFACE_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_op *opline = EX(opline);
-       zend_class_entry *ce = EX_T(opline->op1.u.var).class_entry;
-       zend_class_entry *iface = EX_T(opline->op2.u.var).class_entry;
-
-       if (!(iface->ce_flags & ZEND_ACC_INTERFACE)) {
-               zend_error_noreturn(E_ERROR, "%s cannot implement %s - it is not an interface", ce->name, iface->name);
-       }
-
-       ce->interfaces[opline->extended_value] = iface;
-
-       zend_do_implement_interface(ce, iface TSRMLS_CC);
-
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_HANDLE_EXCEPTION_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_uint op_num = EG(opline_before_exception)-EG(active_op_array)->opcodes;
-       int i;
-       int encapsulating_block=-1;
-       zval **stack_zval_pp;
-
-       stack_zval_pp = (zval **) EG(argument_stack).top_element - 1;
-       while (*stack_zval_pp != NULL) {
-               zval_ptr_dtor(stack_zval_pp);
-               EG(argument_stack).top_element--;
-               stack_zval_pp--;
-       }
-
-       for (i=0; i<EG(active_op_array)->last_try_catch; i++) {
-               if (EG(active_op_array)->try_catch_array[i].try_op > op_num) {
-                       /* further blocks will not be relevant... */
-                       break;
-               }
-               if (op_num >= EG(active_op_array)->try_catch_array[i].try_op
-                       && op_num < EG(active_op_array)->try_catch_array[i].catch_op) {
-                       encapsulating_block = i;
-               }
-       }
-
-       while (EX(fbc)) {
-               if (EX(object)) {
-                       zval_ptr_dtor(&EX(object));
-               }
-               zend_ptr_stack_n_pop(&EG(arg_types_stack), 3, &EX(calling_scope), &EX(object), &EX(fbc));
-       }
-
-       if (encapsulating_block == -1) {
-               ZEND_VM_RETURN_FROM_EXECUTE_LOOP();
-       } else {
-               ZEND_VM_SET_OPCODE(&EX(op_array)->opcodes[EG(active_op_array)->try_catch_array[encapsulating_block].catch_op]);
-               ZEND_VM_CONTINUE();
-       }
-}
-
-static int ZEND_VERIFY_ABSTRACT_CLASS_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       zend_verify_abstract_class(EX_T(EX(opline)->op1.u.var).class_entry TSRMLS_CC);
-       ZEND_VM_NEXT_OPCODE();
-}
-
-static int ZEND_USER_OPCODE_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{      
-       switch (zend_user_opcode_handlers[EX(opline)->opcode](ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_INTERNAL)) {
-               case ZEND_USER_OPCODE_CONTINUE:
-                       ZEND_VM_CONTINUE();
-               case ZEND_USER_OPCODE_RETURN:
-                       ZEND_VM_RETURN();
-               case ZEND_USER_OPCODE_DISPATCH:
-               default:
-                       ZEND_VM_DISPATCH(EX(opline));
-       }
-}
-
-
-void zend_vm_use_old_executor()
-{
-  static opcode_handler_t labels[512] = {
-       ZEND_NOP_HANDLER,
-       ZEND_ADD_HANDLER,
-       ZEND_SUB_HANDLER,
-       ZEND_MUL_HANDLER,
-       ZEND_DIV_HANDLER,
-       ZEND_MOD_HANDLER,
-       ZEND_SL_HANDLER,
-       ZEND_SR_HANDLER,
-       ZEND_CONCAT_HANDLER,
-       ZEND_BW_OR_HANDLER,
-       ZEND_BW_AND_HANDLER,
-       ZEND_BW_XOR_HANDLER,
-       ZEND_BW_NOT_HANDLER,
-       ZEND_BOOL_NOT_HANDLER,
-       ZEND_BOOL_XOR_HANDLER,
-       ZEND_IS_IDENTICAL_HANDLER,
-       ZEND_IS_NOT_IDENTICAL_HANDLER,
-       ZEND_IS_EQUAL_HANDLER,
-       ZEND_IS_NOT_EQUAL_HANDLER,
-       ZEND_IS_SMALLER_HANDLER,
-       ZEND_IS_SMALLER_OR_EQUAL_HANDLER,
-       ZEND_CAST_HANDLER,
-       ZEND_QM_ASSIGN_HANDLER,
-       ZEND_ASSIGN_ADD_HANDLER,
-       ZEND_ASSIGN_SUB_HANDLER,
-       ZEND_ASSIGN_MUL_HANDLER,
-       ZEND_ASSIGN_DIV_HANDLER,
-       ZEND_ASSIGN_MOD_HANDLER,
-       ZEND_ASSIGN_SL_HANDLER,
-       ZEND_ASSIGN_SR_HANDLER,
-       ZEND_ASSIGN_CONCAT_HANDLER,
-       ZEND_ASSIGN_BW_OR_HANDLER,
-       ZEND_ASSIGN_BW_AND_HANDLER,
-       ZEND_ASSIGN_BW_XOR_HANDLER,
-       ZEND_PRE_INC_HANDLER,
-       ZEND_PRE_DEC_HANDLER,
-       ZEND_POST_INC_HANDLER,
-       ZEND_POST_DEC_HANDLER,
-       ZEND_ASSIGN_HANDLER,
-       ZEND_ASSIGN_REF_HANDLER,
-       ZEND_ECHO_HANDLER,
-       ZEND_PRINT_HANDLER,
-       ZEND_JMP_HANDLER,
-       ZEND_JMPZ_HANDLER,
-       ZEND_JMPNZ_HANDLER,
-       ZEND_JMPZNZ_HANDLER,
-       ZEND_JMPZ_EX_HANDLER,
-       ZEND_JMPNZ_EX_HANDLER,
-       ZEND_CASE_HANDLER,
-       ZEND_SWITCH_FREE_HANDLER,
-       ZEND_BRK_HANDLER,
-       ZEND_CONT_HANDLER,
-       ZEND_BOOL_HANDLER,
-       ZEND_INIT_STRING_HANDLER,
-       ZEND_ADD_CHAR_HANDLER,
-       ZEND_ADD_STRING_HANDLER,
-       ZEND_ADD_VAR_HANDLER,
-       ZEND_BEGIN_SILENCE_HANDLER,
-       ZEND_END_SILENCE_HANDLER,
-       ZEND_INIT_FCALL_BY_NAME_HANDLER,
-       ZEND_DO_FCALL_HANDLER,
-       ZEND_DO_FCALL_BY_NAME_HANDLER,
-       ZEND_RETURN_HANDLER,
-       ZEND_RECV_HANDLER,
-       ZEND_RECV_INIT_HANDLER,
-       ZEND_SEND_VAL_HANDLER,
-       ZEND_SEND_VAR_HANDLER,
-       ZEND_SEND_REF_HANDLER,
-       ZEND_NEW_HANDLER,
-       ZEND_NULL_HANDLER,
-       ZEND_FREE_HANDLER,
-       ZEND_INIT_ARRAY_HANDLER,
-       ZEND_ADD_ARRAY_ELEMENT_HANDLER,
-       ZEND_INCLUDE_OR_EVAL_HANDLER,
-       ZEND_UNSET_VAR_HANDLER,
-       ZEND_UNSET_DIM_OBJ_HANDLER,
-       ZEND_NULL_HANDLER,
-       ZEND_FE_RESET_HANDLER,
-       ZEND_FE_FETCH_HANDLER,
-       ZEND_EXIT_HANDLER,
-       ZEND_FETCH_R_HANDLER,
-       ZEND_FETCH_DIM_R_HANDLER,
-       ZEND_FETCH_OBJ_R_HANDLER,
-       ZEND_FETCH_W_HANDLER,
-       ZEND_FETCH_DIM_W_HANDLER,
-       ZEND_FETCH_OBJ_W_HANDLER,
-       ZEND_FETCH_RW_HANDLER,
-       ZEND_FETCH_DIM_RW_HANDLER,
-       ZEND_FETCH_OBJ_RW_HANDLER,
-       ZEND_FETCH_IS_HANDLER,
-       ZEND_FETCH_DIM_IS_HANDLER,
-       ZEND_FETCH_OBJ_IS_HANDLER,
-       ZEND_FETCH_FUNC_ARG_HANDLER,
-       ZEND_FETCH_DIM_FUNC_ARG_HANDLER,
-       ZEND_FETCH_OBJ_FUNC_ARG_HANDLER,
-       ZEND_FETCH_UNSET_HANDLER,
-       ZEND_FETCH_DIM_UNSET_HANDLER,
-       ZEND_FETCH_OBJ_UNSET_HANDLER,
-       ZEND_FETCH_DIM_TMP_VAR_HANDLER,
-       ZEND_FETCH_CONSTANT_HANDLER,
-       ZEND_NULL_HANDLER,
-       ZEND_EXT_STMT_HANDLER,
-       ZEND_EXT_FCALL_BEGIN_HANDLER,
-       ZEND_EXT_FCALL_END_HANDLER,
-       ZEND_EXT_NOP_HANDLER,
-       ZEND_TICKS_HANDLER,
-       ZEND_SEND_VAR_NO_REF_HANDLER,
-       ZEND_CATCH_HANDLER,
-       ZEND_THROW_HANDLER,
-       ZEND_FETCH_CLASS_HANDLER,
-       ZEND_CLONE_HANDLER,
-       ZEND_NULL_HANDLER,
-       ZEND_INIT_METHOD_CALL_HANDLER,
-       ZEND_INIT_STATIC_METHOD_CALL_HANDLER,
-       ZEND_ISSET_ISEMPTY_VAR_HANDLER,
-       ZEND_ISSET_ISEMPTY_DIM_OBJ_HANDLER,
-       ZEND_NULL_HANDLER,
-       ZEND_NULL_HANDLER,
-       ZEND_NULL_HANDLER,
-       ZEND_NULL_HANDLER,
-       ZEND_NULL_HANDLER,
-       ZEND_NULL_HANDLER,
-       ZEND_NULL_HANDLER,
-       ZEND_NULL_HANDLER,
-       ZEND_NULL_HANDLER,
-       ZEND_NULL_HANDLER,
-       ZEND_NULL_HANDLER,
-       ZEND_NULL_HANDLER,
-       ZEND_NULL_HANDLER,
-       ZEND_NULL_HANDLER,
-       ZEND_NULL_HANDLER,
-       ZEND_NULL_HANDLER,
-       ZEND_PRE_INC_OBJ_HANDLER,
-       ZEND_PRE_DEC_OBJ_HANDLER,
-       ZEND_POST_INC_OBJ_HANDLER,
-       ZEND_POST_DEC_OBJ_HANDLER,
-       ZEND_ASSIGN_OBJ_HANDLER,
-       ZEND_NULL_HANDLER,
-       ZEND_INSTANCEOF_HANDLER,
-       ZEND_DECLARE_CLASS_HANDLER,
-       ZEND_DECLARE_INHERITED_CLASS_HANDLER,
-       ZEND_DECLARE_FUNCTION_HANDLER,
-       ZEND_RAISE_ABSTRACT_ERROR_HANDLER,
-       ZEND_NULL_HANDLER,
-       ZEND_ADD_INTERFACE_HANDLER,
-       ZEND_NULL_HANDLER,
-       ZEND_VERIFY_ABSTRACT_CLASS_HANDLER,
-       ZEND_ASSIGN_DIM_HANDLER,
-       ZEND_ISSET_ISEMPTY_PROP_OBJ_HANDLER,
-       ZEND_HANDLE_EXCEPTION_HANDLER,
-       ZEND_USER_OPCODE_HANDLER,
-       ZEND_NULL_HANDLER
-  };
-  zend_opcode_handlers = (opcode_handler_t*)labels;
-  zend_vm_old_executor = 1;
-  zend_execute = old_execute;
-}
-static opcode_handler_t zend_vm_get_opcode_handler(zend_uchar opcode, zend_op* op)
-{
-       if (zend_vm_old_executor) {
-               return zend_opcode_handlers[opcode];
-       } else {
                static const int zend_vm_decode[] = {
                        _UNUSED_CODE, /* 0              */
                        _CONST_CODE,  /* 1 = IS_CONST   */
@@ -33241,7 +29290,6 @@ static opcode_handler_t zend_vm_get_opcode_handler(zend_uchar opcode, zend_op* o
                        _CV_CODE      /* 16 = IS_CV     */
                };
                return zend_opcode_handlers[opcode * 25 + zend_vm_decode[op->op1.op_type] * 5 + zend_vm_decode[op->op2.op_type]];
-       }
 }
 
 void zend_vm_set_opcode_handler(zend_op* op)
index 41819e77091e15eb05bd7558914fa9148daf1d48..c930709a93d2da2215663749505ab8f9e216efc8 100644 (file)
@@ -380,6 +380,41 @@ function gen_code($f, $spec, $kind, $code, $op1, $op2) {
                        break;
        }
 
+       /* Remove unused free_op1 and free_op2 declarations */
+       if ($spec && preg_match_all('/^\s*zend_free_op\s+[^;]+;\s*$/me', $code, $matches, PREG_SET_ORDER)) {
+               $n = 0;
+               foreach ($matches as $match) {
+                 $code = preg_replace('/'.preg_quote($match[0],'/').'/', "\$D$n", $code);
+                 ++$n;
+               }
+               $del_free_op1 = (strpos($code, "free_op1") === false);
+               $del_free_op2 = (strpos($code, "free_op2") === false);
+               $n = 0;
+               foreach ($matches as $match) {
+                       $dcl = $match[0];
+                       $changed = 0;
+                       if ($del_free_op1 && strpos($dcl, "free_op1") !== false) {
+                               $dcl = preg_replace("/free_op1\s*,\s*/", "", $dcl);
+                               $dcl = preg_replace("/free_op1\s*;/", ";", $dcl);
+                               $changed = 1;
+                       }
+                       if ($del_free_op2 && strpos($dcl, "free_op2") !== false) {
+                               $dcl = preg_replace("/free_op2\s*,\s*/", "", $dcl);
+                               $dcl = preg_replace("/free_op2\s*;/", ";", $dcl);
+                               $changed = 1;
+                       }
+                       if ($changed) {
+                               $dcl = preg_replace("/,\s*;/", ";", $dcl);
+                               $dcl = preg_replace("/zend_free_op\s*;/", "", $dcl);
+                       }
+                 $code = preg_replace("/\\\$D$n/", $dcl, $code);
+                 ++$n;
+               }
+       }
+
+       /* Remove unnecessary ';' */
+       $code = preg_replace('/^\s*;\s*$/m', '', $code);
+
        out($f, $code);
 }
 
@@ -703,6 +738,9 @@ function gen_executor($f, $skl, $spec, $kind, $executor_name, $initializer_name,
                if (preg_match("/(.*)[{][%]([A-Z_]*)[%][}](.*)/", $line, $m)) {
                        switch ($m[2]) {
                                case "DEFINES":
+                                       if (ZEND_VM_OLD_EXECUTOR) {
+                                               out($f,"static int zend_vm_old_executor = 0;\n\n");
+                                       }
                                        out($f,"static opcode_handler_t zend_vm_get_opcode_handler(zend_uchar opcode, zend_op* op);\n\n");
                                        switch ($kind) {
                                                case ZEND_VM_KIND_CALL:
@@ -1064,7 +1102,7 @@ function usage() {
             "\nOptions:".
             "\n  --with-vm-kind=CALL|SWITCH|GOTO - select threading model (default is CALL)".
             "\n  --without-specializer           - disable executor specialization".
-            "\n  --without-old-executor          - disable old executor".
+            "\n  --with-old-executor             - enable old executor".
             "\n  --with-lines                    - enable #line directives".
             "\n\n");
 }
@@ -1091,9 +1129,9 @@ for ($i = 1;  $i < $argc; $i++) {
        } else if ($argv[$i] == "--without-specializer") {
          // Disabling specialization
                define("ZEND_VM_SPEC", 0);
-       } else if ($argv[$i] == "--without-old-executor") {
+       } else if ($argv[$i] == "--with-old-executor") {
          // Disabling code for old-style executor
-               define("ZEND_VM_OLD_EXECUTOR", 0);
+               define("ZEND_VM_OLD_EXECUTOR", 1);
        } else if ($argv[$i] == "--with-lines") {
                // Enabling debuging using original zend_vm_def.h
                define("ZEND_VM_LINES", 1);
@@ -1118,7 +1156,7 @@ if (!defined("ZEND_VM_SPEC")) {
 }
 if (!defined("ZEND_VM_OLD_EXECUTOR")) {
   // Include old-style executor by default
-       define("ZEND_VM_OLD_EXECUTOR", 1);
+       define("ZEND_VM_OLD_EXECUTOR", 0);
 }
 if (!defined("ZEND_VM_LINES")) {
   // Disabling #line directives