- Improve comments, docs, code...

diff --git a/Zend/README.ZEND_VM b/Zend/README.ZEND_VM
index bc82e9817c1362cfcf400eddc1644fdabbb0ac2a..3020f0ed4df894cd2720bbafe458a8de3e0db70a 100644 (file)
--- a/Zend/README.ZEND_VM
+++ b/Zend/README.ZEND_VM
@@ -9,22 +9,21 @@ method). As most in most PHP applications raw execution speed isn't the
 limiting factor but system calls and database callls are, your mileage with
 this patch will vary.
 
-Most parts of the old zend_execute.c go into zend_vm_handlers.h. Here you can
+Most parts of the old zend_execute.c go into zend_vm_def.h. Here you can
 find opcode handlers and helpers. The typical opcode handler template looks
 like this:
 
-#define <OPCODE>_SPEC() OPDEF(<OPCODE>, <OP1_TYPES>, <OP2_TYPES>)
-#if HAVE_OP(<OPCODE>)
-ZEND_VM_HANDLER(<OPCODE>)
+ZEND_VM_HANDLER(<OPCODE-NUMBER>, <OPCODE>, <OP1_TYPES>, <OP2_TYPES>)
 {
        <HANDLER'S CODE>
 }
-#endif
 
+<OPCODE-NUMBER> is a opcode number (0, 1, ...)
 <OPCODE> is an opcode name (ZEN_NOP, ZEND_ADD, :)
 <OP1_TYPES> & <OP2_TYPES> are masks for allowed operand op_types. Specializer
-will generate code only for defined combination of types. You can also use
-M_ANY mask to disable specialization according operand's op_type.
+will generate code only for defined combination of types. You can use any 
+combination of the following op_types UNUSED, CONST, VAR, TMP and  CV also
+you can use ANY mask to disable specialization according operand's op_type.
 <HANDLER'S CODE> is a handler's code itself. For most handlers it stills the
 same as in old zend_execute.c, but now it uses macros to access opcode operands
 and some internal executor data.
@@ -72,19 +71,35 @@ FREE_OP<X>_IF_VAR()
 FREE_OP<X>_VAR_PTR()
        FREE_VAR_PTR(free_op<X>)
 
-If handler can receive control form some other handler it should be defined
-with macro ZEND_VM_HANDLER_EX() instead of ZEND_VM_HANDLER().
 
-The additional parameters of helpers (see ZEND_VM_DISPATCH_TO_HELPER_EX) mast
-be defined in the start of execute() function inside ZEND_VM_HELPER_VAR() macro.
+Executor's helpers can be defined without parameters or with one parameter. 
+This is done with the following constructs:
 
-zend_vm.h and zend_vm_spec.h are used for abstraction of execution method and
-operands specialization. They mainly contain macros that are used for
-compile-time specialization.
+ZEND_VM_HELPER(<HELPER-NAME>, <OP1_TYPES>, <OP2_TYPES>)
+{
+       <HELPER'S CODE>
+}
+
+ZEND_VM_HELPER_EX(<HELPER-NAME>, <OP1_TYPES>, <OP2_TYPES>, <PARAM_SPEC>)
+{
+       <HELPER'S CODE>
+}
+
+Executor's code is generated by PHP script zend_vm_gen.php it uses zend_vm_def.h
+and zend_vm_execute.skl as input and produces zend_vm_opcodes.h and 
+zend_vm_execute.h. The first file is a list of opcode definitions. It is 
+included from zend_compile.h. The second one is an executor code itself. It is
+included from zend_execute.c.
+
+zend_vm_gen.php can produce different kind of executors. You can select 
+different opcode threading model using --with-vm-kind=CALL|SWITCH|GOTO. You can 
+disable opcode specialization using --without-specializer. You can include or
+exclude old executor together with specialized one using --without-old-executor.
+At last you can debug executor using original zend_vm_def.h or generated file
+zend_vm_execute.h. Debugging with generated file requires --without-lines
+option. By default ZE2 uses the following command to generate executor:
 
-You can switch specialization on/off with define/undefined of the ZEND_VM_SPEC
-in the start of zend.vm.h and select execution method by defining ZEND_VM_KIND
-in the same place.
+$ php zend_vm_gen.php --with-vm-kind=CALL --without-lines
 
 Zend Engine II currently includes two executors during the build process, one
 is the specialized version and the other is the old one non-specialized with

diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h
index 3fab70f7462764f7ac5828e3049b9b146a993faf..d72a5008e44f513dd62b69d39f8994cd5c6dc3e1 100644 (file)
--- a/Zend/zend_compile.h
+++ b/Zend/zend_compile.h
@@ -546,186 +546,11 @@ ZEND_API int zend_auto_global_disable_jit(char *varname, zend_uint varname_lengt
 int zendlex(znode *zendlval TSRMLS_DC);
 
 /* BEGIN: OPCODES */
-#define ZEND_NOP                                       0
-                                                                       
-#define ZEND_ADD                                       1
-#define ZEND_SUB                                       2
-#define ZEND_MUL                                       3
-#define ZEND_DIV                                       4
-#define ZEND_MOD                                       5
-#define ZEND_SL                                                6
-#define ZEND_SR                                                7
-#define ZEND_CONCAT                                    8
-#define ZEND_BW_OR                                     9
-#define ZEND_BW_AND                                    10
-#define ZEND_BW_XOR                                    11
-#define ZEND_BW_NOT                                    12
-#define ZEND_BOOL_NOT                          13
-#define ZEND_BOOL_XOR                          14
-#define ZEND_IS_IDENTICAL                      15
-#define ZEND_IS_NOT_IDENTICAL       16
-#define ZEND_IS_EQUAL                          17
-#define ZEND_IS_NOT_EQUAL                      18
-#define ZEND_IS_SMALLER                                19
-#define ZEND_IS_SMALLER_OR_EQUAL       20
-#define ZEND_CAST                                      21
-#define ZEND_QM_ASSIGN                         22
-
-#define ZEND_ASSIGN_ADD                                23
-#define ZEND_ASSIGN_SUB                                24
-#define ZEND_ASSIGN_MUL                                25
-#define ZEND_ASSIGN_DIV                                26
-#define ZEND_ASSIGN_MOD                                27
-#define ZEND_ASSIGN_SL                         28
-#define ZEND_ASSIGN_SR                         29
-#define ZEND_ASSIGN_CONCAT                     30
-#define ZEND_ASSIGN_BW_OR                      31
-#define ZEND_ASSIGN_BW_AND                     32
-#define ZEND_ASSIGN_BW_XOR                     33
-                                                                       
-#define ZEND_PRE_INC                           34
-#define ZEND_PRE_DEC                           35
-#define ZEND_POST_INC                          36
-#define ZEND_POST_DEC                          37
-                                                                       
-#define ZEND_ASSIGN                                    38
-#define ZEND_ASSIGN_REF                                39
-
-#define ZEND_ECHO                                      40
-#define ZEND_PRINT                                     41
-
-#define ZEND_JMP                                       42
-#define ZEND_JMPZ                                      43
-#define ZEND_JMPNZ                                     44
-#define ZEND_JMPZNZ                                    45
-#define ZEND_JMPZ_EX                           46
-#define ZEND_JMPNZ_EX                          47
-#define ZEND_CASE                                      48
-#define ZEND_SWITCH_FREE                       49
-#define ZEND_BRK                                       50
-#define ZEND_CONT                                      51
-#define ZEND_BOOL                                      52
-
-#define ZEND_INIT_STRING                       53
-#define ZEND_ADD_CHAR                          54
-#define ZEND_ADD_STRING                                55
-#define ZEND_ADD_VAR                           56
-
-#define ZEND_BEGIN_SILENCE                     57
-#define ZEND_END_SILENCE                       58
-
-#define ZEND_INIT_FCALL_BY_NAME                59
-#define ZEND_DO_FCALL                          60
-#define ZEND_DO_FCALL_BY_NAME          61
-#define ZEND_RETURN                                    62
-
-#define ZEND_RECV                                      63
-#define ZEND_RECV_INIT                         64
-                                                                       
-#define ZEND_SEND_VAL                          65
-#define ZEND_SEND_VAR                          66
-#define ZEND_SEND_REF                          67
-
-#define ZEND_NEW                                       68
-#define ZEND_JMP_NO_CTOR                       69
-#define ZEND_FREE                                      70
-                                                                       
-#define ZEND_INIT_ARRAY                                71
-#define ZEND_ADD_ARRAY_ELEMENT         72
-                                                                       
-#define ZEND_INCLUDE_OR_EVAL           73
-                                                                       
-#define ZEND_UNSET_VAR                         74
-#define ZEND_UNSET_DIM_OBJ                     75
-                                                                       
-#define ZEND_FE_RESET                          77
-#define ZEND_FE_FETCH                          78
-                                                                       
-#define ZEND_EXIT                                      79
-
-
-/* the following 18 opcodes are 6 groups of 3 opcodes each, and must
- * remain in that order!
- */
-#define ZEND_FETCH_R                           80
-#define ZEND_FETCH_DIM_R                       81
-#define ZEND_FETCH_OBJ_R                       82
-#define ZEND_FETCH_W                           83
-#define ZEND_FETCH_DIM_W                       84
-#define ZEND_FETCH_OBJ_W                       85
-#define ZEND_FETCH_RW                          86
-#define ZEND_FETCH_DIM_RW                      87
-#define ZEND_FETCH_OBJ_RW                      88
-#define ZEND_FETCH_IS                          89
-#define ZEND_FETCH_DIM_IS                      90
-#define ZEND_FETCH_OBJ_IS                      91
-#define ZEND_FETCH_FUNC_ARG                    92
-#define ZEND_FETCH_DIM_FUNC_ARG                93
-#define ZEND_FETCH_OBJ_FUNC_ARG                94
-#define ZEND_FETCH_UNSET                       95
-#define ZEND_FETCH_DIM_UNSET           96
-#define ZEND_FETCH_OBJ_UNSET           97
-
-#define ZEND_FETCH_DIM_TMP_VAR         98
-#define ZEND_FETCH_CONSTANT                    99
-
-/* Hole - 100 */
-
-#define ZEND_EXT_STMT                          101
-#define ZEND_EXT_FCALL_BEGIN           102
-#define ZEND_EXT_FCALL_END                     103
-#define ZEND_EXT_NOP                           104
-
-#define ZEND_TICKS                                     105
-
-#define ZEND_SEND_VAR_NO_REF           106
-
-#define ZEND_CATCH                                     107
-#define ZEND_THROW                                     108
-
-#define ZEND_FETCH_CLASS                       109
-
-#define ZEND_CLONE                                     110
-
-#define ZEND_INIT_CTOR_CALL                    111
-#define ZEND_INIT_METHOD_CALL          112
-#define ZEND_INIT_STATIC_METHOD_CALL 113
-
-#define ZEND_ISSET_ISEMPTY_VAR         114
-#define ZEND_ISSET_ISEMPTY_DIM_OBJ     115
-
-#define        ZEND_IMPORT_FUNCTION            116
-#define        ZEND_IMPORT_CLASS                       117
-#define        ZEND_IMPORT_CONST                       118
-                                                                       
-#define ZEND_PRE_INC_OBJ                       132
-#define ZEND_PRE_DEC_OBJ                       133
-#define ZEND_POST_INC_OBJ                      134
-#define ZEND_POST_DEC_OBJ                      135
-                                                                       
-#define ZEND_ASSIGN_OBJ                                136
-#define ZEND_OP_DATA                           137
-
-#define ZEND_INSTANCEOF                                138
-
-#define ZEND_DECLARE_CLASS                             139
-#define ZEND_DECLARE_INHERITED_CLASS   140
-#define ZEND_DECLARE_FUNCTION                  141
-
-#define ZEND_RAISE_ABSTRACT_ERROR      142
 
+#include "zend_vm_opcodes.h"
 
+#define ZEND_OP_DATA                           137
 
-#define ZEND_ADD_INTERFACE                     144
-#define ZEND_VERIFY_ABSTRACT_CLASS     146
-
-#define ZEND_ASSIGN_DIM                                147
-
-#define ZEND_ISSET_ISEMPTY_PROP_OBJ    148
-
-#define ZEND_HANDLE_EXCEPTION          149
-
-/* end of block */
 /* END: OPCODES */
 
 

diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 308232fe5fa79c991cc10a0be7738537831b060e..d998d0f979872c9ab161ebc60d9ab644ff7f1343 100644 (file)
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -66,7 +66,6 @@ ZEND_API void execute(zend_op_array *op_array TSRMLS_DC)
 #undef EX
 #define EX(element) execute_data->element
 
-#line 1305 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_JMP_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
 #if DEBUG_ZEND>=2
@@ -76,7 +75,6 @@ static int ZEND_JMP_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_CONTINUE(); /* CHECK_ME */
 }
 
-#line 1416 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_INIT_STRING_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zval *tmp = &EX_T(EX(opline)->result.u.var).tmp_var;
@@ -90,7 +88,6 @@ static int ZEND_INIT_STRING_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1703 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_do_fcall_common_helper_SPEC(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -265,14 +262,12 @@ static int zend_do_fcall_common_helper_SPEC(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1877 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_DO_FCALL_BY_NAME_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        EX(function_state).function = EX(fbc);
        return zend_do_fcall_common_helper_SPEC(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 2000 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_CATCH_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -301,7 +296,6 @@ static int ZEND_CATCH_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2139 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_RECV_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -338,7 +332,6 @@ static int ZEND_RECV_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2294 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_NEW_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -362,7 +355,6 @@ static int ZEND_NEW_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 3237 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BEGIN_SILENCE_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -373,14 +365,12 @@ static int ZEND_BEGIN_SILENCE_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 3247 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_RAISE_ABSTRACT_ERROR_SPEC_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 */
 }
 
-#line 3282 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_EXT_STMT_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        if (!EG(no_extensions)) {
@@ -389,7 +379,6 @@ static int ZEND_EXT_STMT_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 3290 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_EXT_FCALL_BEGIN_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        if (!EG(no_extensions)) {
@@ -398,7 +387,6 @@ static int ZEND_EXT_FCALL_BEGIN_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 3298 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_EXT_FCALL_END_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        if (!EG(no_extensions)) {
@@ -407,7 +395,6 @@ static int ZEND_EXT_FCALL_END_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 3306 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_DECLARE_CLASS_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -416,7 +403,6 @@ static int ZEND_DECLARE_CLASS_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 3314 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_DECLARE_INHERITED_CLASS_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -425,26 +411,22 @@ static int ZEND_DECLARE_INHERITED_CLASS_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 3322 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_DECLARE_FUNCTION_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        do_bind_function(EX(opline), EG(function_table), 0);
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 3358 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_EXT_NOP_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 3363 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_NOP_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 3368 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ADD_INTERFACE_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -462,7 +444,6 @@ static int ZEND_ADD_INTERFACE_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 3385 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_HANDLE_EXCEPTION_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_uint op_num = EG(opline_before_exception)-EG(active_op_array)->opcodes;
@@ -496,14 +477,12 @@ static int ZEND_HANDLE_EXCEPTION_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        }
 }
 
-#line 3418 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_VERIFY_ABSTRACT_CLASS_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_verify_abstract_class(EX_T(EX(opline)->op1.u.var).class_entry TSRMLS_CC);
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1482 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_CLASS_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -534,7 +513,6 @@ static int ZEND_FETCH_CLASS_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1604 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -589,7 +567,6 @@ static int ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_A
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1658 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_INIT_FCALL_BY_NAME_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -635,7 +612,6 @@ static int ZEND_INIT_FCALL_BY_NAME_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 }
 
 
-#line 2175 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_RECV_INIT_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -678,7 +654,6 @@ static int ZEND_RECV_INIT_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2230 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BRK_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -692,7 +667,6 @@ static int ZEND_BRK_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_CONTINUE(); /* CHECK_ME */
 }
 
-#line 2243 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_CONT_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -706,7 +680,6 @@ static int ZEND_CONT_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_CONTINUE(); /* CHECK_ME */
 }
 
-#line 1482 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_CLASS_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -737,7 +710,6 @@ static int ZEND_FETCH_CLASS_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1604 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_INIT_STATIC_METHOD_CALL_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -792,7 +764,6 @@ static int ZEND_INIT_STATIC_METHOD_CALL_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARG
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1658 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_INIT_FCALL_BY_NAME_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -838,7 +809,6 @@ static int ZEND_INIT_FCALL_BY_NAME_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 }
 
 
-#line 2230 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BRK_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -852,7 +822,6 @@ static int ZEND_BRK_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_CONTINUE(); /* CHECK_ME */
 }
 
-#line 2243 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_CONT_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -866,7 +835,6 @@ static int ZEND_CONT_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_CONTINUE(); /* CHECK_ME */
 }
 
-#line 1482 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_CLASS_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -897,7 +865,6 @@ static int ZEND_FETCH_CLASS_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1604 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_INIT_STATIC_METHOD_CALL_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -952,7 +919,6 @@ static int ZEND_INIT_STATIC_METHOD_CALL_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARG
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1658 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_INIT_FCALL_BY_NAME_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -998,7 +964,6 @@ static int ZEND_INIT_FCALL_BY_NAME_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 }
 
 
-#line 2230 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BRK_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -1012,7 +977,6 @@ static int ZEND_BRK_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_CONTINUE(); /* CHECK_ME */
 }
 
-#line 2243 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_CONT_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -1026,7 +990,6 @@ static int ZEND_CONT_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_CONTINUE(); /* CHECK_ME */
 }
 
-#line 1482 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_CLASS_SPEC_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -1057,7 +1020,6 @@ static int ZEND_FETCH_CLASS_SPEC_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1604 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_INIT_STATIC_METHOD_CALL_SPEC_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -1112,7 +1074,6 @@ static int ZEND_INIT_STATIC_METHOD_CALL_SPEC_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1482 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_CLASS_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -1143,7 +1104,6 @@ static int ZEND_FETCH_CLASS_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1604 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_INIT_STATIC_METHOD_CALL_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -1198,7 +1158,6 @@ static int ZEND_INIT_STATIC_METHOD_CALL_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1658 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_INIT_FCALL_BY_NAME_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -1244,7 +1203,6 @@ static int ZEND_INIT_FCALL_BY_NAME_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 }
 
 
-#line 2230 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BRK_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -1258,7 +1216,6 @@ static int ZEND_BRK_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_CONTINUE(); /* CHECK_ME */
 }
 
-#line 2243 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_CONT_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -1272,7 +1229,6 @@ static int ZEND_CONT_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_CONTINUE(); /* CHECK_ME */
 }
 
-#line 235 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BW_NOT_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -1284,7 +1240,6 @@ static int ZEND_BW_NOT_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 246 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BOOL_NOT_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -1296,7 +1251,6 @@ static int ZEND_BOOL_NOT_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 824 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ECHO_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -1316,7 +1270,6 @@ static int ZEND_ECHO_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 843 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_PRINT_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -1327,7 +1280,6 @@ static int ZEND_PRINT_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        return ZEND_ECHO_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 853 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_fetch_var_address_helper_SPEC_CONST(int type, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -1417,43 +1369,36 @@ static int zend_fetch_var_address_helper_SPEC_CONST(int type, ZEND_OPCODE_HANDLE
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 942 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_R_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_fetch_var_address_helper_SPEC_CONST(BP_VAR_R, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 947 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_W_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_fetch_var_address_helper_SPEC_CONST(BP_VAR_W, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 952 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_RW_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_fetch_var_address_helper_SPEC_CONST(BP_VAR_RW, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 957 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_FUNC_ARG_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_fetch_var_address_helper_SPEC_CONST(ARG_SHOULD_BE_SENT_BY_REF(EX(fbc), EX(opline)->extended_value)?BP_VAR_W:BP_VAR_R, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 963 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_UNSET_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_fetch_var_address_helper_SPEC_CONST(BP_VAR_UNSET, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 968 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_IS_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_fetch_var_address_helper_SPEC_CONST(BP_VAR_IS, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 1314 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_JMPZ_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -1472,7 +1417,6 @@ static int ZEND_JMPZ_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1332 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_JMPNZ_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -1491,7 +1435,6 @@ static int ZEND_JMPNZ_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1350 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_JMPZNZ_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -1514,7 +1457,6 @@ static int ZEND_JMPZNZ_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        }
 }
 
-#line 1372 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_JMPZ_EX_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -1534,7 +1476,6 @@ static int ZEND_JMPZ_EX_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1391 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_JMPNZ_EX_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -1554,7 +1495,6 @@ static int ZEND_JMPNZ_EX_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1883 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_DO_FCALL_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -1574,7 +1514,6 @@ static int ZEND_DO_FCALL_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        return zend_do_fcall_common_helper_SPEC(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 1902 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_RETURN_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -1649,7 +1588,6 @@ return_by_value:
        ZEND_VM_RETURN_FROM_EXECUTE_LOOP();
 }
 
-#line 2028 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_SEND_VAL_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -1675,7 +1613,6 @@ static int ZEND_SEND_VAL_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2217 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BOOL_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -1689,7 +1626,6 @@ static int ZEND_BOOL_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2317 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_CLONE_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -1746,7 +1682,6 @@ static int ZEND_CLONE_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2500 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_CAST_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -1793,7 +1728,6 @@ static int ZEND_CAST_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2546 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_INCLUDE_OR_EVAL_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -1913,7 +1847,6 @@ static int ZEND_INCLUDE_OR_EVAL_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2665 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_UNSET_VAR_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -1961,7 +1894,6 @@ static int ZEND_UNSET_VAR_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2804 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FE_RESET_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -2045,7 +1977,6 @@ static int ZEND_FE_RESET_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 3050 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ISSET_ISEMPTY_VAR_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -2101,7 +2032,6 @@ static int ZEND_ISSET_ISEMPTY_VAR_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 3217 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_EXIT_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -2122,7 +2052,6 @@ static int ZEND_EXIT_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 3268 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_QM_ASSIGN_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -2137,7 +2066,6 @@ static int ZEND_QM_ASSIGN_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 3328 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_TICKS_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -2151,7 +2079,6 @@ static int ZEND_TICKS_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ADD_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -2165,7 +2092,6 @@ static int ZEND_ADD_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 14 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_SUB_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -2179,7 +2105,6 @@ static int ZEND_SUB_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 27 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_MUL_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -2193,7 +2118,6 @@ static int ZEND_MUL_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 40 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_DIV_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -2207,7 +2131,6 @@ static int ZEND_DIV_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 53 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_MOD_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -2221,7 +2144,6 @@ static int ZEND_MOD_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 66 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_SL_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -2235,7 +2157,6 @@ static int ZEND_SL_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 79 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_SR_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -2249,7 +2170,6 @@ static int ZEND_SR_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 92 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_CONCAT_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -2263,7 +2183,6 @@ static int ZEND_CONCAT_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 105 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_IDENTICAL_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -2277,7 +2196,6 @@ static int ZEND_IS_IDENTICAL_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 118 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_NOT_IDENTICAL_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -2291,7 +2209,6 @@ static int ZEND_IS_NOT_IDENTICAL_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_AR
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 131 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_EQUAL_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -2305,7 +2222,6 @@ static int ZEND_IS_EQUAL_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 144 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_NOT_EQUAL_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -2319,7 +2235,6 @@ static int ZEND_IS_NOT_EQUAL_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 157 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_SMALLER_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -2333,7 +2248,6 @@ static int ZEND_IS_SMALLER_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 170 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_SMALLER_OR_EQUAL_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -2347,7 +2261,6 @@ static int ZEND_IS_SMALLER_OR_EQUAL_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 183 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BW_OR_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -2361,7 +2274,6 @@ static int ZEND_BW_OR_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 196 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BW_AND_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -2375,7 +2287,6 @@ static int ZEND_BW_AND_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 209 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BW_XOR_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -2389,7 +2300,6 @@ static int ZEND_BW_XOR_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 222 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BOOL_XOR_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -2403,7 +2313,6 @@ static int ZEND_BOOL_XOR_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2256 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_CASE_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -2436,7 +2345,6 @@ static int ZEND_CASE_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2373 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_CONSTANT_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -2478,7 +2386,6 @@ static int ZEND_FETCH_CONSTANT_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2414 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_init_add_array_helper_SPEC_CONST_CONST(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -2555,19 +2462,16 @@ static int zend_init_add_array_helper_SPEC_CONST_CONST(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2490 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_INIT_ARRAY_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_init_add_array_helper_SPEC_CONST_CONST(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 2495 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ADD_ARRAY_ELEMENT_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_init_add_array_helper_SPEC_CONST_CONST(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 1 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ADD_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -2581,7 +2485,6 @@ static int ZEND_ADD_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 14 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_SUB_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -2595,7 +2498,6 @@ static int ZEND_SUB_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 27 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_MUL_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -2609,7 +2511,6 @@ static int ZEND_MUL_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 40 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_DIV_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -2623,7 +2524,6 @@ static int ZEND_DIV_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 53 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_MOD_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -2637,7 +2537,6 @@ static int ZEND_MOD_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 66 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_SL_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -2651,7 +2550,6 @@ static int ZEND_SL_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 79 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_SR_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -2665,7 +2563,6 @@ static int ZEND_SR_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 92 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_CONCAT_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -2679,7 +2576,6 @@ static int ZEND_CONCAT_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 105 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_IDENTICAL_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -2693,7 +2589,6 @@ static int ZEND_IS_IDENTICAL_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 118 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_NOT_IDENTICAL_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -2707,7 +2602,6 @@ static int ZEND_IS_NOT_IDENTICAL_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 131 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_EQUAL_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -2721,7 +2615,6 @@ static int ZEND_IS_EQUAL_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 144 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_NOT_EQUAL_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -2735,7 +2628,6 @@ static int ZEND_IS_NOT_EQUAL_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 157 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_SMALLER_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -2749,7 +2641,6 @@ static int ZEND_IS_SMALLER_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 170 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_SMALLER_OR_EQUAL_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -2763,7 +2654,6 @@ static int ZEND_IS_SMALLER_OR_EQUAL_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_A
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 183 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BW_OR_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -2777,7 +2667,6 @@ static int ZEND_BW_OR_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 196 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BW_AND_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -2791,7 +2680,6 @@ static int ZEND_BW_AND_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 209 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BW_XOR_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -2805,7 +2693,6 @@ static int ZEND_BW_XOR_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 222 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BOOL_XOR_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -2819,7 +2706,6 @@ static int ZEND_BOOL_XOR_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2256 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_CASE_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -2852,7 +2738,6 @@ static int ZEND_CASE_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2414 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_init_add_array_helper_SPEC_CONST_TMP(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -2929,19 +2814,16 @@ static int zend_init_add_array_helper_SPEC_CONST_TMP(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2490 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_INIT_ARRAY_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_init_add_array_helper_SPEC_CONST_TMP(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 2495 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ADD_ARRAY_ELEMENT_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_init_add_array_helper_SPEC_CONST_TMP(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 1 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ADD_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -2955,7 +2837,6 @@ static int ZEND_ADD_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 14 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_SUB_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -2969,7 +2850,6 @@ static int ZEND_SUB_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 27 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_MUL_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -2983,7 +2863,6 @@ static int ZEND_MUL_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 40 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_DIV_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -2997,7 +2876,6 @@ static int ZEND_DIV_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 53 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_MOD_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -3011,7 +2889,6 @@ static int ZEND_MOD_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 66 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_SL_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -3025,7 +2902,6 @@ static int ZEND_SL_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 79 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_SR_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -3039,7 +2915,6 @@ static int ZEND_SR_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 92 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_CONCAT_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -3053,7 +2928,6 @@ static int ZEND_CONCAT_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 105 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_IDENTICAL_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -3067,7 +2941,6 @@ static int ZEND_IS_IDENTICAL_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 118 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_NOT_IDENTICAL_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -3081,7 +2954,6 @@ static int ZEND_IS_NOT_IDENTICAL_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 131 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_EQUAL_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -3095,7 +2967,6 @@ static int ZEND_IS_EQUAL_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 144 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_NOT_EQUAL_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -3109,7 +2980,6 @@ static int ZEND_IS_NOT_EQUAL_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 157 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_SMALLER_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -3123,7 +2993,6 @@ static int ZEND_IS_SMALLER_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 170 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_SMALLER_OR_EQUAL_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -3137,7 +3006,6 @@ static int ZEND_IS_SMALLER_OR_EQUAL_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_A
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 183 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BW_OR_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -3151,7 +3019,6 @@ static int ZEND_BW_OR_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 196 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BW_AND_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -3165,7 +3032,6 @@ static int ZEND_BW_AND_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 209 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BW_XOR_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -3179,7 +3045,6 @@ static int ZEND_BW_XOR_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 222 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BOOL_XOR_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -3193,7 +3058,6 @@ static int ZEND_BOOL_XOR_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2256 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_CASE_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -3226,7 +3090,6 @@ static int ZEND_CASE_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2414 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_init_add_array_helper_SPEC_CONST_VAR(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -3303,19 +3166,16 @@ static int zend_init_add_array_helper_SPEC_CONST_VAR(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2490 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_INIT_ARRAY_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_init_add_array_helper_SPEC_CONST_VAR(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 2495 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ADD_ARRAY_ELEMENT_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_init_add_array_helper_SPEC_CONST_VAR(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 2414 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_init_add_array_helper_SPEC_CONST_UNUSED(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -3392,19 +3252,16 @@ static int zend_init_add_array_helper_SPEC_CONST_UNUSED(ZEND_OPCODE_HANDLER_ARGS
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2490 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_INIT_ARRAY_SPEC_CONST_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_init_add_array_helper_SPEC_CONST_UNUSED(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 2495 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ADD_ARRAY_ELEMENT_SPEC_CONST_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_init_add_array_helper_SPEC_CONST_UNUSED(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 1 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ADD_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -3418,7 +3275,6 @@ static int ZEND_ADD_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 14 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_SUB_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -3432,7 +3288,6 @@ static int ZEND_SUB_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 27 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_MUL_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -3446,7 +3301,6 @@ static int ZEND_MUL_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 40 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_DIV_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -3460,7 +3314,6 @@ static int ZEND_DIV_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 53 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_MOD_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -3474,7 +3327,6 @@ static int ZEND_MOD_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 66 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_SL_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -3488,7 +3340,6 @@ static int ZEND_SL_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 79 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_SR_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -3502,7 +3353,6 @@ static int ZEND_SR_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 92 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_CONCAT_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -3516,7 +3366,6 @@ static int ZEND_CONCAT_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 105 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_IDENTICAL_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -3530,7 +3379,6 @@ static int ZEND_IS_IDENTICAL_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 118 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_NOT_IDENTICAL_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -3544,7 +3392,6 @@ static int ZEND_IS_NOT_IDENTICAL_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 131 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_EQUAL_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -3558,7 +3405,6 @@ static int ZEND_IS_EQUAL_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 144 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_NOT_EQUAL_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -3572,7 +3418,6 @@ static int ZEND_IS_NOT_EQUAL_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 157 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_SMALLER_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -3586,7 +3431,6 @@ static int ZEND_IS_SMALLER_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 170 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_SMALLER_OR_EQUAL_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -3600,7 +3444,6 @@ static int ZEND_IS_SMALLER_OR_EQUAL_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_AR
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 183 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BW_OR_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -3614,7 +3457,6 @@ static int ZEND_BW_OR_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 196 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BW_AND_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -3628,7 +3470,6 @@ static int ZEND_BW_AND_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 209 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BW_XOR_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -3642,7 +3483,6 @@ static int ZEND_BW_XOR_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 222 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BOOL_XOR_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -3656,7 +3496,6 @@ static int ZEND_BOOL_XOR_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2256 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_CASE_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -3689,7 +3528,6 @@ static int ZEND_CASE_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2414 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_init_add_array_helper_SPEC_CONST_CV(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -3766,19 +3604,16 @@ static int zend_init_add_array_helper_SPEC_CONST_CV(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2490 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_INIT_ARRAY_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_init_add_array_helper_SPEC_CONST_CV(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 2495 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ADD_ARRAY_ELEMENT_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_init_add_array_helper_SPEC_CONST_CV(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 235 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BW_NOT_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -3790,7 +3625,6 @@ static int ZEND_BW_NOT_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 246 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BOOL_NOT_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -3802,7 +3636,6 @@ static int ZEND_BOOL_NOT_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 824 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ECHO_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -3822,7 +3655,6 @@ static int ZEND_ECHO_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 843 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_PRINT_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -3833,7 +3665,6 @@ static int ZEND_PRINT_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        return ZEND_ECHO_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 853 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_fetch_var_address_helper_SPEC_TMP(int type, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -3923,43 +3754,36 @@ static int zend_fetch_var_address_helper_SPEC_TMP(int type, ZEND_OPCODE_HANDLER_
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 942 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_R_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_fetch_var_address_helper_SPEC_TMP(BP_VAR_R, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 947 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_W_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_fetch_var_address_helper_SPEC_TMP(BP_VAR_W, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 952 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_RW_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_fetch_var_address_helper_SPEC_TMP(BP_VAR_RW, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 957 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_FUNC_ARG_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_fetch_var_address_helper_SPEC_TMP(ARG_SHOULD_BE_SENT_BY_REF(EX(fbc), EX(opline)->extended_value)?BP_VAR_W:BP_VAR_R, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 963 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_UNSET_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_fetch_var_address_helper_SPEC_TMP(BP_VAR_UNSET, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 968 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_IS_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_fetch_var_address_helper_SPEC_TMP(BP_VAR_IS, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 1314 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_JMPZ_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -3978,7 +3802,6 @@ static int ZEND_JMPZ_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1332 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_JMPNZ_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -3997,7 +3820,6 @@ static int ZEND_JMPNZ_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1350 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_JMPZNZ_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -4020,7 +3842,6 @@ static int ZEND_JMPZNZ_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        }
 }
 
-#line 1372 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_JMPZ_EX_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -4040,7 +3861,6 @@ static int ZEND_JMPZ_EX_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1391 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_JMPNZ_EX_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -4060,14 +3880,12 @@ static int ZEND_JMPNZ_EX_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1410 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FREE_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zendi_zval_dtor(EX_T(EX(opline)->op1.u.var).tmp_var);
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1512 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_INIT_CTOR_CALL_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -4097,7 +3915,6 @@ static int ZEND_INIT_CTOR_CALL_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1902 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_RETURN_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -4172,7 +3989,6 @@ return_by_value:
        ZEND_VM_RETURN_FROM_EXECUTE_LOOP();
 }
 
-#line 2028 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_SEND_VAL_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -4198,7 +4014,6 @@ static int ZEND_SEND_VAL_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2217 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BOOL_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -4212,14 +4027,12 @@ static int ZEND_BOOL_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2288 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_SWITCH_FREE_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_switch_free(EX(opline), EX(Ts) TSRMLS_CC);
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2317 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_CLONE_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -4276,7 +4089,6 @@ static int ZEND_CLONE_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2500 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_CAST_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -4323,7 +4135,6 @@ static int ZEND_CAST_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2546 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_INCLUDE_OR_EVAL_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -4443,7 +4254,6 @@ static int ZEND_INCLUDE_OR_EVAL_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2665 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_UNSET_VAR_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -4491,7 +4301,6 @@ static int ZEND_UNSET_VAR_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2804 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FE_RESET_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -4575,7 +4384,6 @@ static int ZEND_FE_RESET_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 3022 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_JMP_NO_CTOR_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -4604,7 +4412,6 @@ static int ZEND_JMP_NO_CTOR_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 3050 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ISSET_ISEMPTY_VAR_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -4660,7 +4467,6 @@ static int ZEND_ISSET_ISEMPTY_VAR_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 3217 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_EXIT_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -4681,7 +4487,6 @@ static int ZEND_EXIT_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 3253 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_END_SILENCE_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -4697,7 +4502,6 @@ static int ZEND_END_SILENCE_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 3268 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_QM_ASSIGN_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -4712,7 +4516,6 @@ static int ZEND_QM_ASSIGN_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 3341 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_INSTANCEOF_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -4730,7 +4533,6 @@ static int ZEND_INSTANCEOF_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ADD_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -4744,7 +4546,6 @@ static int ZEND_ADD_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 14 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_SUB_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -4758,7 +4559,6 @@ static int ZEND_SUB_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 27 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_MUL_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -4772,7 +4572,6 @@ static int ZEND_MUL_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 40 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_DIV_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -4786,7 +4585,6 @@ static int ZEND_DIV_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 53 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_MOD_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -4800,7 +4598,6 @@ static int ZEND_MOD_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 66 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_SL_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -4814,7 +4611,6 @@ static int ZEND_SL_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 79 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_SR_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -4828,7 +4624,6 @@ static int ZEND_SR_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 92 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_CONCAT_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -4842,7 +4637,6 @@ static int ZEND_CONCAT_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 105 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_IDENTICAL_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -4856,7 +4650,6 @@ static int ZEND_IS_IDENTICAL_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 118 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_NOT_IDENTICAL_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -4870,7 +4663,6 @@ static int ZEND_IS_NOT_IDENTICAL_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 131 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_EQUAL_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -4884,7 +4676,6 @@ static int ZEND_IS_EQUAL_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 144 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_NOT_EQUAL_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -4898,7 +4689,6 @@ static int ZEND_IS_NOT_EQUAL_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 157 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_SMALLER_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -4912,7 +4702,6 @@ static int ZEND_IS_SMALLER_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 170 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_SMALLER_OR_EQUAL_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -4926,7 +4715,6 @@ static int ZEND_IS_SMALLER_OR_EQUAL_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_A
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 183 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BW_OR_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -4940,7 +4728,6 @@ static int ZEND_BW_OR_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 196 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BW_AND_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -4954,7 +4741,6 @@ static int ZEND_BW_AND_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 209 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BW_XOR_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -4968,7 +4754,6 @@ static int ZEND_BW_XOR_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 222 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BOOL_XOR_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -4982,7 +4767,6 @@ static int ZEND_BOOL_XOR_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1198 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_DIM_TMP_VAR_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -5006,7 +4790,6 @@ static int ZEND_FETCH_DIM_TMP_VAR_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARG
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1429 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ADD_CHAR_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -5019,7 +4802,6 @@ static int ZEND_ADD_CHAR_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1441 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ADD_STRING_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -5032,7 +4814,6 @@ static int ZEND_ADD_STRING_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1541 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_INIT_METHOD_CALL_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -5096,7 +4877,6 @@ static int ZEND_INIT_METHOD_CALL_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2256 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_CASE_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -5129,7 +4909,6 @@ static int ZEND_CASE_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2414 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_init_add_array_helper_SPEC_TMP_CONST(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -5206,19 +4985,16 @@ static int zend_init_add_array_helper_SPEC_TMP_CONST(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2490 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_INIT_ARRAY_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_init_add_array_helper_SPEC_TMP_CONST(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 2495 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ADD_ARRAY_ELEMENT_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_init_add_array_helper_SPEC_TMP_CONST(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 1 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ADD_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -5232,7 +5008,6 @@ static int ZEND_ADD_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 14 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_SUB_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -5246,7 +5021,6 @@ static int ZEND_SUB_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 27 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_MUL_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -5260,7 +5034,6 @@ static int ZEND_MUL_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 40 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_DIV_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -5274,7 +5047,6 @@ static int ZEND_DIV_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 53 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_MOD_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -5288,7 +5060,6 @@ static int ZEND_MOD_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 66 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_SL_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -5302,7 +5073,6 @@ static int ZEND_SL_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 79 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_SR_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -5316,7 +5086,6 @@ static int ZEND_SR_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 92 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_CONCAT_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -5330,7 +5099,6 @@ static int ZEND_CONCAT_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 105 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_IDENTICAL_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -5344,7 +5112,6 @@ static int ZEND_IS_IDENTICAL_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 118 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_NOT_IDENTICAL_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -5358,7 +5125,6 @@ static int ZEND_IS_NOT_IDENTICAL_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 131 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_EQUAL_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -5372,7 +5138,6 @@ static int ZEND_IS_EQUAL_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 144 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_NOT_EQUAL_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -5386,7 +5151,6 @@ static int ZEND_IS_NOT_EQUAL_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 157 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_SMALLER_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -5400,7 +5164,6 @@ static int ZEND_IS_SMALLER_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 170 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_SMALLER_OR_EQUAL_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -5414,7 +5177,6 @@ static int ZEND_IS_SMALLER_OR_EQUAL_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARG
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 183 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BW_OR_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -5428,7 +5190,6 @@ static int ZEND_BW_OR_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 196 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BW_AND_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -5442,7 +5203,6 @@ static int ZEND_BW_AND_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 209 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BW_XOR_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -5456,7 +5216,6 @@ static int ZEND_BW_XOR_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 222 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BOOL_XOR_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -5470,7 +5229,6 @@ static int ZEND_BOOL_XOR_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1453 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ADD_VAR_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -5500,7 +5258,6 @@ static int ZEND_ADD_VAR_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1541 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_INIT_METHOD_CALL_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -5564,7 +5321,6 @@ static int ZEND_INIT_METHOD_CALL_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2256 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_CASE_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -5597,7 +5353,6 @@ static int ZEND_CASE_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2414 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_init_add_array_helper_SPEC_TMP_TMP(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -5674,19 +5429,16 @@ static int zend_init_add_array_helper_SPEC_TMP_TMP(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2490 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_INIT_ARRAY_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_init_add_array_helper_SPEC_TMP_TMP(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 2495 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ADD_ARRAY_ELEMENT_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_init_add_array_helper_SPEC_TMP_TMP(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 1 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ADD_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -5700,7 +5452,6 @@ static int ZEND_ADD_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 14 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_SUB_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -5714,7 +5465,6 @@ static int ZEND_SUB_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 27 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_MUL_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -5728,7 +5478,6 @@ static int ZEND_MUL_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 40 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_DIV_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -5742,7 +5491,6 @@ static int ZEND_DIV_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 53 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_MOD_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -5756,7 +5504,6 @@ static int ZEND_MOD_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 66 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_SL_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -5770,7 +5517,6 @@ static int ZEND_SL_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 79 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_SR_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -5784,7 +5530,6 @@ static int ZEND_SR_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 92 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_CONCAT_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -5798,7 +5543,6 @@ static int ZEND_CONCAT_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 105 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_IDENTICAL_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -5812,7 +5556,6 @@ static int ZEND_IS_IDENTICAL_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 118 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_NOT_IDENTICAL_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -5826,7 +5569,6 @@ static int ZEND_IS_NOT_IDENTICAL_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 131 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_EQUAL_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -5840,7 +5582,6 @@ static int ZEND_IS_EQUAL_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 144 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_NOT_EQUAL_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -5854,7 +5595,6 @@ static int ZEND_IS_NOT_EQUAL_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 157 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_SMALLER_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -5868,7 +5608,6 @@ static int ZEND_IS_SMALLER_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 170 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_SMALLER_OR_EQUAL_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -5882,7 +5621,6 @@ static int ZEND_IS_SMALLER_OR_EQUAL_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARG
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 183 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BW_OR_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -5896,7 +5634,6 @@ static int ZEND_BW_OR_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 196 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BW_AND_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -5910,7 +5647,6 @@ static int ZEND_BW_AND_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 209 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BW_XOR_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -5924,7 +5660,6 @@ static int ZEND_BW_XOR_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 222 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BOOL_XOR_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -5938,7 +5673,6 @@ static int ZEND_BOOL_XOR_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1453 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ADD_VAR_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -5968,7 +5702,6 @@ static int ZEND_ADD_VAR_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1541 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_INIT_METHOD_CALL_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -6032,7 +5765,6 @@ static int ZEND_INIT_METHOD_CALL_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2256 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_CASE_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -6065,7 +5797,6 @@ static int ZEND_CASE_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2414 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_init_add_array_helper_SPEC_TMP_VAR(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -6142,19 +5873,16 @@ static int zend_init_add_array_helper_SPEC_TMP_VAR(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2490 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_INIT_ARRAY_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_init_add_array_helper_SPEC_TMP_VAR(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 2495 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ADD_ARRAY_ELEMENT_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_init_add_array_helper_SPEC_TMP_VAR(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 2414 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_init_add_array_helper_SPEC_TMP_UNUSED(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -6231,19 +5959,16 @@ static int zend_init_add_array_helper_SPEC_TMP_UNUSED(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2490 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_INIT_ARRAY_SPEC_TMP_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_init_add_array_helper_SPEC_TMP_UNUSED(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 2495 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ADD_ARRAY_ELEMENT_SPEC_TMP_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_init_add_array_helper_SPEC_TMP_UNUSED(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 1 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ADD_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -6257,7 +5982,6 @@ static int ZEND_ADD_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 14 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_SUB_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -6271,7 +5995,6 @@ static int ZEND_SUB_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 27 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_MUL_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -6285,7 +6008,6 @@ static int ZEND_MUL_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 40 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_DIV_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -6299,7 +6021,6 @@ static int ZEND_DIV_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 53 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_MOD_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -6313,7 +6034,6 @@ static int ZEND_MOD_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 66 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_SL_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -6327,7 +6047,6 @@ static int ZEND_SL_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 79 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_SR_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -6341,7 +6060,6 @@ static int ZEND_SR_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 92 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_CONCAT_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -6355,7 +6073,6 @@ static int ZEND_CONCAT_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 105 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_IDENTICAL_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -6369,7 +6086,6 @@ static int ZEND_IS_IDENTICAL_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 118 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_NOT_IDENTICAL_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -6383,7 +6099,6 @@ static int ZEND_IS_NOT_IDENTICAL_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 131 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_EQUAL_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -6397,7 +6112,6 @@ static int ZEND_IS_EQUAL_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 144 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_NOT_EQUAL_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -6411,7 +6125,6 @@ static int ZEND_IS_NOT_EQUAL_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 157 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_SMALLER_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -6425,7 +6138,6 @@ static int ZEND_IS_SMALLER_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 170 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_SMALLER_OR_EQUAL_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -6439,7 +6151,6 @@ static int ZEND_IS_SMALLER_OR_EQUAL_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 183 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BW_OR_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -6453,7 +6164,6 @@ static int ZEND_BW_OR_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 196 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BW_AND_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -6467,7 +6177,6 @@ static int ZEND_BW_AND_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 209 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BW_XOR_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -6481,7 +6190,6 @@ static int ZEND_BW_XOR_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 222 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BOOL_XOR_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -6495,7 +6203,6 @@ static int ZEND_BOOL_XOR_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1453 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ADD_VAR_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -6525,7 +6232,6 @@ static int ZEND_ADD_VAR_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1541 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_INIT_METHOD_CALL_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -6589,7 +6295,6 @@ static int ZEND_INIT_METHOD_CALL_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2256 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_CASE_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -6622,7 +6327,6 @@ static int ZEND_CASE_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2414 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_init_add_array_helper_SPEC_TMP_CV(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -6699,19 +6403,16 @@ static int zend_init_add_array_helper_SPEC_TMP_CV(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2490 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_INIT_ARRAY_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_init_add_array_helper_SPEC_TMP_CV(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 2495 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ADD_ARRAY_ELEMENT_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_init_add_array_helper_SPEC_TMP_CV(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 235 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BW_NOT_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -6723,7 +6424,6 @@ static int ZEND_BW_NOT_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 246 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BOOL_NOT_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -6735,7 +6435,6 @@ static int ZEND_BOOL_NOT_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 658 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_PRE_INC_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -6779,7 +6478,6 @@ static int ZEND_PRE_INC_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 701 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_PRE_DEC_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -6823,7 +6521,6 @@ static int ZEND_PRE_DEC_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 744 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_POST_INC_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -6864,7 +6561,6 @@ static int ZEND_POST_INC_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 784 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_POST_DEC_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -6905,7 +6601,6 @@ static int ZEND_POST_DEC_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 824 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ECHO_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -6925,7 +6620,6 @@ static int ZEND_ECHO_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 843 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_PRINT_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -6936,7 +6630,6 @@ static int ZEND_PRINT_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        return ZEND_ECHO_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 853 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_fetch_var_address_helper_SPEC_VAR(int type, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -7026,43 +6719,36 @@ static int zend_fetch_var_address_helper_SPEC_VAR(int type, ZEND_OPCODE_HANDLER_
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 942 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_R_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_fetch_var_address_helper_SPEC_VAR(BP_VAR_R, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 947 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_W_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_fetch_var_address_helper_SPEC_VAR(BP_VAR_W, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 952 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_RW_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_fetch_var_address_helper_SPEC_VAR(BP_VAR_RW, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 957 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_FUNC_ARG_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_fetch_var_address_helper_SPEC_VAR(ARG_SHOULD_BE_SENT_BY_REF(EX(fbc), EX(opline)->extended_value)?BP_VAR_W:BP_VAR_R, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 963 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_UNSET_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_fetch_var_address_helper_SPEC_VAR(BP_VAR_UNSET, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 968 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_IS_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_fetch_var_address_helper_SPEC_VAR(BP_VAR_IS, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 1314 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_JMPZ_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -7081,7 +6767,6 @@ static int ZEND_JMPZ_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1332 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_JMPNZ_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -7100,7 +6785,6 @@ static int ZEND_JMPNZ_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1350 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_JMPZNZ_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -7123,7 +6807,6 @@ static int ZEND_JMPZNZ_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        }
 }
 
-#line 1372 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_JMPZ_EX_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -7143,7 +6826,6 @@ static int ZEND_JMPZ_EX_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1391 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_JMPNZ_EX_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -7163,7 +6845,6 @@ static int ZEND_JMPNZ_EX_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1512 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_INIT_CTOR_CALL_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -7193,7 +6874,6 @@ static int ZEND_INIT_CTOR_CALL_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1902 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_RETURN_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -7268,7 +6948,6 @@ return_by_value:
        ZEND_VM_RETURN_FROM_EXECUTE_LOOP();
 }
 
-#line 1976 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_THROW_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -7293,7 +6972,6 @@ static int ZEND_THROW_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2028 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_SEND_VAL_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -7319,7 +6997,6 @@ static int ZEND_SEND_VAL_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2053 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_send_by_var_helper_SPEC_VAR(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -7347,7 +7024,6 @@ static int zend_send_by_var_helper_SPEC_VAR(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2080 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_SEND_VAR_NO_REF_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -7375,7 +7051,6 @@ static int ZEND_SEND_VAR_NO_REF_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2107 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_SEND_REF_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -7397,7 +7072,6 @@ static int ZEND_SEND_REF_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2128 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_SEND_VAR_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -7409,7 +7083,6 @@ static int ZEND_SEND_VAR_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        return zend_send_by_var_helper_SPEC_VAR(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 2217 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BOOL_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -7423,14 +7096,12 @@ static int ZEND_BOOL_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2288 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_SWITCH_FREE_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_switch_free(EX(opline), EX(Ts) TSRMLS_CC);
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2317 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_CLONE_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -7487,7 +7158,6 @@ static int ZEND_CLONE_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2500 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_CAST_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -7534,7 +7204,6 @@ static int ZEND_CAST_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2546 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_INCLUDE_OR_EVAL_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -7654,7 +7323,6 @@ static int ZEND_INCLUDE_OR_EVAL_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2665 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_UNSET_VAR_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -7702,7 +7370,6 @@ static int ZEND_UNSET_VAR_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2804 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FE_RESET_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -7786,7 +7453,6 @@ static int ZEND_FE_RESET_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2887 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FE_FETCH_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -7922,7 +7588,6 @@ static int ZEND_FE_FETCH_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 3022 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_JMP_NO_CTOR_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -7951,7 +7616,6 @@ static int ZEND_JMP_NO_CTOR_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 3050 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ISSET_ISEMPTY_VAR_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -8007,7 +7671,6 @@ static int ZEND_ISSET_ISEMPTY_VAR_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 3217 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_EXIT_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -8028,7 +7691,6 @@ static int ZEND_EXIT_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 3268 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_QM_ASSIGN_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -8043,7 +7705,6 @@ static int ZEND_QM_ASSIGN_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 3341 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_INSTANCEOF_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -8061,7 +7722,6 @@ static int ZEND_INSTANCEOF_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ADD_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -8075,7 +7735,6 @@ static int ZEND_ADD_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 14 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_SUB_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -8089,7 +7748,6 @@ static int ZEND_SUB_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 27 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_MUL_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -8103,7 +7761,6 @@ static int ZEND_MUL_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 40 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_DIV_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -8117,7 +7774,6 @@ static int ZEND_DIV_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 53 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_MOD_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -8131,7 +7787,6 @@ static int ZEND_MOD_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 66 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_SL_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -8145,7 +7800,6 @@ static int ZEND_SL_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 79 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_SR_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -8159,7 +7813,6 @@ static int ZEND_SR_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 92 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_CONCAT_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -8173,7 +7826,6 @@ static int ZEND_CONCAT_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 105 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_IDENTICAL_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -8187,7 +7839,6 @@ static int ZEND_IS_IDENTICAL_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 118 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_NOT_IDENTICAL_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -8201,7 +7852,6 @@ static int ZEND_IS_NOT_IDENTICAL_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 131 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_EQUAL_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -8215,7 +7865,6 @@ static int ZEND_IS_EQUAL_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 144 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_NOT_EQUAL_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -8229,7 +7878,6 @@ static int ZEND_IS_NOT_EQUAL_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 157 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_SMALLER_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -8243,7 +7891,6 @@ static int ZEND_IS_SMALLER_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 170 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_SMALLER_OR_EQUAL_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -8257,7 +7904,6 @@ static int ZEND_IS_SMALLER_OR_EQUAL_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_A
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 183 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BW_OR_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -8271,7 +7917,6 @@ static int ZEND_BW_OR_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 196 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BW_AND_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -8285,7 +7930,6 @@ static int ZEND_BW_AND_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 209 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BW_XOR_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -8299,7 +7943,6 @@ static int ZEND_BW_XOR_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 222 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BOOL_XOR_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -8313,7 +7956,6 @@ static int ZEND_BOOL_XOR_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 257 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_binary_assign_op_obj_helper_SPEC_VAR_CONST(int (*binary_op)(zval *result, zval *op1, zval *op2 TSRMLS_DC), ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -8427,7 +8069,6 @@ static int zend_binary_assign_op_obj_helper_SPEC_VAR_CONST(int (*binary_op)(zval
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 370 "/home/andi/php5/Zend/zend_vm_def.h"
 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);
@@ -8513,73 +8154,61 @@ static int zend_binary_assign_op_helper_SPEC_VAR_CONST(int (*binary_op)(zval *re
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 455 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_ADD_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_VAR_CONST(add_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 460 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_SUB_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_VAR_CONST(sub_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 465 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_MUL_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_VAR_CONST(mul_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 470 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_DIV_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_VAR_CONST(div_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 475 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_MOD_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_VAR_CONST(mod_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 480 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_SL_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_VAR_CONST(shift_left_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 485 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_SR_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_VAR_CONST(shift_right_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 490 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_CONCAT_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_VAR_CONST(concat_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 495 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_BW_OR_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_VAR_CONST(bitwise_or_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 500 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_BW_AND_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_VAR_CONST(bitwise_and_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 505 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_BW_XOR_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_VAR_CONST(bitwise_xor_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 510 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_pre_incdec_property_helper_SPEC_VAR_CONST(incdec_t incdec_op, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -8646,19 +8275,16 @@ static int zend_pre_incdec_property_helper_SPEC_VAR_CONST(incdec_t incdec_op, ZE
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 576 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_PRE_INC_OBJ_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_pre_incdec_property_helper_SPEC_VAR_CONST(increment_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 581 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_PRE_DEC_OBJ_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_pre_incdec_property_helper_SPEC_VAR_CONST(decrement_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 586 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_post_incdec_property_helper_SPEC_VAR_CONST(incdec_t incdec_op, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -8721,19 +8347,16 @@ static int zend_post_incdec_property_helper_SPEC_VAR_CONST(incdec_t incdec_op, Z
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 648 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_POST_INC_OBJ_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_post_incdec_property_helper_SPEC_VAR_CONST(increment_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 653 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_POST_DEC_OBJ_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_post_incdec_property_helper_SPEC_VAR_CONST(decrement_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 973 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_DIM_R_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -8748,7 +8371,6 @@ static int ZEND_FETCH_DIM_R_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 987 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_DIM_W_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -8760,7 +8382,6 @@ static int ZEND_FETCH_DIM_W_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 998 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_DIM_RW_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -8772,7 +8393,6 @@ static int ZEND_FETCH_DIM_RW_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1009 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_DIM_IS_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -8784,7 +8404,6 @@ static int ZEND_FETCH_DIM_IS_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1020 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_DIM_FUNC_ARG_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -8797,7 +8416,6 @@ static int ZEND_FETCH_DIM_FUNC_ARG_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_AR
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1032 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_DIM_UNSET_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -8826,7 +8444,6 @@ static int ZEND_FETCH_DIM_UNSET_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1060 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_fetch_property_address_read_helper_SPEC_VAR_CONST(int type, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -8894,13 +8511,11 @@ static int zend_fetch_property_address_read_helper_SPEC_VAR_CONST(int type, ZEND
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1127 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_R_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_fetch_property_address_read_helper_SPEC_VAR_CONST(BP_VAR_R, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 1132 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_W_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -8916,7 +8531,6 @@ static int ZEND_FETCH_OBJ_W_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1147 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_RW_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -8928,13 +8542,11 @@ static int ZEND_FETCH_OBJ_RW_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1158 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_IS_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_fetch_property_address_read_helper_SPEC_VAR_CONST(BP_VAR_IS, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 1163 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_FUNC_ARG_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -8952,7 +8564,6 @@ static int ZEND_FETCH_OBJ_FUNC_ARG_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_AR
        }
 }
 
-#line 1180 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_UNSET_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -8971,7 +8582,6 @@ static int ZEND_FETCH_OBJ_UNSET_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1221 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_OBJ_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -8986,7 +8596,6 @@ static int ZEND_ASSIGN_OBJ_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1235 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_DIM_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -9023,7 +8632,6 @@ static int ZEND_ASSIGN_DIM_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1271 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -9037,7 +8645,6 @@ static int ZEND_ASSIGN_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1541 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_INIT_METHOD_CALL_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -9101,7 +8708,6 @@ static int ZEND_INIT_METHOD_CALL_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2256 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_CASE_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -9134,7 +8740,6 @@ static int ZEND_CASE_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2414 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_init_add_array_helper_SPEC_VAR_CONST(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -9211,19 +8816,16 @@ static int zend_init_add_array_helper_SPEC_VAR_CONST(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2490 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_INIT_ARRAY_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_init_add_array_helper_SPEC_VAR_CONST(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 2495 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ADD_ARRAY_ELEMENT_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_init_add_array_helper_SPEC_VAR_CONST(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 2712 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_UNSET_DIM_OBJ_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -9316,7 +8918,6 @@ static int ZEND_UNSET_DIM_OBJ_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 3105 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_isset_isempty_dim_prop_obj_handler_SPEC_VAR_CONST(int prop_dim, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -9419,19 +9020,16 @@ static int zend_isset_isempty_dim_prop_obj_handler_SPEC_VAR_CONST(int prop_dim,
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 3207 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ISSET_ISEMPTY_DIM_OBJ_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_isset_isempty_dim_prop_obj_handler_SPEC_VAR_CONST(0, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 3212 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ISSET_ISEMPTY_PROP_OBJ_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_isset_isempty_dim_prop_obj_handler_SPEC_VAR_CONST(1, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 1 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ADD_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -9445,7 +9043,6 @@ static int ZEND_ADD_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 14 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_SUB_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -9459,7 +9056,6 @@ static int ZEND_SUB_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 27 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_MUL_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -9473,7 +9069,6 @@ static int ZEND_MUL_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 40 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_DIV_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -9487,7 +9082,6 @@ static int ZEND_DIV_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 53 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_MOD_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -9501,7 +9095,6 @@ static int ZEND_MOD_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 66 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_SL_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -9515,7 +9108,6 @@ static int ZEND_SL_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 79 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_SR_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -9529,7 +9121,6 @@ static int ZEND_SR_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 92 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_CONCAT_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -9543,7 +9134,6 @@ static int ZEND_CONCAT_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 105 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_IDENTICAL_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -9557,7 +9147,6 @@ static int ZEND_IS_IDENTICAL_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 118 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_NOT_IDENTICAL_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -9571,7 +9160,6 @@ static int ZEND_IS_NOT_IDENTICAL_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 131 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_EQUAL_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -9585,7 +9173,6 @@ static int ZEND_IS_EQUAL_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 144 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_NOT_EQUAL_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -9599,7 +9186,6 @@ static int ZEND_IS_NOT_EQUAL_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 157 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_SMALLER_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -9613,7 +9199,6 @@ static int ZEND_IS_SMALLER_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 170 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_SMALLER_OR_EQUAL_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -9627,7 +9212,6 @@ static int ZEND_IS_SMALLER_OR_EQUAL_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARG
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 183 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BW_OR_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -9641,7 +9225,6 @@ static int ZEND_BW_OR_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 196 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BW_AND_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -9655,7 +9238,6 @@ static int ZEND_BW_AND_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 209 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BW_XOR_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -9669,7 +9251,6 @@ static int ZEND_BW_XOR_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 222 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BOOL_XOR_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -9683,7 +9264,6 @@ static int ZEND_BOOL_XOR_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 257 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_binary_assign_op_obj_helper_SPEC_VAR_TMP(int (*binary_op)(zval *result, zval *op1, zval *op2 TSRMLS_DC), ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -9797,7 +9377,6 @@ static int zend_binary_assign_op_obj_helper_SPEC_VAR_TMP(int (*binary_op)(zval *
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 370 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_binary_assign_op_helper_SPEC_VAR_TMP(int (*binary_op)(zval *result, zval *op1, zval *op2 TSRMLS_DC), ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -9883,73 +9462,61 @@ static int zend_binary_assign_op_helper_SPEC_VAR_TMP(int (*binary_op)(zval *resu
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 455 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_ADD_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_VAR_TMP(add_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 460 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_SUB_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_VAR_TMP(sub_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 465 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_MUL_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_VAR_TMP(mul_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 470 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_DIV_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_VAR_TMP(div_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 475 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_MOD_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_VAR_TMP(mod_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 480 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_SL_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_VAR_TMP(shift_left_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 485 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_SR_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_VAR_TMP(shift_right_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 490 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_CONCAT_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_VAR_TMP(concat_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 495 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_BW_OR_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_VAR_TMP(bitwise_or_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 500 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_BW_AND_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_VAR_TMP(bitwise_and_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 505 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_BW_XOR_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_VAR_TMP(bitwise_xor_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 510 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_pre_incdec_property_helper_SPEC_VAR_TMP(incdec_t incdec_op, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -10016,19 +9583,16 @@ static int zend_pre_incdec_property_helper_SPEC_VAR_TMP(incdec_t incdec_op, ZEND
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 576 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_PRE_INC_OBJ_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_pre_incdec_property_helper_SPEC_VAR_TMP(increment_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 581 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_PRE_DEC_OBJ_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_pre_incdec_property_helper_SPEC_VAR_TMP(decrement_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 586 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_post_incdec_property_helper_SPEC_VAR_TMP(incdec_t incdec_op, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -10091,19 +9655,16 @@ static int zend_post_incdec_property_helper_SPEC_VAR_TMP(incdec_t incdec_op, ZEN
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 648 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_POST_INC_OBJ_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_post_incdec_property_helper_SPEC_VAR_TMP(increment_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 653 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_POST_DEC_OBJ_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_post_incdec_property_helper_SPEC_VAR_TMP(decrement_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 973 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_DIM_R_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -10118,7 +9679,6 @@ static int ZEND_FETCH_DIM_R_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 987 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_DIM_W_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -10130,7 +9690,6 @@ static int ZEND_FETCH_DIM_W_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 998 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_DIM_RW_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -10142,7 +9701,6 @@ static int ZEND_FETCH_DIM_RW_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1009 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_DIM_IS_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -10154,7 +9712,6 @@ static int ZEND_FETCH_DIM_IS_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1020 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_DIM_FUNC_ARG_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -10167,7 +9724,6 @@ static int ZEND_FETCH_DIM_FUNC_ARG_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1032 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_DIM_UNSET_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -10196,7 +9752,6 @@ static int ZEND_FETCH_DIM_UNSET_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1060 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_fetch_property_address_read_helper_SPEC_VAR_TMP(int type, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -10264,13 +9819,11 @@ static int zend_fetch_property_address_read_helper_SPEC_VAR_TMP(int type, ZEND_O
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1127 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_R_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_fetch_property_address_read_helper_SPEC_VAR_TMP(BP_VAR_R, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 1132 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_W_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -10286,7 +9839,6 @@ static int ZEND_FETCH_OBJ_W_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1147 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_RW_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -10298,13 +9850,11 @@ static int ZEND_FETCH_OBJ_RW_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1158 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_IS_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_fetch_property_address_read_helper_SPEC_VAR_TMP(BP_VAR_IS, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 1163 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_FUNC_ARG_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -10322,7 +9872,6 @@ static int ZEND_FETCH_OBJ_FUNC_ARG_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS
        }
 }
 
-#line 1180 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_UNSET_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -10341,7 +9890,6 @@ static int ZEND_FETCH_OBJ_UNSET_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1221 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_OBJ_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -10356,7 +9904,6 @@ static int ZEND_ASSIGN_OBJ_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1235 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_DIM_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -10393,7 +9940,6 @@ static int ZEND_ASSIGN_DIM_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1271 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -10407,7 +9953,6 @@ static int ZEND_ASSIGN_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1541 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_INIT_METHOD_CALL_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -10471,7 +10016,6 @@ static int ZEND_INIT_METHOD_CALL_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2256 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_CASE_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -10504,7 +10048,6 @@ static int ZEND_CASE_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2414 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_init_add_array_helper_SPEC_VAR_TMP(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -10581,19 +10124,16 @@ static int zend_init_add_array_helper_SPEC_VAR_TMP(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2490 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_INIT_ARRAY_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_init_add_array_helper_SPEC_VAR_TMP(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 2495 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ADD_ARRAY_ELEMENT_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_init_add_array_helper_SPEC_VAR_TMP(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 2712 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_UNSET_DIM_OBJ_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -10686,7 +10226,6 @@ static int ZEND_UNSET_DIM_OBJ_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 3105 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_isset_isempty_dim_prop_obj_handler_SPEC_VAR_TMP(int prop_dim, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -10789,19 +10328,16 @@ static int zend_isset_isempty_dim_prop_obj_handler_SPEC_VAR_TMP(int prop_dim, ZE
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 3207 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ISSET_ISEMPTY_DIM_OBJ_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_isset_isempty_dim_prop_obj_handler_SPEC_VAR_TMP(0, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 3212 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ISSET_ISEMPTY_PROP_OBJ_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_isset_isempty_dim_prop_obj_handler_SPEC_VAR_TMP(1, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 1 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ADD_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -10815,7 +10351,6 @@ static int ZEND_ADD_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 14 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_SUB_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -10829,7 +10364,6 @@ static int ZEND_SUB_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 27 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_MUL_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -10843,7 +10377,6 @@ static int ZEND_MUL_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 40 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_DIV_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -10857,7 +10390,6 @@ static int ZEND_DIV_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 53 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_MOD_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -10871,7 +10403,6 @@ static int ZEND_MOD_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 66 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_SL_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -10885,7 +10416,6 @@ static int ZEND_SL_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 79 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_SR_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -10899,7 +10429,6 @@ static int ZEND_SR_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 92 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_CONCAT_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -10913,7 +10442,6 @@ static int ZEND_CONCAT_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 105 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_IDENTICAL_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -10927,7 +10455,6 @@ static int ZEND_IS_IDENTICAL_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 118 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_NOT_IDENTICAL_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -10941,7 +10468,6 @@ static int ZEND_IS_NOT_IDENTICAL_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 131 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_EQUAL_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -10955,7 +10481,6 @@ static int ZEND_IS_EQUAL_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 144 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_NOT_EQUAL_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -10969,7 +10494,6 @@ static int ZEND_IS_NOT_EQUAL_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 157 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_SMALLER_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -10983,7 +10507,6 @@ static int ZEND_IS_SMALLER_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 170 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_SMALLER_OR_EQUAL_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -10997,7 +10520,6 @@ static int ZEND_IS_SMALLER_OR_EQUAL_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARG
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 183 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BW_OR_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -11011,7 +10533,6 @@ static int ZEND_BW_OR_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 196 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BW_AND_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -11025,7 +10546,6 @@ static int ZEND_BW_AND_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 209 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BW_XOR_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -11039,7 +10559,6 @@ static int ZEND_BW_XOR_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 222 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BOOL_XOR_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -11053,7 +10572,6 @@ static int ZEND_BOOL_XOR_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 257 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_binary_assign_op_obj_helper_SPEC_VAR_VAR(int (*binary_op)(zval *result, zval *op1, zval *op2 TSRMLS_DC), ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -11167,7 +10685,6 @@ static int zend_binary_assign_op_obj_helper_SPEC_VAR_VAR(int (*binary_op)(zval *
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 370 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_binary_assign_op_helper_SPEC_VAR_VAR(int (*binary_op)(zval *result, zval *op1, zval *op2 TSRMLS_DC), ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -11253,73 +10770,61 @@ static int zend_binary_assign_op_helper_SPEC_VAR_VAR(int (*binary_op)(zval *resu
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 455 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_ADD_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_VAR_VAR(add_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 460 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_SUB_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_VAR_VAR(sub_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 465 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_MUL_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_VAR_VAR(mul_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 470 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_DIV_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_VAR_VAR(div_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 475 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_MOD_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_VAR_VAR(mod_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 480 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_SL_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_VAR_VAR(shift_left_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 485 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_SR_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_VAR_VAR(shift_right_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 490 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_CONCAT_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_VAR_VAR(concat_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 495 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_BW_OR_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_VAR_VAR(bitwise_or_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 500 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_BW_AND_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_VAR_VAR(bitwise_and_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 505 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_BW_XOR_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_VAR_VAR(bitwise_xor_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 510 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_pre_incdec_property_helper_SPEC_VAR_VAR(incdec_t incdec_op, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -11386,19 +10891,16 @@ static int zend_pre_incdec_property_helper_SPEC_VAR_VAR(incdec_t incdec_op, ZEND
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 576 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_PRE_INC_OBJ_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_pre_incdec_property_helper_SPEC_VAR_VAR(increment_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 581 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_PRE_DEC_OBJ_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_pre_incdec_property_helper_SPEC_VAR_VAR(decrement_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 586 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_post_incdec_property_helper_SPEC_VAR_VAR(incdec_t incdec_op, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -11461,19 +10963,16 @@ static int zend_post_incdec_property_helper_SPEC_VAR_VAR(incdec_t incdec_op, ZEN
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 648 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_POST_INC_OBJ_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_post_incdec_property_helper_SPEC_VAR_VAR(increment_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 653 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_POST_DEC_OBJ_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_post_incdec_property_helper_SPEC_VAR_VAR(decrement_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 973 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_DIM_R_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -11488,7 +10987,6 @@ static int ZEND_FETCH_DIM_R_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 987 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_DIM_W_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -11500,7 +10998,6 @@ static int ZEND_FETCH_DIM_W_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 998 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_DIM_RW_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -11512,7 +11009,6 @@ static int ZEND_FETCH_DIM_RW_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1009 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_DIM_IS_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -11524,7 +11020,6 @@ static int ZEND_FETCH_DIM_IS_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1020 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_DIM_FUNC_ARG_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -11537,7 +11032,6 @@ static int ZEND_FETCH_DIM_FUNC_ARG_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1032 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_DIM_UNSET_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -11566,7 +11060,6 @@ static int ZEND_FETCH_DIM_UNSET_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1060 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_fetch_property_address_read_helper_SPEC_VAR_VAR(int type, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -11634,13 +11127,11 @@ static int zend_fetch_property_address_read_helper_SPEC_VAR_VAR(int type, ZEND_O
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1127 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_R_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_fetch_property_address_read_helper_SPEC_VAR_VAR(BP_VAR_R, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 1132 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_W_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -11656,7 +11147,6 @@ static int ZEND_FETCH_OBJ_W_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1147 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_RW_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -11668,13 +11158,11 @@ static int ZEND_FETCH_OBJ_RW_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1158 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_IS_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_fetch_property_address_read_helper_SPEC_VAR_VAR(BP_VAR_IS, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 1163 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_FUNC_ARG_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -11692,7 +11180,6 @@ static int ZEND_FETCH_OBJ_FUNC_ARG_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS
        }
 }
 
-#line 1180 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_UNSET_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -11711,7 +11198,6 @@ static int ZEND_FETCH_OBJ_UNSET_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1221 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_OBJ_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -11726,7 +11212,6 @@ static int ZEND_ASSIGN_OBJ_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1235 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_DIM_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -11763,7 +11248,6 @@ static int ZEND_ASSIGN_DIM_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1271 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -11777,7 +11261,6 @@ static int ZEND_ASSIGN_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1284 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_REF_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -11799,7 +11282,6 @@ static int ZEND_ASSIGN_REF_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1541 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_INIT_METHOD_CALL_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -11863,7 +11345,6 @@ static int ZEND_INIT_METHOD_CALL_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2256 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_CASE_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -11896,7 +11377,6 @@ static int ZEND_CASE_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2414 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_init_add_array_helper_SPEC_VAR_VAR(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -11973,19 +11453,16 @@ static int zend_init_add_array_helper_SPEC_VAR_VAR(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2490 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_INIT_ARRAY_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_init_add_array_helper_SPEC_VAR_VAR(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 2495 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ADD_ARRAY_ELEMENT_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_init_add_array_helper_SPEC_VAR_VAR(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 2712 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_UNSET_DIM_OBJ_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -12078,7 +11555,6 @@ static int ZEND_UNSET_DIM_OBJ_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 3105 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_isset_isempty_dim_prop_obj_handler_SPEC_VAR_VAR(int prop_dim, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -12181,19 +11657,16 @@ static int zend_isset_isempty_dim_prop_obj_handler_SPEC_VAR_VAR(int prop_dim, ZE
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 3207 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ISSET_ISEMPTY_DIM_OBJ_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_isset_isempty_dim_prop_obj_handler_SPEC_VAR_VAR(0, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 3212 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ISSET_ISEMPTY_PROP_OBJ_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_isset_isempty_dim_prop_obj_handler_SPEC_VAR_VAR(1, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 987 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_DIM_W_SPEC_VAR_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -12205,7 +11678,6 @@ static int ZEND_FETCH_DIM_W_SPEC_VAR_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1235 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_DIM_SPEC_VAR_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -12242,7 +11714,6 @@ static int ZEND_ASSIGN_DIM_SPEC_VAR_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2414 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_init_add_array_helper_SPEC_VAR_UNUSED(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -12319,19 +11790,16 @@ static int zend_init_add_array_helper_SPEC_VAR_UNUSED(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2490 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_INIT_ARRAY_SPEC_VAR_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_init_add_array_helper_SPEC_VAR_UNUSED(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 2495 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ADD_ARRAY_ELEMENT_SPEC_VAR_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_init_add_array_helper_SPEC_VAR_UNUSED(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 1 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ADD_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -12345,7 +11813,6 @@ static int ZEND_ADD_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 14 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_SUB_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -12359,7 +11826,6 @@ static int ZEND_SUB_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 27 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_MUL_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -12373,7 +11839,6 @@ static int ZEND_MUL_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 40 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_DIV_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -12387,7 +11852,6 @@ static int ZEND_DIV_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 53 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_MOD_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -12401,7 +11865,6 @@ static int ZEND_MOD_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 66 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_SL_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -12415,7 +11878,6 @@ static int ZEND_SL_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 79 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_SR_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -12429,7 +11891,6 @@ static int ZEND_SR_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 92 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_CONCAT_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -12443,7 +11904,6 @@ static int ZEND_CONCAT_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 105 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_IDENTICAL_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -12457,7 +11917,6 @@ static int ZEND_IS_IDENTICAL_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 118 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_NOT_IDENTICAL_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -12471,7 +11930,6 @@ static int ZEND_IS_NOT_IDENTICAL_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 131 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_EQUAL_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -12485,7 +11943,6 @@ static int ZEND_IS_EQUAL_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 144 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_NOT_EQUAL_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -12499,7 +11956,6 @@ static int ZEND_IS_NOT_EQUAL_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 157 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_SMALLER_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -12513,7 +11969,6 @@ static int ZEND_IS_SMALLER_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 170 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_SMALLER_OR_EQUAL_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -12527,7 +11982,6 @@ static int ZEND_IS_SMALLER_OR_EQUAL_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 183 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BW_OR_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -12541,7 +11995,6 @@ static int ZEND_BW_OR_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 196 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BW_AND_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -12555,7 +12008,6 @@ static int ZEND_BW_AND_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 209 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BW_XOR_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -12569,7 +12021,6 @@ static int ZEND_BW_XOR_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 222 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BOOL_XOR_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -12583,7 +12034,6 @@ static int ZEND_BOOL_XOR_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 257 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_binary_assign_op_obj_helper_SPEC_VAR_CV(int (*binary_op)(zval *result, zval *op1, zval *op2 TSRMLS_DC), ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -12697,7 +12147,6 @@ static int zend_binary_assign_op_obj_helper_SPEC_VAR_CV(int (*binary_op)(zval *r
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 370 "/home/andi/php5/Zend/zend_vm_def.h"
 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);
@@ -12783,73 +12232,61 @@ static int zend_binary_assign_op_helper_SPEC_VAR_CV(int (*binary_op)(zval *resul
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 455 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_ADD_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_VAR_CV(add_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 460 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_SUB_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_VAR_CV(sub_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 465 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_MUL_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_VAR_CV(mul_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 470 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_DIV_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_VAR_CV(div_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 475 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_MOD_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_VAR_CV(mod_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 480 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_SL_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_VAR_CV(shift_left_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 485 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_SR_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_VAR_CV(shift_right_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 490 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_CONCAT_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_VAR_CV(concat_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 495 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_BW_OR_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_VAR_CV(bitwise_or_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 500 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_BW_AND_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_VAR_CV(bitwise_and_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 505 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_BW_XOR_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_VAR_CV(bitwise_xor_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 510 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_pre_incdec_property_helper_SPEC_VAR_CV(incdec_t incdec_op, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -12916,19 +12353,16 @@ static int zend_pre_incdec_property_helper_SPEC_VAR_CV(incdec_t incdec_op, ZEND_
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 576 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_PRE_INC_OBJ_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_pre_incdec_property_helper_SPEC_VAR_CV(increment_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 581 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_PRE_DEC_OBJ_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_pre_incdec_property_helper_SPEC_VAR_CV(decrement_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 586 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_post_incdec_property_helper_SPEC_VAR_CV(incdec_t incdec_op, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -12991,19 +12425,16 @@ static int zend_post_incdec_property_helper_SPEC_VAR_CV(incdec_t incdec_op, ZEND
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 648 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_POST_INC_OBJ_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_post_incdec_property_helper_SPEC_VAR_CV(increment_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 653 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_POST_DEC_OBJ_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_post_incdec_property_helper_SPEC_VAR_CV(decrement_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 973 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_DIM_R_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -13018,7 +12449,6 @@ static int ZEND_FETCH_DIM_R_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 987 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_DIM_W_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -13030,7 +12460,6 @@ static int ZEND_FETCH_DIM_W_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 998 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_DIM_RW_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -13042,7 +12471,6 @@ static int ZEND_FETCH_DIM_RW_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1009 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_DIM_IS_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -13054,7 +12482,6 @@ static int ZEND_FETCH_DIM_IS_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1020 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_DIM_FUNC_ARG_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -13067,7 +12494,6 @@ static int ZEND_FETCH_DIM_FUNC_ARG_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1032 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_DIM_UNSET_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -13096,7 +12522,6 @@ static int ZEND_FETCH_DIM_UNSET_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1060 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_fetch_property_address_read_helper_SPEC_VAR_CV(int type, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -13164,13 +12589,11 @@ static int zend_fetch_property_address_read_helper_SPEC_VAR_CV(int type, ZEND_OP
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1127 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_R_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_fetch_property_address_read_helper_SPEC_VAR_CV(BP_VAR_R, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 1132 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_W_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -13186,7 +12609,6 @@ static int ZEND_FETCH_OBJ_W_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1147 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_RW_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -13198,13 +12620,11 @@ static int ZEND_FETCH_OBJ_RW_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1158 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_IS_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_fetch_property_address_read_helper_SPEC_VAR_CV(BP_VAR_IS, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 1163 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_FUNC_ARG_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -13222,7 +12642,6 @@ static int ZEND_FETCH_OBJ_FUNC_ARG_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        }
 }
 
-#line 1180 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_UNSET_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -13241,7 +12660,6 @@ static int ZEND_FETCH_OBJ_UNSET_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1221 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_OBJ_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -13256,7 +12674,6 @@ static int ZEND_ASSIGN_OBJ_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1235 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_DIM_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -13293,7 +12710,6 @@ static int ZEND_ASSIGN_DIM_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1271 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -13307,7 +12723,6 @@ static int ZEND_ASSIGN_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1284 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_REF_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -13329,7 +12744,6 @@ static int ZEND_ASSIGN_REF_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1541 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_INIT_METHOD_CALL_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -13393,7 +12807,6 @@ static int ZEND_INIT_METHOD_CALL_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2256 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_CASE_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -13426,7 +12839,6 @@ static int ZEND_CASE_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2414 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_init_add_array_helper_SPEC_VAR_CV(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -13503,19 +12915,16 @@ static int zend_init_add_array_helper_SPEC_VAR_CV(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2490 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_INIT_ARRAY_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_init_add_array_helper_SPEC_VAR_CV(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 2495 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ADD_ARRAY_ELEMENT_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_init_add_array_helper_SPEC_VAR_CV(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 2712 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_UNSET_DIM_OBJ_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -13608,7 +13017,6 @@ static int ZEND_UNSET_DIM_OBJ_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 3105 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_isset_isempty_dim_prop_obj_handler_SPEC_VAR_CV(int prop_dim, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -13711,19 +13119,16 @@ static int zend_isset_isempty_dim_prop_obj_handler_SPEC_VAR_CV(int prop_dim, ZEN
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 3207 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ISSET_ISEMPTY_DIM_OBJ_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_isset_isempty_dim_prop_obj_handler_SPEC_VAR_CV(0, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 3212 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ISSET_ISEMPTY_PROP_OBJ_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_isset_isempty_dim_prop_obj_handler_SPEC_VAR_CV(1, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 2317 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_CLONE_SPEC_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -13780,7 +13185,6 @@ static int ZEND_CLONE_SPEC_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 3217 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_EXIT_SPEC_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -13801,7 +13205,6 @@ static int ZEND_EXIT_SPEC_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 257 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_binary_assign_op_obj_helper_SPEC_UNUSED_CONST(int (*binary_op)(zval *result, zval *op1, zval *op2 TSRMLS_DC), ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -13915,7 +13318,6 @@ static int zend_binary_assign_op_obj_helper_SPEC_UNUSED_CONST(int (*binary_op)(z
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 370 "/home/andi/php5/Zend/zend_vm_def.h"
 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);
@@ -14001,73 +13403,61 @@ static int zend_binary_assign_op_helper_SPEC_UNUSED_CONST(int (*binary_op)(zval
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 455 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_ADD_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_UNUSED_CONST(add_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 460 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_SUB_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_UNUSED_CONST(sub_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 465 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_MUL_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_UNUSED_CONST(mul_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 470 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_DIV_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_UNUSED_CONST(div_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 475 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_MOD_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_UNUSED_CONST(mod_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 480 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_SL_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_UNUSED_CONST(shift_left_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 485 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_SR_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_UNUSED_CONST(shift_right_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 490 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_CONCAT_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_UNUSED_CONST(concat_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 495 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_BW_OR_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_UNUSED_CONST(bitwise_or_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 500 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_BW_AND_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_UNUSED_CONST(bitwise_and_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 505 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_BW_XOR_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_UNUSED_CONST(bitwise_xor_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 510 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_pre_incdec_property_helper_SPEC_UNUSED_CONST(incdec_t incdec_op, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -14134,19 +13524,16 @@ static int zend_pre_incdec_property_helper_SPEC_UNUSED_CONST(incdec_t incdec_op,
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 576 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_PRE_INC_OBJ_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_pre_incdec_property_helper_SPEC_UNUSED_CONST(increment_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 581 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_PRE_DEC_OBJ_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_pre_incdec_property_helper_SPEC_UNUSED_CONST(decrement_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 586 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_post_incdec_property_helper_SPEC_UNUSED_CONST(incdec_t incdec_op, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -14209,19 +13596,16 @@ static int zend_post_incdec_property_helper_SPEC_UNUSED_CONST(incdec_t incdec_op
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 648 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_POST_INC_OBJ_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_post_incdec_property_helper_SPEC_UNUSED_CONST(increment_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 653 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_POST_DEC_OBJ_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_post_incdec_property_helper_SPEC_UNUSED_CONST(decrement_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 1060 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_fetch_property_address_read_helper_SPEC_UNUSED_CONST(int type, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -14289,13 +13673,11 @@ static int zend_fetch_property_address_read_helper_SPEC_UNUSED_CONST(int type, Z
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1127 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_R_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_fetch_property_address_read_helper_SPEC_UNUSED_CONST(BP_VAR_R, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 1132 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_W_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -14311,7 +13693,6 @@ static int ZEND_FETCH_OBJ_W_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1147 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_RW_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -14323,13 +13704,11 @@ static int ZEND_FETCH_OBJ_RW_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1158 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_IS_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_fetch_property_address_read_helper_SPEC_UNUSED_CONST(BP_VAR_IS, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 1163 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_FUNC_ARG_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -14347,7 +13726,6 @@ static int ZEND_FETCH_OBJ_FUNC_ARG_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER
        }
 }
 
-#line 1180 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_UNSET_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -14366,7 +13744,6 @@ static int ZEND_FETCH_OBJ_UNSET_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_AR
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1221 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_OBJ_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -14381,7 +13758,6 @@ static int ZEND_ASSIGN_OBJ_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1235 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_DIM_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -14418,7 +13794,6 @@ static int ZEND_ASSIGN_DIM_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1541 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_INIT_METHOD_CALL_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -14482,7 +13857,6 @@ static int ZEND_INIT_METHOD_CALL_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_A
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2373 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_CONSTANT_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -14524,7 +13898,6 @@ static int ZEND_FETCH_CONSTANT_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARG
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2414 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_init_add_array_helper_SPEC_UNUSED_CONST(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -14601,19 +13974,16 @@ static int zend_init_add_array_helper_SPEC_UNUSED_CONST(ZEND_OPCODE_HANDLER_ARGS
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2490 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_INIT_ARRAY_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_init_add_array_helper_SPEC_UNUSED_CONST(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 2495 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ADD_ARRAY_ELEMENT_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_init_add_array_helper_SPEC_UNUSED_CONST(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 2712 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_UNSET_DIM_OBJ_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -14706,7 +14076,6 @@ static int ZEND_UNSET_DIM_OBJ_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 3105 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_isset_isempty_dim_prop_obj_handler_SPEC_UNUSED_CONST(int prop_dim, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -14809,19 +14178,16 @@ static int zend_isset_isempty_dim_prop_obj_handler_SPEC_UNUSED_CONST(int prop_di
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 3207 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ISSET_ISEMPTY_DIM_OBJ_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_isset_isempty_dim_prop_obj_handler_SPEC_UNUSED_CONST(0, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 3212 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ISSET_ISEMPTY_PROP_OBJ_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_isset_isempty_dim_prop_obj_handler_SPEC_UNUSED_CONST(1, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 257 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_binary_assign_op_obj_helper_SPEC_UNUSED_TMP(int (*binary_op)(zval *result, zval *op1, zval *op2 TSRMLS_DC), ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -14935,7 +14301,6 @@ static int zend_binary_assign_op_obj_helper_SPEC_UNUSED_TMP(int (*binary_op)(zva
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 370 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_binary_assign_op_helper_SPEC_UNUSED_TMP(int (*binary_op)(zval *result, zval *op1, zval *op2 TSRMLS_DC), ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -15021,73 +14386,61 @@ static int zend_binary_assign_op_helper_SPEC_UNUSED_TMP(int (*binary_op)(zval *r
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 455 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_ADD_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_UNUSED_TMP(add_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 460 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_SUB_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_UNUSED_TMP(sub_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 465 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_MUL_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_UNUSED_TMP(mul_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 470 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_DIV_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_UNUSED_TMP(div_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 475 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_MOD_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_UNUSED_TMP(mod_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 480 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_SL_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_UNUSED_TMP(shift_left_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 485 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_SR_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_UNUSED_TMP(shift_right_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 490 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_CONCAT_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_UNUSED_TMP(concat_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 495 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_BW_OR_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_UNUSED_TMP(bitwise_or_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 500 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_BW_AND_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_UNUSED_TMP(bitwise_and_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 505 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_BW_XOR_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_UNUSED_TMP(bitwise_xor_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 510 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_pre_incdec_property_helper_SPEC_UNUSED_TMP(incdec_t incdec_op, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -15154,19 +14507,16 @@ static int zend_pre_incdec_property_helper_SPEC_UNUSED_TMP(incdec_t incdec_op, Z
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 576 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_PRE_INC_OBJ_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_pre_incdec_property_helper_SPEC_UNUSED_TMP(increment_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 581 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_PRE_DEC_OBJ_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_pre_incdec_property_helper_SPEC_UNUSED_TMP(decrement_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 586 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_post_incdec_property_helper_SPEC_UNUSED_TMP(incdec_t incdec_op, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -15229,19 +14579,16 @@ static int zend_post_incdec_property_helper_SPEC_UNUSED_TMP(incdec_t incdec_op,
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 648 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_POST_INC_OBJ_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_post_incdec_property_helper_SPEC_UNUSED_TMP(increment_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 653 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_POST_DEC_OBJ_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_post_incdec_property_helper_SPEC_UNUSED_TMP(decrement_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 1060 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_fetch_property_address_read_helper_SPEC_UNUSED_TMP(int type, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -15309,13 +14656,11 @@ static int zend_fetch_property_address_read_helper_SPEC_UNUSED_TMP(int type, ZEN
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1127 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_R_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_fetch_property_address_read_helper_SPEC_UNUSED_TMP(BP_VAR_R, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 1132 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_W_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -15331,7 +14676,6 @@ static int ZEND_FETCH_OBJ_W_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1147 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_RW_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -15343,13 +14687,11 @@ static int ZEND_FETCH_OBJ_RW_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1158 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_IS_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_fetch_property_address_read_helper_SPEC_UNUSED_TMP(BP_VAR_IS, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 1163 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_FUNC_ARG_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -15367,7 +14709,6 @@ static int ZEND_FETCH_OBJ_FUNC_ARG_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HANDLER_A
        }
 }
 
-#line 1180 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_UNSET_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -15386,7 +14727,6 @@ static int ZEND_FETCH_OBJ_UNSET_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1221 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_OBJ_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -15401,7 +14741,6 @@ static int ZEND_ASSIGN_OBJ_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1235 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_DIM_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -15438,7 +14777,6 @@ static int ZEND_ASSIGN_DIM_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1541 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_INIT_METHOD_CALL_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -15502,7 +14840,6 @@ static int ZEND_INIT_METHOD_CALL_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARG
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2414 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_init_add_array_helper_SPEC_UNUSED_TMP(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -15579,19 +14916,16 @@ static int zend_init_add_array_helper_SPEC_UNUSED_TMP(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2490 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_INIT_ARRAY_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_init_add_array_helper_SPEC_UNUSED_TMP(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 2495 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ADD_ARRAY_ELEMENT_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_init_add_array_helper_SPEC_UNUSED_TMP(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 2712 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_UNSET_DIM_OBJ_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -15684,7 +15018,6 @@ static int ZEND_UNSET_DIM_OBJ_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 3105 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_isset_isempty_dim_prop_obj_handler_SPEC_UNUSED_TMP(int prop_dim, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -15787,19 +15120,16 @@ static int zend_isset_isempty_dim_prop_obj_handler_SPEC_UNUSED_TMP(int prop_dim,
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 3207 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ISSET_ISEMPTY_DIM_OBJ_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_isset_isempty_dim_prop_obj_handler_SPEC_UNUSED_TMP(0, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 3212 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ISSET_ISEMPTY_PROP_OBJ_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_isset_isempty_dim_prop_obj_handler_SPEC_UNUSED_TMP(1, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 257 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_binary_assign_op_obj_helper_SPEC_UNUSED_VAR(int (*binary_op)(zval *result, zval *op1, zval *op2 TSRMLS_DC), ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -15913,7 +15243,6 @@ static int zend_binary_assign_op_obj_helper_SPEC_UNUSED_VAR(int (*binary_op)(zva
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 370 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_binary_assign_op_helper_SPEC_UNUSED_VAR(int (*binary_op)(zval *result, zval *op1, zval *op2 TSRMLS_DC), ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -15999,73 +15328,61 @@ static int zend_binary_assign_op_helper_SPEC_UNUSED_VAR(int (*binary_op)(zval *r
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 455 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_ADD_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_UNUSED_VAR(add_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 460 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_SUB_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_UNUSED_VAR(sub_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 465 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_MUL_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_UNUSED_VAR(mul_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 470 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_DIV_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_UNUSED_VAR(div_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 475 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_MOD_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_UNUSED_VAR(mod_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 480 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_SL_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_UNUSED_VAR(shift_left_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 485 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_SR_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_UNUSED_VAR(shift_right_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 490 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_CONCAT_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_UNUSED_VAR(concat_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 495 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_BW_OR_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_UNUSED_VAR(bitwise_or_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 500 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_BW_AND_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_UNUSED_VAR(bitwise_and_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 505 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_BW_XOR_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_UNUSED_VAR(bitwise_xor_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 510 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_pre_incdec_property_helper_SPEC_UNUSED_VAR(incdec_t incdec_op, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -16132,19 +15449,16 @@ static int zend_pre_incdec_property_helper_SPEC_UNUSED_VAR(incdec_t incdec_op, Z
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 576 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_PRE_INC_OBJ_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_pre_incdec_property_helper_SPEC_UNUSED_VAR(increment_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 581 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_PRE_DEC_OBJ_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_pre_incdec_property_helper_SPEC_UNUSED_VAR(decrement_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 586 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_post_incdec_property_helper_SPEC_UNUSED_VAR(incdec_t incdec_op, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -16207,19 +15521,16 @@ static int zend_post_incdec_property_helper_SPEC_UNUSED_VAR(incdec_t incdec_op,
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 648 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_POST_INC_OBJ_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_post_incdec_property_helper_SPEC_UNUSED_VAR(increment_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 653 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_POST_DEC_OBJ_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_post_incdec_property_helper_SPEC_UNUSED_VAR(decrement_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 1060 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_fetch_property_address_read_helper_SPEC_UNUSED_VAR(int type, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -16287,13 +15598,11 @@ static int zend_fetch_property_address_read_helper_SPEC_UNUSED_VAR(int type, ZEN
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1127 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_R_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_fetch_property_address_read_helper_SPEC_UNUSED_VAR(BP_VAR_R, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 1132 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_W_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -16309,7 +15618,6 @@ static int ZEND_FETCH_OBJ_W_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1147 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_RW_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -16321,13 +15629,11 @@ static int ZEND_FETCH_OBJ_RW_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1158 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_IS_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_fetch_property_address_read_helper_SPEC_UNUSED_VAR(BP_VAR_IS, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 1163 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_FUNC_ARG_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -16345,7 +15651,6 @@ static int ZEND_FETCH_OBJ_FUNC_ARG_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_HANDLER_A
        }
 }
 
-#line 1180 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_UNSET_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -16364,7 +15669,6 @@ static int ZEND_FETCH_OBJ_UNSET_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1221 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_OBJ_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -16379,7 +15683,6 @@ static int ZEND_ASSIGN_OBJ_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1235 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_DIM_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -16416,7 +15719,6 @@ static int ZEND_ASSIGN_DIM_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1541 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_INIT_METHOD_CALL_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -16480,7 +15782,6 @@ static int ZEND_INIT_METHOD_CALL_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARG
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2414 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_init_add_array_helper_SPEC_UNUSED_VAR(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -16557,19 +15858,16 @@ static int zend_init_add_array_helper_SPEC_UNUSED_VAR(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2490 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_INIT_ARRAY_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_init_add_array_helper_SPEC_UNUSED_VAR(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 2495 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ADD_ARRAY_ELEMENT_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_init_add_array_helper_SPEC_UNUSED_VAR(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 2712 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_UNSET_DIM_OBJ_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -16662,7 +15960,6 @@ static int ZEND_UNSET_DIM_OBJ_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 3105 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_isset_isempty_dim_prop_obj_handler_SPEC_UNUSED_VAR(int prop_dim, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -16765,19 +16062,16 @@ static int zend_isset_isempty_dim_prop_obj_handler_SPEC_UNUSED_VAR(int prop_dim,
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 3207 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ISSET_ISEMPTY_DIM_OBJ_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_isset_isempty_dim_prop_obj_handler_SPEC_UNUSED_VAR(0, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 3212 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ISSET_ISEMPTY_PROP_OBJ_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_isset_isempty_dim_prop_obj_handler_SPEC_UNUSED_VAR(1, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 1235 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_DIM_SPEC_UNUSED_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -16814,7 +16108,6 @@ static int ZEND_ASSIGN_DIM_SPEC_UNUSED_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2414 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_init_add_array_helper_SPEC_UNUSED_UNUSED(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -16891,19 +16184,16 @@ static int zend_init_add_array_helper_SPEC_UNUSED_UNUSED(ZEND_OPCODE_HANDLER_ARG
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2490 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_INIT_ARRAY_SPEC_UNUSED_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_init_add_array_helper_SPEC_UNUSED_UNUSED(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 2495 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ADD_ARRAY_ELEMENT_SPEC_UNUSED_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_init_add_array_helper_SPEC_UNUSED_UNUSED(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 257 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_binary_assign_op_obj_helper_SPEC_UNUSED_CV(int (*binary_op)(zval *result, zval *op1, zval *op2 TSRMLS_DC), ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -17017,7 +16307,6 @@ static int zend_binary_assign_op_obj_helper_SPEC_UNUSED_CV(int (*binary_op)(zval
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 370 "/home/andi/php5/Zend/zend_vm_def.h"
 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);
@@ -17103,73 +16392,61 @@ static int zend_binary_assign_op_helper_SPEC_UNUSED_CV(int (*binary_op)(zval *re
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 455 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_ADD_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_UNUSED_CV(add_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 460 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_SUB_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_UNUSED_CV(sub_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 465 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_MUL_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_UNUSED_CV(mul_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 470 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_DIV_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_UNUSED_CV(div_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 475 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_MOD_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_UNUSED_CV(mod_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 480 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_SL_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_UNUSED_CV(shift_left_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 485 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_SR_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_UNUSED_CV(shift_right_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 490 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_CONCAT_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_UNUSED_CV(concat_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 495 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_BW_OR_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_UNUSED_CV(bitwise_or_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 500 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_BW_AND_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_UNUSED_CV(bitwise_and_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 505 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_BW_XOR_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_UNUSED_CV(bitwise_xor_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 510 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_pre_incdec_property_helper_SPEC_UNUSED_CV(incdec_t incdec_op, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -17236,19 +16513,16 @@ static int zend_pre_incdec_property_helper_SPEC_UNUSED_CV(incdec_t incdec_op, ZE
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 576 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_PRE_INC_OBJ_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_pre_incdec_property_helper_SPEC_UNUSED_CV(increment_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 581 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_PRE_DEC_OBJ_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_pre_incdec_property_helper_SPEC_UNUSED_CV(decrement_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 586 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_post_incdec_property_helper_SPEC_UNUSED_CV(incdec_t incdec_op, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -17311,19 +16585,16 @@ static int zend_post_incdec_property_helper_SPEC_UNUSED_CV(incdec_t incdec_op, Z
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 648 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_POST_INC_OBJ_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_post_incdec_property_helper_SPEC_UNUSED_CV(increment_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 653 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_POST_DEC_OBJ_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_post_incdec_property_helper_SPEC_UNUSED_CV(decrement_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 1060 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_fetch_property_address_read_helper_SPEC_UNUSED_CV(int type, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -17391,13 +16662,11 @@ static int zend_fetch_property_address_read_helper_SPEC_UNUSED_CV(int type, ZEND
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1127 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_R_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_fetch_property_address_read_helper_SPEC_UNUSED_CV(BP_VAR_R, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 1132 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_W_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -17413,7 +16682,6 @@ static int ZEND_FETCH_OBJ_W_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1147 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_RW_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -17425,13 +16693,11 @@ static int ZEND_FETCH_OBJ_RW_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1158 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_IS_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_fetch_property_address_read_helper_SPEC_UNUSED_CV(BP_VAR_IS, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 1163 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_FUNC_ARG_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -17449,7 +16715,6 @@ static int ZEND_FETCH_OBJ_FUNC_ARG_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_AR
        }
 }
 
-#line 1180 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_UNSET_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -17468,7 +16733,6 @@ static int ZEND_FETCH_OBJ_UNSET_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1221 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_OBJ_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -17483,7 +16747,6 @@ static int ZEND_ASSIGN_OBJ_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1235 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_DIM_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -17520,7 +16783,6 @@ static int ZEND_ASSIGN_DIM_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1541 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_INIT_METHOD_CALL_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -17584,7 +16846,6 @@ static int ZEND_INIT_METHOD_CALL_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2414 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_init_add_array_helper_SPEC_UNUSED_CV(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -17661,19 +16922,16 @@ static int zend_init_add_array_helper_SPEC_UNUSED_CV(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2490 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_INIT_ARRAY_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_init_add_array_helper_SPEC_UNUSED_CV(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 2495 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ADD_ARRAY_ELEMENT_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_init_add_array_helper_SPEC_UNUSED_CV(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 2712 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_UNSET_DIM_OBJ_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -17766,7 +17024,6 @@ static int ZEND_UNSET_DIM_OBJ_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 3105 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_isset_isempty_dim_prop_obj_handler_SPEC_UNUSED_CV(int prop_dim, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -17869,19 +17126,16 @@ static int zend_isset_isempty_dim_prop_obj_handler_SPEC_UNUSED_CV(int prop_dim,
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 3207 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ISSET_ISEMPTY_DIM_OBJ_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_isset_isempty_dim_prop_obj_handler_SPEC_UNUSED_CV(0, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 3212 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ISSET_ISEMPTY_PROP_OBJ_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_isset_isempty_dim_prop_obj_handler_SPEC_UNUSED_CV(1, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 235 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BW_NOT_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -17893,7 +17147,6 @@ static int ZEND_BW_NOT_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 246 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BOOL_NOT_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -17905,7 +17158,6 @@ static int ZEND_BOOL_NOT_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 658 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_PRE_INC_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -17949,7 +17201,6 @@ static int ZEND_PRE_INC_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 701 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_PRE_DEC_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -17993,7 +17244,6 @@ static int ZEND_PRE_DEC_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 744 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_POST_INC_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -18034,7 +17284,6 @@ static int ZEND_POST_INC_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 784 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_POST_DEC_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -18075,7 +17324,6 @@ static int ZEND_POST_DEC_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 824 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ECHO_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -18095,7 +17343,6 @@ static int ZEND_ECHO_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 843 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_PRINT_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -18106,7 +17353,6 @@ static int ZEND_PRINT_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        return ZEND_ECHO_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 853 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_fetch_var_address_helper_SPEC_CV(int type, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -18196,43 +17442,36 @@ static int zend_fetch_var_address_helper_SPEC_CV(int type, ZEND_OPCODE_HANDLER_A
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 942 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_R_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_fetch_var_address_helper_SPEC_CV(BP_VAR_R, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 947 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_W_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_fetch_var_address_helper_SPEC_CV(BP_VAR_W, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 952 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_RW_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_fetch_var_address_helper_SPEC_CV(BP_VAR_RW, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 957 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_FUNC_ARG_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_fetch_var_address_helper_SPEC_CV(ARG_SHOULD_BE_SENT_BY_REF(EX(fbc), EX(opline)->extended_value)?BP_VAR_W:BP_VAR_R, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 963 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_UNSET_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_fetch_var_address_helper_SPEC_CV(BP_VAR_UNSET, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 968 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_IS_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_fetch_var_address_helper_SPEC_CV(BP_VAR_IS, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 1314 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_JMPZ_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -18251,7 +17490,6 @@ static int ZEND_JMPZ_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1332 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_JMPNZ_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -18270,7 +17508,6 @@ static int ZEND_JMPNZ_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1350 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_JMPZNZ_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -18293,7 +17530,6 @@ static int ZEND_JMPZNZ_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        }
 }
 
-#line 1372 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_JMPZ_EX_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -18313,7 +17549,6 @@ static int ZEND_JMPZ_EX_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1391 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_JMPNZ_EX_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -18333,7 +17568,6 @@ static int ZEND_JMPNZ_EX_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1512 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_INIT_CTOR_CALL_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -18363,7 +17597,6 @@ static int ZEND_INIT_CTOR_CALL_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1902 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_RETURN_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -18438,7 +17671,6 @@ return_by_value:
        ZEND_VM_RETURN_FROM_EXECUTE_LOOP();
 }
 
-#line 1976 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_THROW_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -18463,7 +17695,6 @@ static int ZEND_THROW_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2028 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_SEND_VAL_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -18489,7 +17720,6 @@ static int ZEND_SEND_VAL_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2053 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_send_by_var_helper_SPEC_CV(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -18517,7 +17747,6 @@ static int zend_send_by_var_helper_SPEC_CV(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2080 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_SEND_VAR_NO_REF_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -18545,7 +17774,6 @@ static int ZEND_SEND_VAR_NO_REF_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2107 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_SEND_REF_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -18567,7 +17795,6 @@ static int ZEND_SEND_REF_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2128 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_SEND_VAR_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -18579,7 +17806,6 @@ static int ZEND_SEND_VAR_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        return zend_send_by_var_helper_SPEC_CV(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 2217 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BOOL_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -18593,7 +17819,6 @@ static int ZEND_BOOL_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2317 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_CLONE_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -18650,7 +17875,6 @@ static int ZEND_CLONE_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2500 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_CAST_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -18697,7 +17921,6 @@ static int ZEND_CAST_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2546 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_INCLUDE_OR_EVAL_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -18817,7 +18040,6 @@ static int ZEND_INCLUDE_OR_EVAL_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2665 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_UNSET_VAR_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -18865,7 +18087,6 @@ static int ZEND_UNSET_VAR_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2804 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FE_RESET_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -18949,7 +18170,6 @@ static int ZEND_FE_RESET_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 3022 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_JMP_NO_CTOR_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -18978,7 +18198,6 @@ static int ZEND_JMP_NO_CTOR_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 3050 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ISSET_ISEMPTY_VAR_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -19034,7 +18253,6 @@ static int ZEND_ISSET_ISEMPTY_VAR_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 3217 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_EXIT_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -19055,7 +18273,6 @@ static int ZEND_EXIT_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 3268 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_QM_ASSIGN_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -19070,7 +18287,6 @@ static int ZEND_QM_ASSIGN_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 3341 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_INSTANCEOF_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -19088,7 +18304,6 @@ static int ZEND_INSTANCEOF_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ADD_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -19102,7 +18317,6 @@ static int ZEND_ADD_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 14 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_SUB_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -19116,7 +18330,6 @@ static int ZEND_SUB_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 27 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_MUL_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -19130,7 +18343,6 @@ static int ZEND_MUL_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 40 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_DIV_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -19144,7 +18356,6 @@ static int ZEND_DIV_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 53 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_MOD_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -19158,7 +18369,6 @@ static int ZEND_MOD_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 66 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_SL_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -19172,7 +18382,6 @@ static int ZEND_SL_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 79 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_SR_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -19186,7 +18395,6 @@ static int ZEND_SR_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 92 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_CONCAT_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -19200,7 +18408,6 @@ static int ZEND_CONCAT_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 105 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_IDENTICAL_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -19214,7 +18421,6 @@ static int ZEND_IS_IDENTICAL_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 118 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_NOT_IDENTICAL_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -19228,7 +18434,6 @@ static int ZEND_IS_NOT_IDENTICAL_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 131 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_EQUAL_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -19242,7 +18447,6 @@ static int ZEND_IS_EQUAL_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 144 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_NOT_EQUAL_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -19256,7 +18460,6 @@ static int ZEND_IS_NOT_EQUAL_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 157 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_SMALLER_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -19270,7 +18473,6 @@ static int ZEND_IS_SMALLER_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 170 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_SMALLER_OR_EQUAL_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -19284,7 +18486,6 @@ static int ZEND_IS_SMALLER_OR_EQUAL_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_AR
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 183 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BW_OR_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -19298,7 +18499,6 @@ static int ZEND_BW_OR_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 196 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BW_AND_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -19312,7 +18512,6 @@ static int ZEND_BW_AND_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 209 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BW_XOR_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -19326,7 +18525,6 @@ static int ZEND_BW_XOR_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 222 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BOOL_XOR_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -19340,7 +18538,6 @@ static int ZEND_BOOL_XOR_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 257 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_binary_assign_op_obj_helper_SPEC_CV_CONST(int (*binary_op)(zval *result, zval *op1, zval *op2 TSRMLS_DC), ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -19454,7 +18651,6 @@ static int zend_binary_assign_op_obj_helper_SPEC_CV_CONST(int (*binary_op)(zval
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 370 "/home/andi/php5/Zend/zend_vm_def.h"
 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);
@@ -19540,73 +18736,61 @@ static int zend_binary_assign_op_helper_SPEC_CV_CONST(int (*binary_op)(zval *res
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 455 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_ADD_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_CV_CONST(add_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 460 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_SUB_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_CV_CONST(sub_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 465 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_MUL_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_CV_CONST(mul_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 470 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_DIV_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_CV_CONST(div_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 475 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_MOD_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_CV_CONST(mod_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 480 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_SL_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_CV_CONST(shift_left_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 485 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_SR_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_CV_CONST(shift_right_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 490 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_CONCAT_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_CV_CONST(concat_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 495 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_BW_OR_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_CV_CONST(bitwise_or_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 500 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_BW_AND_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_CV_CONST(bitwise_and_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 505 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_BW_XOR_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_CV_CONST(bitwise_xor_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 510 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_pre_incdec_property_helper_SPEC_CV_CONST(incdec_t incdec_op, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -19673,19 +18857,16 @@ static int zend_pre_incdec_property_helper_SPEC_CV_CONST(incdec_t incdec_op, ZEN
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 576 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_PRE_INC_OBJ_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_pre_incdec_property_helper_SPEC_CV_CONST(increment_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 581 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_PRE_DEC_OBJ_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_pre_incdec_property_helper_SPEC_CV_CONST(decrement_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 586 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_post_incdec_property_helper_SPEC_CV_CONST(incdec_t incdec_op, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -19748,19 +18929,16 @@ static int zend_post_incdec_property_helper_SPEC_CV_CONST(incdec_t incdec_op, ZE
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 648 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_POST_INC_OBJ_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_post_incdec_property_helper_SPEC_CV_CONST(increment_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 653 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_POST_DEC_OBJ_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_post_incdec_property_helper_SPEC_CV_CONST(decrement_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 973 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_DIM_R_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -19775,7 +18953,6 @@ static int ZEND_FETCH_DIM_R_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 987 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_DIM_W_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -19787,7 +18964,6 @@ static int ZEND_FETCH_DIM_W_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 998 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_DIM_RW_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -19799,7 +18975,6 @@ static int ZEND_FETCH_DIM_RW_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1009 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_DIM_IS_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -19811,7 +18986,6 @@ static int ZEND_FETCH_DIM_IS_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1020 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_DIM_FUNC_ARG_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -19824,7 +18998,6 @@ static int ZEND_FETCH_DIM_FUNC_ARG_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARG
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1032 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_DIM_UNSET_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -19853,7 +19026,6 @@ static int ZEND_FETCH_DIM_UNSET_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1060 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_fetch_property_address_read_helper_SPEC_CV_CONST(int type, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -19921,13 +19093,11 @@ static int zend_fetch_property_address_read_helper_SPEC_CV_CONST(int type, ZEND_
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1127 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_R_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_fetch_property_address_read_helper_SPEC_CV_CONST(BP_VAR_R, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 1132 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_W_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -19943,7 +19113,6 @@ static int ZEND_FETCH_OBJ_W_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1147 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_RW_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -19955,13 +19124,11 @@ static int ZEND_FETCH_OBJ_RW_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1158 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_IS_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_fetch_property_address_read_helper_SPEC_CV_CONST(BP_VAR_IS, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 1163 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -19979,7 +19146,6 @@ static int ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARG
        }
 }
 
-#line 1180 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_UNSET_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -19998,7 +19164,6 @@ static int ZEND_FETCH_OBJ_UNSET_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1221 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_OBJ_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -20013,7 +19178,6 @@ static int ZEND_ASSIGN_OBJ_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1235 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_DIM_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -20050,7 +19214,6 @@ static int ZEND_ASSIGN_DIM_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1271 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -20064,7 +19227,6 @@ static int ZEND_ASSIGN_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1541 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_INIT_METHOD_CALL_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -20128,7 +19290,6 @@ static int ZEND_INIT_METHOD_CALL_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2256 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_CASE_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -20161,7 +19322,6 @@ static int ZEND_CASE_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2414 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_init_add_array_helper_SPEC_CV_CONST(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -20238,19 +19398,16 @@ static int zend_init_add_array_helper_SPEC_CV_CONST(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2490 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_INIT_ARRAY_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_init_add_array_helper_SPEC_CV_CONST(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 2495 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ADD_ARRAY_ELEMENT_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_init_add_array_helper_SPEC_CV_CONST(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 2712 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_UNSET_DIM_OBJ_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -20343,7 +19500,6 @@ static int ZEND_UNSET_DIM_OBJ_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 3105 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_isset_isempty_dim_prop_obj_handler_SPEC_CV_CONST(int prop_dim, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -20446,19 +19602,16 @@ static int zend_isset_isempty_dim_prop_obj_handler_SPEC_CV_CONST(int prop_dim, Z
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 3207 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ISSET_ISEMPTY_DIM_OBJ_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_isset_isempty_dim_prop_obj_handler_SPEC_CV_CONST(0, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 3212 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ISSET_ISEMPTY_PROP_OBJ_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_isset_isempty_dim_prop_obj_handler_SPEC_CV_CONST(1, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 1 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ADD_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -20472,7 +19625,6 @@ static int ZEND_ADD_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 14 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_SUB_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -20486,7 +19638,6 @@ static int ZEND_SUB_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 27 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_MUL_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -20500,7 +19651,6 @@ static int ZEND_MUL_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 40 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_DIV_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -20514,7 +19664,6 @@ static int ZEND_DIV_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 53 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_MOD_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -20528,7 +19677,6 @@ static int ZEND_MOD_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 66 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_SL_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -20542,7 +19690,6 @@ static int ZEND_SL_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 79 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_SR_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -20556,7 +19703,6 @@ static int ZEND_SR_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 92 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_CONCAT_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -20570,7 +19716,6 @@ static int ZEND_CONCAT_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 105 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_IDENTICAL_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -20584,7 +19729,6 @@ static int ZEND_IS_IDENTICAL_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 118 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_NOT_IDENTICAL_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -20598,7 +19742,6 @@ static int ZEND_IS_NOT_IDENTICAL_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 131 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_EQUAL_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -20612,7 +19755,6 @@ static int ZEND_IS_EQUAL_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 144 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_NOT_EQUAL_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -20626,7 +19768,6 @@ static int ZEND_IS_NOT_EQUAL_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 157 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_SMALLER_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -20640,7 +19781,6 @@ static int ZEND_IS_SMALLER_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 170 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_SMALLER_OR_EQUAL_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -20654,7 +19794,6 @@ static int ZEND_IS_SMALLER_OR_EQUAL_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 183 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BW_OR_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -20668,7 +19807,6 @@ static int ZEND_BW_OR_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 196 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BW_AND_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -20682,7 +19820,6 @@ static int ZEND_BW_AND_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 209 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BW_XOR_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -20696,7 +19833,6 @@ static int ZEND_BW_XOR_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 222 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BOOL_XOR_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -20710,7 +19846,6 @@ static int ZEND_BOOL_XOR_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 257 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_binary_assign_op_obj_helper_SPEC_CV_TMP(int (*binary_op)(zval *result, zval *op1, zval *op2 TSRMLS_DC), ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -20824,7 +19959,6 @@ static int zend_binary_assign_op_obj_helper_SPEC_CV_TMP(int (*binary_op)(zval *r
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 370 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_binary_assign_op_helper_SPEC_CV_TMP(int (*binary_op)(zval *result, zval *op1, zval *op2 TSRMLS_DC), ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -20910,73 +20044,61 @@ static int zend_binary_assign_op_helper_SPEC_CV_TMP(int (*binary_op)(zval *resul
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 455 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_ADD_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_CV_TMP(add_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 460 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_SUB_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_CV_TMP(sub_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 465 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_MUL_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_CV_TMP(mul_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 470 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_DIV_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_CV_TMP(div_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 475 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_MOD_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_CV_TMP(mod_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 480 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_SL_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_CV_TMP(shift_left_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 485 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_SR_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_CV_TMP(shift_right_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 490 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_CONCAT_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_CV_TMP(concat_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 495 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_BW_OR_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_CV_TMP(bitwise_or_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 500 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_BW_AND_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_CV_TMP(bitwise_and_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 505 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_BW_XOR_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_CV_TMP(bitwise_xor_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 510 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_pre_incdec_property_helper_SPEC_CV_TMP(incdec_t incdec_op, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -21043,19 +20165,16 @@ static int zend_pre_incdec_property_helper_SPEC_CV_TMP(incdec_t incdec_op, ZEND_
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 576 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_PRE_INC_OBJ_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_pre_incdec_property_helper_SPEC_CV_TMP(increment_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 581 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_PRE_DEC_OBJ_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_pre_incdec_property_helper_SPEC_CV_TMP(decrement_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 586 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_post_incdec_property_helper_SPEC_CV_TMP(incdec_t incdec_op, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -21118,19 +20237,16 @@ static int zend_post_incdec_property_helper_SPEC_CV_TMP(incdec_t incdec_op, ZEND
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 648 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_POST_INC_OBJ_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_post_incdec_property_helper_SPEC_CV_TMP(increment_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 653 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_POST_DEC_OBJ_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_post_incdec_property_helper_SPEC_CV_TMP(decrement_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 973 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_DIM_R_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -21145,7 +20261,6 @@ static int ZEND_FETCH_DIM_R_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 987 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_DIM_W_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -21157,7 +20272,6 @@ static int ZEND_FETCH_DIM_W_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 998 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_DIM_RW_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -21169,7 +20283,6 @@ static int ZEND_FETCH_DIM_RW_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1009 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_DIM_IS_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -21181,7 +20294,6 @@ static int ZEND_FETCH_DIM_IS_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1020 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_DIM_FUNC_ARG_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -21194,7 +20306,6 @@ static int ZEND_FETCH_DIM_FUNC_ARG_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1032 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_DIM_UNSET_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -21223,7 +20334,6 @@ static int ZEND_FETCH_DIM_UNSET_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1060 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_fetch_property_address_read_helper_SPEC_CV_TMP(int type, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -21291,13 +20401,11 @@ static int zend_fetch_property_address_read_helper_SPEC_CV_TMP(int type, ZEND_OP
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1127 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_R_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_fetch_property_address_read_helper_SPEC_CV_TMP(BP_VAR_R, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 1132 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_W_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -21313,7 +20421,6 @@ static int ZEND_FETCH_OBJ_W_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1147 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_RW_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -21325,13 +20432,11 @@ static int ZEND_FETCH_OBJ_RW_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1158 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_IS_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_fetch_property_address_read_helper_SPEC_CV_TMP(BP_VAR_IS, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 1163 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -21349,7 +20454,6 @@ static int ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        }
 }
 
-#line 1180 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_UNSET_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -21368,7 +20472,6 @@ static int ZEND_FETCH_OBJ_UNSET_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1221 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_OBJ_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -21383,7 +20486,6 @@ static int ZEND_ASSIGN_OBJ_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1235 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_DIM_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -21420,7 +20522,6 @@ static int ZEND_ASSIGN_DIM_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1271 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -21434,7 +20535,6 @@ static int ZEND_ASSIGN_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1541 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_INIT_METHOD_CALL_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -21498,7 +20598,6 @@ static int ZEND_INIT_METHOD_CALL_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2256 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_CASE_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -21531,7 +20630,6 @@ static int ZEND_CASE_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2414 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_init_add_array_helper_SPEC_CV_TMP(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -21608,19 +20706,16 @@ static int zend_init_add_array_helper_SPEC_CV_TMP(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2490 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_INIT_ARRAY_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_init_add_array_helper_SPEC_CV_TMP(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 2495 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ADD_ARRAY_ELEMENT_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_init_add_array_helper_SPEC_CV_TMP(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 2712 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_UNSET_DIM_OBJ_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -21713,7 +20808,6 @@ static int ZEND_UNSET_DIM_OBJ_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 3105 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_isset_isempty_dim_prop_obj_handler_SPEC_CV_TMP(int prop_dim, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -21816,19 +20910,16 @@ static int zend_isset_isempty_dim_prop_obj_handler_SPEC_CV_TMP(int prop_dim, ZEN
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 3207 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ISSET_ISEMPTY_DIM_OBJ_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_isset_isempty_dim_prop_obj_handler_SPEC_CV_TMP(0, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 3212 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ISSET_ISEMPTY_PROP_OBJ_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_isset_isempty_dim_prop_obj_handler_SPEC_CV_TMP(1, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 1 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ADD_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -21842,7 +20933,6 @@ static int ZEND_ADD_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 14 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_SUB_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -21856,7 +20946,6 @@ static int ZEND_SUB_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 27 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_MUL_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -21870,7 +20959,6 @@ static int ZEND_MUL_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 40 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_DIV_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -21884,7 +20972,6 @@ static int ZEND_DIV_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 53 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_MOD_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -21898,7 +20985,6 @@ static int ZEND_MOD_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 66 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_SL_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -21912,7 +20998,6 @@ static int ZEND_SL_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 79 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_SR_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -21926,7 +21011,6 @@ static int ZEND_SR_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 92 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_CONCAT_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -21940,7 +21024,6 @@ static int ZEND_CONCAT_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 105 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_IDENTICAL_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -21954,7 +21037,6 @@ static int ZEND_IS_IDENTICAL_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 118 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_NOT_IDENTICAL_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -21968,7 +21050,6 @@ static int ZEND_IS_NOT_IDENTICAL_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 131 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_EQUAL_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -21982,7 +21063,6 @@ static int ZEND_IS_EQUAL_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 144 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_NOT_EQUAL_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -21996,7 +21076,6 @@ static int ZEND_IS_NOT_EQUAL_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 157 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_SMALLER_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -22010,7 +21089,6 @@ static int ZEND_IS_SMALLER_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 170 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_SMALLER_OR_EQUAL_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -22024,7 +21102,6 @@ static int ZEND_IS_SMALLER_OR_EQUAL_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 183 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BW_OR_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -22038,7 +21115,6 @@ static int ZEND_BW_OR_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 196 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BW_AND_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -22052,7 +21128,6 @@ static int ZEND_BW_AND_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 209 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BW_XOR_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -22066,7 +21141,6 @@ static int ZEND_BW_XOR_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 222 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BOOL_XOR_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -22080,7 +21154,6 @@ static int ZEND_BOOL_XOR_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 257 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_binary_assign_op_obj_helper_SPEC_CV_VAR(int (*binary_op)(zval *result, zval *op1, zval *op2 TSRMLS_DC), ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -22194,7 +21267,6 @@ static int zend_binary_assign_op_obj_helper_SPEC_CV_VAR(int (*binary_op)(zval *r
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 370 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_binary_assign_op_helper_SPEC_CV_VAR(int (*binary_op)(zval *result, zval *op1, zval *op2 TSRMLS_DC), ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -22280,73 +21352,61 @@ static int zend_binary_assign_op_helper_SPEC_CV_VAR(int (*binary_op)(zval *resul
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 455 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_ADD_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_CV_VAR(add_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 460 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_SUB_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_CV_VAR(sub_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 465 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_MUL_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_CV_VAR(mul_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 470 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_DIV_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_CV_VAR(div_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 475 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_MOD_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_CV_VAR(mod_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 480 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_SL_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_CV_VAR(shift_left_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 485 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_SR_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_CV_VAR(shift_right_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 490 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_CONCAT_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_CV_VAR(concat_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 495 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_BW_OR_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_CV_VAR(bitwise_or_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 500 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_BW_AND_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_CV_VAR(bitwise_and_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 505 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_BW_XOR_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_CV_VAR(bitwise_xor_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 510 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_pre_incdec_property_helper_SPEC_CV_VAR(incdec_t incdec_op, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -22413,19 +21473,16 @@ static int zend_pre_incdec_property_helper_SPEC_CV_VAR(incdec_t incdec_op, ZEND_
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 576 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_PRE_INC_OBJ_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_pre_incdec_property_helper_SPEC_CV_VAR(increment_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 581 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_PRE_DEC_OBJ_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_pre_incdec_property_helper_SPEC_CV_VAR(decrement_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 586 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_post_incdec_property_helper_SPEC_CV_VAR(incdec_t incdec_op, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -22488,19 +21545,16 @@ static int zend_post_incdec_property_helper_SPEC_CV_VAR(incdec_t incdec_op, ZEND
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 648 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_POST_INC_OBJ_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_post_incdec_property_helper_SPEC_CV_VAR(increment_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 653 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_POST_DEC_OBJ_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_post_incdec_property_helper_SPEC_CV_VAR(decrement_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 973 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_DIM_R_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -22515,7 +21569,6 @@ static int ZEND_FETCH_DIM_R_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 987 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_DIM_W_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -22527,7 +21580,6 @@ static int ZEND_FETCH_DIM_W_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 998 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_DIM_RW_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -22539,7 +21591,6 @@ static int ZEND_FETCH_DIM_RW_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1009 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_DIM_IS_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -22551,7 +21602,6 @@ static int ZEND_FETCH_DIM_IS_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1020 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_DIM_FUNC_ARG_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -22564,7 +21614,6 @@ static int ZEND_FETCH_DIM_FUNC_ARG_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1032 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_DIM_UNSET_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -22593,7 +21642,6 @@ static int ZEND_FETCH_DIM_UNSET_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1060 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_fetch_property_address_read_helper_SPEC_CV_VAR(int type, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -22661,13 +21709,11 @@ static int zend_fetch_property_address_read_helper_SPEC_CV_VAR(int type, ZEND_OP
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1127 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_R_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_fetch_property_address_read_helper_SPEC_CV_VAR(BP_VAR_R, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 1132 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_W_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -22683,7 +21729,6 @@ static int ZEND_FETCH_OBJ_W_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1147 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_RW_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -22695,13 +21740,11 @@ static int ZEND_FETCH_OBJ_RW_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1158 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_IS_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_fetch_property_address_read_helper_SPEC_CV_VAR(BP_VAR_IS, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 1163 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -22719,7 +21762,6 @@ static int ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        }
 }
 
-#line 1180 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_UNSET_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -22738,7 +21780,6 @@ static int ZEND_FETCH_OBJ_UNSET_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1221 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_OBJ_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -22753,7 +21794,6 @@ static int ZEND_ASSIGN_OBJ_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1235 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_DIM_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -22790,7 +21830,6 @@ static int ZEND_ASSIGN_DIM_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1271 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -22804,7 +21843,6 @@ static int ZEND_ASSIGN_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1284 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_REF_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -22826,7 +21864,6 @@ static int ZEND_ASSIGN_REF_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1541 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_INIT_METHOD_CALL_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -22890,7 +21927,6 @@ static int ZEND_INIT_METHOD_CALL_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2256 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_CASE_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -22923,7 +21959,6 @@ static int ZEND_CASE_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2414 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_init_add_array_helper_SPEC_CV_VAR(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -23000,19 +22035,16 @@ static int zend_init_add_array_helper_SPEC_CV_VAR(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2490 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_INIT_ARRAY_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_init_add_array_helper_SPEC_CV_VAR(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 2495 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ADD_ARRAY_ELEMENT_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_init_add_array_helper_SPEC_CV_VAR(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 2712 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_UNSET_DIM_OBJ_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -23105,7 +22137,6 @@ static int ZEND_UNSET_DIM_OBJ_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 3105 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_isset_isempty_dim_prop_obj_handler_SPEC_CV_VAR(int prop_dim, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -23208,19 +22239,16 @@ static int zend_isset_isempty_dim_prop_obj_handler_SPEC_CV_VAR(int prop_dim, ZEN
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 3207 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ISSET_ISEMPTY_DIM_OBJ_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_isset_isempty_dim_prop_obj_handler_SPEC_CV_VAR(0, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 3212 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ISSET_ISEMPTY_PROP_OBJ_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_isset_isempty_dim_prop_obj_handler_SPEC_CV_VAR(1, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 987 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_DIM_W_SPEC_CV_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -23232,7 +22260,6 @@ static int ZEND_FETCH_DIM_W_SPEC_CV_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1235 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_DIM_SPEC_CV_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -23269,7 +22296,6 @@ static int ZEND_ASSIGN_DIM_SPEC_CV_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2414 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_init_add_array_helper_SPEC_CV_UNUSED(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -23346,19 +22372,16 @@ static int zend_init_add_array_helper_SPEC_CV_UNUSED(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2490 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_INIT_ARRAY_SPEC_CV_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_init_add_array_helper_SPEC_CV_UNUSED(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 2495 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ADD_ARRAY_ELEMENT_SPEC_CV_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_init_add_array_helper_SPEC_CV_UNUSED(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 1 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ADD_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -23372,7 +22395,6 @@ static int ZEND_ADD_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 14 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_SUB_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -23386,7 +22408,6 @@ static int ZEND_SUB_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 27 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_MUL_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -23400,7 +22421,6 @@ static int ZEND_MUL_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 40 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_DIV_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -23414,7 +22434,6 @@ static int ZEND_DIV_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 53 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_MOD_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -23428,7 +22447,6 @@ static int ZEND_MOD_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 66 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_SL_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -23442,7 +22460,6 @@ static int ZEND_SL_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 79 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_SR_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -23456,7 +22473,6 @@ static int ZEND_SR_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 92 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_CONCAT_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -23470,7 +22486,6 @@ static int ZEND_CONCAT_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 105 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_IDENTICAL_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -23484,7 +22499,6 @@ static int ZEND_IS_IDENTICAL_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 118 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_NOT_IDENTICAL_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -23498,7 +22512,6 @@ static int ZEND_IS_NOT_IDENTICAL_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 131 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_EQUAL_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -23512,7 +22525,6 @@ static int ZEND_IS_EQUAL_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 144 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_NOT_EQUAL_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -23526,7 +22538,6 @@ static int ZEND_IS_NOT_EQUAL_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 157 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_SMALLER_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -23540,7 +22551,6 @@ static int ZEND_IS_SMALLER_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 170 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_SMALLER_OR_EQUAL_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -23554,7 +22564,6 @@ static int ZEND_IS_SMALLER_OR_EQUAL_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 183 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BW_OR_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -23568,7 +22577,6 @@ static int ZEND_BW_OR_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 196 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BW_AND_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -23582,7 +22590,6 @@ static int ZEND_BW_AND_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 209 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BW_XOR_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -23596,7 +22603,6 @@ static int ZEND_BW_XOR_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 222 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BOOL_XOR_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -23610,7 +22616,6 @@ static int ZEND_BOOL_XOR_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 257 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_binary_assign_op_obj_helper_SPEC_CV_CV(int (*binary_op)(zval *result, zval *op1, zval *op2 TSRMLS_DC), ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -23724,7 +22729,6 @@ static int zend_binary_assign_op_obj_helper_SPEC_CV_CV(int (*binary_op)(zval *re
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 370 "/home/andi/php5/Zend/zend_vm_def.h"
 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);
@@ -23810,73 +22814,61 @@ static int zend_binary_assign_op_helper_SPEC_CV_CV(int (*binary_op)(zval *result
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 455 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_ADD_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_CV_CV(add_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 460 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_SUB_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_CV_CV(sub_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 465 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_MUL_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_CV_CV(mul_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 470 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_DIV_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_CV_CV(div_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 475 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_MOD_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_CV_CV(mod_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 480 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_SL_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_CV_CV(shift_left_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 485 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_SR_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_CV_CV(shift_right_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 490 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_CONCAT_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_CV_CV(concat_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 495 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_BW_OR_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_CV_CV(bitwise_or_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 500 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_BW_AND_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_CV_CV(bitwise_and_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 505 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_BW_XOR_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper_SPEC_CV_CV(bitwise_xor_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 510 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_pre_incdec_property_helper_SPEC_CV_CV(incdec_t incdec_op, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -23943,19 +22935,16 @@ static int zend_pre_incdec_property_helper_SPEC_CV_CV(incdec_t incdec_op, ZEND_O
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 576 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_PRE_INC_OBJ_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_pre_incdec_property_helper_SPEC_CV_CV(increment_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 581 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_PRE_DEC_OBJ_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_pre_incdec_property_helper_SPEC_CV_CV(decrement_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 586 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_post_incdec_property_helper_SPEC_CV_CV(incdec_t incdec_op, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -24018,19 +23007,16 @@ static int zend_post_incdec_property_helper_SPEC_CV_CV(incdec_t incdec_op, ZEND_
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 648 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_POST_INC_OBJ_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_post_incdec_property_helper_SPEC_CV_CV(increment_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 653 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_POST_DEC_OBJ_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_post_incdec_property_helper_SPEC_CV_CV(decrement_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 973 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_DIM_R_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -24045,7 +23031,6 @@ static int ZEND_FETCH_DIM_R_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 987 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_DIM_W_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -24057,7 +23042,6 @@ static int ZEND_FETCH_DIM_W_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 998 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_DIM_RW_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -24069,7 +23053,6 @@ static int ZEND_FETCH_DIM_RW_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1009 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_DIM_IS_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -24081,7 +23064,6 @@ static int ZEND_FETCH_DIM_IS_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1020 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_DIM_FUNC_ARG_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -24094,7 +23076,6 @@ static int ZEND_FETCH_DIM_FUNC_ARG_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1032 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_DIM_UNSET_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -24123,7 +23104,6 @@ static int ZEND_FETCH_DIM_UNSET_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1060 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_fetch_property_address_read_helper_SPEC_CV_CV(int type, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -24191,13 +23171,11 @@ static int zend_fetch_property_address_read_helper_SPEC_CV_CV(int type, ZEND_OPC
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1127 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_R_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_fetch_property_address_read_helper_SPEC_CV_CV(BP_VAR_R, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 1132 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_W_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -24213,7 +23191,6 @@ static int ZEND_FETCH_OBJ_W_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1147 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_RW_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -24225,13 +23202,11 @@ static int ZEND_FETCH_OBJ_RW_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1158 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_IS_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_fetch_property_address_read_helper_SPEC_CV_CV(BP_VAR_IS, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 1163 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -24249,7 +23224,6 @@ static int ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        }
 }
 
-#line 1180 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_UNSET_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -24268,7 +23242,6 @@ static int ZEND_FETCH_OBJ_UNSET_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1221 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_OBJ_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -24283,7 +23256,6 @@ static int ZEND_ASSIGN_OBJ_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1235 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_DIM_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -24320,7 +23292,6 @@ static int ZEND_ASSIGN_DIM_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1271 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -24334,7 +23305,6 @@ static int ZEND_ASSIGN_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1284 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_REF_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -24356,7 +23326,6 @@ static int ZEND_ASSIGN_REF_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1541 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_INIT_METHOD_CALL_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -24420,7 +23389,6 @@ static int ZEND_INIT_METHOD_CALL_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2256 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_CASE_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -24453,7 +23421,6 @@ static int ZEND_CASE_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2414 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_init_add_array_helper_SPEC_CV_CV(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -24530,19 +23497,16 @@ static int zend_init_add_array_helper_SPEC_CV_CV(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2490 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_INIT_ARRAY_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_init_add_array_helper_SPEC_CV_CV(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 2495 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ADD_ARRAY_ELEMENT_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_init_add_array_helper_SPEC_CV_CV(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 2712 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_UNSET_DIM_OBJ_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -24635,7 +23599,6 @@ static int ZEND_UNSET_DIM_OBJ_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 3105 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_isset_isempty_dim_prop_obj_handler_SPEC_CV_CV(int prop_dim, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -24738,19 +23701,16 @@ static int zend_isset_isempty_dim_prop_obj_handler_SPEC_CV_CV(int prop_dim, ZEND
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 3207 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ISSET_ISEMPTY_DIM_OBJ_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_isset_isempty_dim_prop_obj_handler_SPEC_CV_CV(0, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 3212 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ISSET_ISEMPTY_PROP_OBJ_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_isset_isempty_dim_prop_obj_handler_SPEC_CV_CV(1, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 24754 "/home/andi/php5/Zend/zend_vm_execute.h"
 static int ZEND_NULL_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_error_noreturn(E_ERROR, "Invalid opcode %d/%d/%d.", EX(opline)->opcode, EX(opline)->op1.op_type, EX(opline)->op2.op_type);
@@ -28593,7 +27553,6 @@ ZEND_API void old_execute(zend_op_array *op_array TSRMLS_DC)
 #undef EX
 #define EX(element) execute_data->element
 
-#line 1 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ADD_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -28607,7 +27566,6 @@ static int ZEND_ADD_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 14 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_SUB_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -28621,7 +27579,6 @@ static int ZEND_SUB_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 27 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_MUL_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -28635,7 +27592,6 @@ static int ZEND_MUL_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 40 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_DIV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -28649,7 +27605,6 @@ static int ZEND_DIV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 53 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_MOD_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -28663,7 +27618,6 @@ static int ZEND_MOD_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 66 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_SL_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -28677,7 +27631,6 @@ static int ZEND_SL_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 79 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_SR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -28691,7 +27644,6 @@ static int ZEND_SR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 92 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_CONCAT_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -28705,7 +27657,6 @@ static int ZEND_CONCAT_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 105 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_IDENTICAL_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -28719,7 +27670,6 @@ static int ZEND_IS_IDENTICAL_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 118 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_NOT_IDENTICAL_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -28733,7 +27683,6 @@ static int ZEND_IS_NOT_IDENTICAL_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 131 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_EQUAL_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -28747,7 +27696,6 @@ static int ZEND_IS_EQUAL_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 144 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_NOT_EQUAL_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -28761,7 +27709,6 @@ static int ZEND_IS_NOT_EQUAL_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 157 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_SMALLER_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -28775,7 +27722,6 @@ static int ZEND_IS_SMALLER_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 170 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_IS_SMALLER_OR_EQUAL_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -28789,7 +27735,6 @@ static int ZEND_IS_SMALLER_OR_EQUAL_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 183 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BW_OR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -28803,7 +27748,6 @@ static int ZEND_BW_OR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 196 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BW_AND_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -28817,7 +27761,6 @@ static int ZEND_BW_AND_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 209 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BW_XOR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -28831,7 +27774,6 @@ static int ZEND_BW_XOR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 222 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BOOL_XOR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -28845,7 +27787,6 @@ static int ZEND_BOOL_XOR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 235 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BW_NOT_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -28857,7 +27798,6 @@ static int ZEND_BW_NOT_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 246 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BOOL_NOT_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -28869,7 +27809,6 @@ static int ZEND_BOOL_NOT_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 257 "/home/andi/php5/Zend/zend_vm_def.h"
 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);
@@ -28983,7 +27922,6 @@ static int zend_binary_assign_op_obj_helper(int (*binary_op)(zval *result, zval
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 370 "/home/andi/php5/Zend/zend_vm_def.h"
 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);
@@ -29069,73 +28007,61 @@ static int zend_binary_assign_op_helper(int (*binary_op)(zval *result, zval *op1
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 455 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_ADD_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper(add_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 460 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_SUB_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper(sub_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 465 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_MUL_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper(mul_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 470 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_DIV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper(div_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 475 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_MOD_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper(mod_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 480 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_SL_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper(shift_left_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 485 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_SR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper(shift_right_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 490 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_CONCAT_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_binary_assign_op_helper(concat_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 495 "/home/andi/php5/Zend/zend_vm_def.h"
 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);
 }
 
-#line 500 "/home/andi/php5/Zend/zend_vm_def.h"
 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);
 }
 
-#line 505 "/home/andi/php5/Zend/zend_vm_def.h"
 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);
 }
 
-#line 510 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_pre_incdec_property_helper(incdec_t incdec_op, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -29202,19 +28128,16 @@ static int zend_pre_incdec_property_helper(incdec_t incdec_op, ZEND_OPCODE_HANDL
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 576 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_PRE_INC_OBJ_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_pre_incdec_property_helper(increment_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 581 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_PRE_DEC_OBJ_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_pre_incdec_property_helper(decrement_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 586 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_post_incdec_property_helper(incdec_t incdec_op, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -29277,19 +28200,16 @@ static int zend_post_incdec_property_helper(incdec_t incdec_op, ZEND_OPCODE_HAND
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 648 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_POST_INC_OBJ_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_post_incdec_property_helper(increment_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 653 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_POST_DEC_OBJ_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_post_incdec_property_helper(decrement_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 658 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_PRE_INC_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -29333,7 +28253,6 @@ static int ZEND_PRE_INC_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 701 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_PRE_DEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -29377,7 +28296,6 @@ static int ZEND_PRE_DEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 744 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_POST_INC_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -29418,7 +28336,6 @@ static int ZEND_POST_INC_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 784 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_POST_DEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -29459,7 +28376,6 @@ static int ZEND_POST_DEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 824 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ECHO_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -29479,7 +28395,6 @@ static int ZEND_ECHO_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 843 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_PRINT_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -29490,7 +28405,6 @@ static int ZEND_PRINT_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        return ZEND_ECHO_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 853 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_fetch_var_address_helper(int type, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -29580,43 +28494,36 @@ static int zend_fetch_var_address_helper(int type, ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 942 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_R_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_fetch_var_address_helper(BP_VAR_R, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 947 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_W_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_fetch_var_address_helper(BP_VAR_W, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 952 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_RW_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_fetch_var_address_helper(BP_VAR_RW, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 957 "/home/andi/php5/Zend/zend_vm_def.h"
 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);
 }
 
-#line 963 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_UNSET_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_fetch_var_address_helper(BP_VAR_UNSET, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 968 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_IS_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_fetch_var_address_helper(BP_VAR_IS, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 973 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_DIM_R_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -29631,7 +28538,6 @@ static int ZEND_FETCH_DIM_R_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 987 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_DIM_W_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -29643,7 +28549,6 @@ static int ZEND_FETCH_DIM_W_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 998 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_DIM_RW_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -29655,7 +28560,6 @@ static int ZEND_FETCH_DIM_RW_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1009 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_DIM_IS_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -29667,7 +28571,6 @@ static int ZEND_FETCH_DIM_IS_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1020 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_DIM_FUNC_ARG_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -29680,7 +28583,6 @@ static int ZEND_FETCH_DIM_FUNC_ARG_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1032 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_DIM_UNSET_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -29709,7 +28611,6 @@ static int ZEND_FETCH_DIM_UNSET_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1060 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_fetch_property_address_read_helper(int type, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -29777,13 +28678,11 @@ static int zend_fetch_property_address_read_helper(int type, ZEND_OPCODE_HANDLER
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1127 "/home/andi/php5/Zend/zend_vm_def.h"
 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);
 }
 
-#line 1132 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_W_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -29799,7 +28698,6 @@ static int ZEND_FETCH_OBJ_W_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1147 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_RW_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -29811,13 +28709,11 @@ static int ZEND_FETCH_OBJ_RW_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1158 "/home/andi/php5/Zend/zend_vm_def.h"
 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);
 }
 
-#line 1163 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_FUNC_ARG_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -29835,7 +28731,6 @@ static int ZEND_FETCH_OBJ_FUNC_ARG_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        }
 }
 
-#line 1180 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_OBJ_UNSET_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -29854,7 +28749,6 @@ static int ZEND_FETCH_OBJ_UNSET_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1198 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_DIM_TMP_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -29878,7 +28772,6 @@ static int ZEND_FETCH_DIM_TMP_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1221 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_OBJ_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -29893,7 +28786,6 @@ static int ZEND_ASSIGN_OBJ_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1235 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_DIM_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -29930,7 +28822,6 @@ static int ZEND_ASSIGN_DIM_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1271 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -29944,7 +28835,6 @@ static int ZEND_ASSIGN_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1284 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ASSIGN_REF_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -29966,7 +28856,6 @@ static int ZEND_ASSIGN_REF_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1305 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_JMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
 #if DEBUG_ZEND>=2
@@ -29976,7 +28865,6 @@ static int ZEND_JMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_CONTINUE(); /* CHECK_ME */
 }
 
-#line 1314 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_JMPZ_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -29995,7 +28883,6 @@ static int ZEND_JMPZ_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1332 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_JMPNZ_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -30014,7 +28901,6 @@ static int ZEND_JMPNZ_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1350 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_JMPZNZ_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -30037,7 +28923,6 @@ static int ZEND_JMPZNZ_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        }
 }
 
-#line 1372 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_JMPZ_EX_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -30057,7 +28942,6 @@ static int ZEND_JMPZ_EX_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1391 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_JMPNZ_EX_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -30077,14 +28961,12 @@ static int ZEND_JMPNZ_EX_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1410 "/home/andi/php5/Zend/zend_vm_def.h"
 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();
 }
 
-#line 1416 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_INIT_STRING_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zval *tmp = &EX_T(EX(opline)->result.u.var).tmp_var;
@@ -30098,7 +28980,6 @@ static int ZEND_INIT_STRING_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1429 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ADD_CHAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -30111,7 +28992,6 @@ static int ZEND_ADD_CHAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1441 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ADD_STRING_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -30124,7 +29004,6 @@ static int ZEND_ADD_STRING_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1453 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ADD_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -30154,7 +29033,6 @@ static int ZEND_ADD_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1482 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_CLASS_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -30185,7 +29063,6 @@ static int ZEND_FETCH_CLASS_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1512 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_INIT_CTOR_CALL_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -30215,7 +29092,6 @@ static int ZEND_INIT_CTOR_CALL_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1541 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_INIT_METHOD_CALL_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -30279,7 +29155,6 @@ static int ZEND_INIT_METHOD_CALL_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1604 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_INIT_STATIC_METHOD_CALL_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -30334,7 +29209,6 @@ static int ZEND_INIT_STATIC_METHOD_CALL_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1658 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_INIT_FCALL_BY_NAME_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -30380,7 +29254,6 @@ static int ZEND_INIT_FCALL_BY_NAME_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 }
 
 
-#line 1703 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_do_fcall_common_helper(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -30555,14 +29428,12 @@ static int zend_do_fcall_common_helper(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 1877 "/home/andi/php5/Zend/zend_vm_def.h"
 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);
 }
 
-#line 1883 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_DO_FCALL_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -30582,7 +29453,6 @@ static int ZEND_DO_FCALL_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        return zend_do_fcall_common_helper(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 1902 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_RETURN_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -30657,7 +29527,6 @@ return_by_value:
        ZEND_VM_RETURN_FROM_EXECUTE_LOOP();
 }
 
-#line 1976 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_THROW_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -30682,7 +29551,6 @@ static int ZEND_THROW_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2000 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_CATCH_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -30711,7 +29579,6 @@ static int ZEND_CATCH_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2028 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_SEND_VAL_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -30737,7 +29604,6 @@ static int ZEND_SEND_VAL_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2053 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_send_by_var_helper(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -30765,7 +29631,6 @@ static int zend_send_by_var_helper(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2080 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_SEND_VAR_NO_REF_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -30793,7 +29658,6 @@ static int ZEND_SEND_VAR_NO_REF_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2107 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_SEND_REF_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -30815,7 +29679,6 @@ static int ZEND_SEND_REF_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2128 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_SEND_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -30827,7 +29690,6 @@ static int ZEND_SEND_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        return zend_send_by_var_helper(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 2139 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_RECV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -30864,7 +29726,6 @@ static int ZEND_RECV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2175 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_RECV_INIT_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -30907,7 +29768,6 @@ static int ZEND_RECV_INIT_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2217 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BOOL_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -30921,7 +29781,6 @@ static int ZEND_BOOL_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2230 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BRK_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -30935,7 +29794,6 @@ static int ZEND_BRK_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_CONTINUE(); /* CHECK_ME */
 }
 
-#line 2243 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_CONT_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -30949,7 +29807,6 @@ static int ZEND_CONT_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_CONTINUE(); /* CHECK_ME */
 }
 
-#line 2256 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_CASE_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -30982,14 +29839,12 @@ static int ZEND_CASE_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2288 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_SWITCH_FREE_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_switch_free(EX(opline), EX(Ts) TSRMLS_CC);
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2294 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_NEW_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -31013,7 +29868,6 @@ static int ZEND_NEW_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2317 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_CLONE_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -31070,7 +29924,6 @@ static int ZEND_CLONE_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2373 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FETCH_CONSTANT_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -31112,7 +29965,6 @@ static int ZEND_FETCH_CONSTANT_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2414 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_init_add_array_helper(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -31189,19 +30041,16 @@ static int zend_init_add_array_helper(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2490 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_INIT_ARRAY_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_init_add_array_helper(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 2495 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ADD_ARRAY_ELEMENT_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        return zend_init_add_array_helper(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 
-#line 2500 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_CAST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -31248,7 +30097,6 @@ static int ZEND_CAST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2546 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_INCLUDE_OR_EVAL_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -31368,7 +30216,6 @@ static int ZEND_INCLUDE_OR_EVAL_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2665 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_UNSET_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -31416,7 +30263,6 @@ static int ZEND_UNSET_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2712 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_UNSET_DIM_OBJ_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -31509,7 +30355,6 @@ static int ZEND_UNSET_DIM_OBJ_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2804 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FE_RESET_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -31593,7 +30438,6 @@ static int ZEND_FE_RESET_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 2887 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_FE_FETCH_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -31729,7 +30573,6 @@ static int ZEND_FE_FETCH_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 3022 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_JMP_NO_CTOR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -31758,7 +30601,6 @@ static int ZEND_JMP_NO_CTOR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 3050 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ISSET_ISEMPTY_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -31814,7 +30656,6 @@ static int ZEND_ISSET_ISEMPTY_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 3105 "/home/andi/php5/Zend/zend_vm_def.h"
 static int zend_isset_isempty_dim_prop_obj_handler(int prop_dim, ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -31917,19 +30758,16 @@ static int zend_isset_isempty_dim_prop_obj_handler(int prop_dim, ZEND_OPCODE_HAN
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 3207 "/home/andi/php5/Zend/zend_vm_def.h"
 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);
 }
 
-#line 3212 "/home/andi/php5/Zend/zend_vm_def.h"
 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);
 }
 
-#line 3217 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_EXIT_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -31950,7 +30788,6 @@ static int ZEND_EXIT_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 3237 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_BEGIN_SILENCE_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -31961,14 +30798,12 @@ static int ZEND_BEGIN_SILENCE_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 3247 "/home/andi/php5/Zend/zend_vm_def.h"
 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 */
 }
 
-#line 3253 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_END_SILENCE_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -31984,7 +30819,6 @@ static int ZEND_END_SILENCE_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 3268 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_QM_ASSIGN_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -31999,7 +30833,6 @@ static int ZEND_QM_ASSIGN_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 3282 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_EXT_STMT_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        if (!EG(no_extensions)) {
@@ -32008,7 +30841,6 @@ static int ZEND_EXT_STMT_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 3290 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_EXT_FCALL_BEGIN_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        if (!EG(no_extensions)) {
@@ -32017,7 +30849,6 @@ static int ZEND_EXT_FCALL_BEGIN_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 3298 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_EXT_FCALL_END_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        if (!EG(no_extensions)) {
@@ -32026,7 +30857,6 @@ static int ZEND_EXT_FCALL_END_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 3306 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_DECLARE_CLASS_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -32035,7 +30865,6 @@ static int ZEND_DECLARE_CLASS_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 3314 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_DECLARE_INHERITED_CLASS_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -32044,14 +30873,12 @@ static int ZEND_DECLARE_INHERITED_CLASS_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 3322 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_DECLARE_FUNCTION_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        do_bind_function(EX(opline), EG(function_table), 0);
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 3328 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_TICKS_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -32065,7 +30892,6 @@ static int ZEND_TICKS_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 3341 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_INSTANCEOF_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -32083,19 +30909,16 @@ static int ZEND_INSTANCEOF_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 3358 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_EXT_NOP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 3363 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_NOP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 3368 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_ADD_INTERFACE_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
@@ -32113,7 +30936,6 @@ static int ZEND_ADD_INTERFACE_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        ZEND_VM_NEXT_OPCODE();
 }
 
-#line 3385 "/home/andi/php5/Zend/zend_vm_def.h"
 static int ZEND_HANDLE_EXCEPTION_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_uint op_num = EG(opline_before_exception)-EG(active_op_array)->opcodes;
@@ -32147,14 +30969,12 @@ static int ZEND_HANDLE_EXCEPTION_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        }
 }
 
-#line 3418 "/home/andi/php5/Zend/zend_vm_def.h"
 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();
 }
 
-#line 32158 "/home/andi/php5/Zend/zend_vm_execute.h"
 
 void zend_vm_use_old_executor()
 {

diff --git a/Zend/zend_vm_gen.php b/Zend/zend_vm_gen.php
index 079dd4279db545348bcf01fb3668322120187b97..f8d25b77d4fd74ef6922b37db52a18423fc18ded 100644 (file)
--- a/Zend/zend_vm_gen.php
+++ b/Zend/zend_vm_gen.php
@@ -1,7 +1,7 @@
 <?php
-/* 
-   This script creates zend_vm_execute.h and zend_vm_opcodes.h
-   from existing zend_vm_def.h and zend_vm_execute.skl
+/*
+       This script creates zend_vm_execute.h and zend_vm_opcodes.h
+       from existing zend_vm_def.h and zend_vm_execute.skl
 */
 
 error_reporting(E_ALL);
@@ -11,192 +11,192 @@ define("ZEND_VM_KIND_SWITCH", 2);
 define("ZEND_VM_KIND_GOTO",   3);
 
 $op_types = array(
-  "ANY",
-  "CONST",
-  "TMP",
-  "VAR",
-  "UNUSED",
-  "CV"
+       "ANY",
+       "CONST",
+       "TMP",
+       "VAR",
+       "UNUSED",
+       "CV"
 );
 
 $prefix = array(
-  "ANY"    => "",
-  "TMP"    => "_TMP",
-  "VAR"    => "_VAR",
-  "CONST"  => "_CONST",
-  "UNUSED" => "_UNUSED",
-  "CV"     => "_CV",
+       "ANY"    => "",
+       "TMP"    => "_TMP",
+       "VAR"    => "_VAR",
+       "CONST"  => "_CONST",
+       "UNUSED" => "_UNUSED",
+       "CV"     => "_CV",
 );
 
 $typecode = array(
-  "ANY"    => 0,
-  "TMP"    => 1,
-  "VAR"    => 2,
-  "CONST"  => 0,
-  "UNUSED" => 3,
-  "CV"     => 4,
+       "ANY"    => 0,
+       "TMP"    => 1,
+       "VAR"    => 2,
+       "CONST"  => 0,
+       "UNUSED" => 3,
+       "CV"     => 4,
 );
 
 $op1_type = array(
-  "ANY"    => "opline->op1.op_type",
-  "TMP"    => "IS_TMP_VAR",
-  "VAR"    => "IS_VAR",
-  "CONST"  => "IS_CONST",
-  "UNUSED" => "IS_UNUSED",
-  "CV"     => "IS_CV",
+       "ANY"    => "opline->op1.op_type",
+       "TMP"    => "IS_TMP_VAR",
+       "VAR"    => "IS_VAR",
+       "CONST"  => "IS_CONST",
+       "UNUSED" => "IS_UNUSED",
+       "CV"     => "IS_CV",
 );
 
 $op2_type = array(
-  "ANY"    => "opline->op2.op_type",
-  "TMP"    => "IS_TMP_VAR",
-  "VAR"    => "IS_VAR",
-  "CONST"  => "IS_CONST",
-  "UNUSED" => "IS_UNUSED",
-  "CV"     => "IS_CV",
+       "ANY"    => "opline->op2.op_type",
+       "TMP"    => "IS_TMP_VAR",
+       "VAR"    => "IS_VAR",
+       "CONST"  => "IS_CONST",
+       "UNUSED" => "IS_UNUSED",
+       "CV"     => "IS_CV",
 );
 
 $op1_get_zval_ptr = array(
-  "ANY"    => "get_zval_ptr(&opline->op1, EX(Ts), &free_op1, \\1)",
-  "TMP"    => "_get_zval_ptr_tmp(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC)",
-  "VAR"    => "_get_zval_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC)",
-  "CONST"  => "_get_zval_ptr_const(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC)",
-  "UNUSED" => "_get_zval_ptr_unused(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC)",
-  "CV"     => "_get_zval_ptr_cv(&opline->op1, EX(Ts), &free_op1, \\1 TSRMLS_CC)",
+       "ANY"    => "get_zval_ptr(&opline->op1, EX(Ts), &free_op1, \\1)",
+       "TMP"    => "_get_zval_ptr_tmp(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC)",
+       "VAR"    => "_get_zval_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC)",
+       "CONST"  => "_get_zval_ptr_const(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC)",
+       "UNUSED" => "_get_zval_ptr_unused(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC)",
+       "CV"     => "_get_zval_ptr_cv(&opline->op1, EX(Ts), &free_op1, \\1 TSRMLS_CC)",
 );
 
 $op2_get_zval_ptr = array(
-  "ANY"    => "get_zval_ptr(&opline->op2, EX(Ts), &free_op2, \\1)",
-  "TMP"    => "_get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC)",
-  "VAR"    => "_get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC)",
-  "CONST"  => "_get_zval_ptr_const(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC)",
-  "UNUSED" => "_get_zval_ptr_unused(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC)",
-  "CV"     => "_get_zval_ptr_cv(&opline->op2, EX(Ts), &free_op2, \\1 TSRMLS_CC)",
+       "ANY"    => "get_zval_ptr(&opline->op2, EX(Ts), &free_op2, \\1)",
+       "TMP"    => "_get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC)",
+       "VAR"    => "_get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC)",
+       "CONST"  => "_get_zval_ptr_const(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC)",
+       "UNUSED" => "_get_zval_ptr_unused(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC)",
+       "CV"     => "_get_zval_ptr_cv(&opline->op2, EX(Ts), &free_op2, \\1 TSRMLS_CC)",
 );
 
 $op1_get_zval_ptr_ptr = array(
-  "ANY"    => "get_zval_ptr_ptr(&opline->op1, EX(Ts), &free_op1, \\1)",
-  "TMP"    => "_get_zval_ptr_ptr_tmp(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC)",
-  "VAR"    => "_get_zval_ptr_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC)",
-  "CONST"  => "_get_zval_ptr_ptr_const(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC)",
-  "UNUSED" => "_get_zval_ptr_ptr_unused(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC)",
-  "CV"     => "_get_zval_ptr_ptr_cv(&opline->op1, EX(Ts), &free_op1, \\1 TSRMLS_CC)",
+       "ANY"    => "get_zval_ptr_ptr(&opline->op1, EX(Ts), &free_op1, \\1)",
+       "TMP"    => "_get_zval_ptr_ptr_tmp(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC)",
+       "VAR"    => "_get_zval_ptr_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC)",
+       "CONST"  => "_get_zval_ptr_ptr_const(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC)",
+       "UNUSED" => "_get_zval_ptr_ptr_unused(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC)",
+       "CV"     => "_get_zval_ptr_ptr_cv(&opline->op1, EX(Ts), &free_op1, \\1 TSRMLS_CC)",
 );
 
 $op2_get_zval_ptr_ptr = array(
-  "ANY"    => "get_zval_ptr_ptr(&opline->op2, EX(Ts), &free_op2, \\1)",
-  "TMP"    => "_get_zval_ptr_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC)",
-  "VAR"    => "_get_zval_ptr_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC)",
-  "CONST"  => "_get_zval_ptr_ptr_const(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC)",
-  "UNUSED" => "_get_zval_ptr_ptr_unused(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC)",
-  "CV"     => "_get_zval_ptr_ptr_cv(&opline->op2, EX(Ts), &free_op2, \\1 TSRMLS_CC)",
+       "ANY"    => "get_zval_ptr_ptr(&opline->op2, EX(Ts), &free_op2, \\1)",
+       "TMP"    => "_get_zval_ptr_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC)",
+       "VAR"    => "_get_zval_ptr_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC)",
+       "CONST"  => "_get_zval_ptr_ptr_const(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC)",
+       "UNUSED" => "_get_zval_ptr_ptr_unused(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC)",
+       "CV"     => "_get_zval_ptr_ptr_cv(&opline->op2, EX(Ts), &free_op2, \\1 TSRMLS_CC)",
 );
 
 $op1_get_obj_zval_ptr = array(
-  "ANY"    => "get_obj_zval_ptr(&opline->op1, EX(Ts), &free_op1, \\1)",
-  "TMP"    => "_get_obj_zval_ptr_tmp(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC)",
-  "VAR"    => "_get_obj_zval_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC)",
-  "CONST"  => "_get_obj_zval_ptr_const(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC)",
-  "UNUSED" => "_get_obj_zval_ptr_unused(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC)",
-  "CV"     => "_get_obj_zval_ptr_cv(&opline->op1, EX(Ts), &free_op1, \\1 TSRMLS_CC)",
+       "ANY"    => "get_obj_zval_ptr(&opline->op1, EX(Ts), &free_op1, \\1)",
+       "TMP"    => "_get_obj_zval_ptr_tmp(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC)",
+       "VAR"    => "_get_obj_zval_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC)",
+       "CONST"  => "_get_obj_zval_ptr_const(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC)",
+       "UNUSED" => "_get_obj_zval_ptr_unused(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC)",
+       "CV"     => "_get_obj_zval_ptr_cv(&opline->op1, EX(Ts), &free_op1, \\1 TSRMLS_CC)",
 );
 
 $op2_get_obj_zval_ptr = array(
-  "ANY"    => "get_obj_zval_ptr(&opline->op2, EX(Ts), &free_op2, \\1)",
-  "TMP"    => "_get_obj_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC)",
-  "VAR"    => "_get_obj_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC)",
-  "CONST"  => "_get_obj_zval_ptr_const(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC)",
-  "UNUSED" => "_get_obj_zval_ptr_unused(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC)",
-  "CV"     => "_get_obj_zval_ptr_cv(&opline->op2, EX(Ts), &free_op2, \\1 TSRMLS_CC)",
+       "ANY"    => "get_obj_zval_ptr(&opline->op2, EX(Ts), &free_op2, \\1)",
+       "TMP"    => "_get_obj_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC)",
+       "VAR"    => "_get_obj_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC)",
+       "CONST"  => "_get_obj_zval_ptr_const(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC)",
+       "UNUSED" => "_get_obj_zval_ptr_unused(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC)",
+       "CV"     => "_get_obj_zval_ptr_cv(&opline->op2, EX(Ts), &free_op2, \\1 TSRMLS_CC)",
 );
 
 $op1_get_obj_zval_ptr_ptr = array(
-  "ANY"    => "get_obj_zval_ptr_ptr(&opline->op1, EX(Ts), &free_op1, \\1)",
-  "TMP"    => "_get_obj_zval_ptr_ptr_tmp(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC)",
-  "VAR"    => "_get_obj_zval_ptr_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC)",
-  "CONST"  => "_get_obj_zval_ptr_ptr_const(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC)",
-  "UNUSED" => "_get_obj_zval_ptr_ptr_unused(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC)",
-  "CV"     => "_get_obj_zval_ptr_ptr_cv(&opline->op1, EX(Ts), &free_op1, \\1 TSRMLS_CC)",
+       "ANY"    => "get_obj_zval_ptr_ptr(&opline->op1, EX(Ts), &free_op1, \\1)",
+       "TMP"    => "_get_obj_zval_ptr_ptr_tmp(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC)",
+       "VAR"    => "_get_obj_zval_ptr_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC)",
+       "CONST"  => "_get_obj_zval_ptr_ptr_const(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC)",
+       "UNUSED" => "_get_obj_zval_ptr_ptr_unused(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC)",
+       "CV"     => "_get_obj_zval_ptr_ptr_cv(&opline->op1, EX(Ts), &free_op1, \\1 TSRMLS_CC)",
 );
 
 $op2_get_obj_zval_ptr_ptr = array(
-  "ANY"    => "get_obj_zval_ptr_ptr(&opline->op2, EX(Ts), &free_op2, \\1)",
-  "TMP"    => "_get_obj_zval_ptr_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC)",
-  "VAR"    => "_get_obj_zval_ptr_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC)",
-  "CONST"  => "_get_obj_zval_ptr_ptr_const(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC)",
-  "UNUSED" => "_get_obj_zval_ptr_ptr_unused(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC)",
-  "CV"     => "_get_obj_zval_ptr_ptr_cv(&opline->op2, EX(Ts), &free_op2, \\1 TSRMLS_CC)",
+       "ANY"    => "get_obj_zval_ptr_ptr(&opline->op2, EX(Ts), &free_op2, \\1)",
+       "TMP"    => "_get_obj_zval_ptr_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC)",
+       "VAR"    => "_get_obj_zval_ptr_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC)",
+       "CONST"  => "_get_obj_zval_ptr_ptr_const(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC)",
+       "UNUSED" => "_get_obj_zval_ptr_ptr_unused(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC)",
+       "CV"     => "_get_obj_zval_ptr_ptr_cv(&opline->op2, EX(Ts), &free_op2, \\1 TSRMLS_CC)",
 );
 
 $op1_is_tmp_free = array(
-  "ANY"    => "IS_TMP_FREE(free_op1)",
-  "TMP"    => "1",
-  "VAR"    => "0",
-  "CONST"  => "0",
-  "UNUSED" => "0",
-  "CV"     => "0",
+       "ANY"    => "IS_TMP_FREE(free_op1)",
+       "TMP"    => "1",
+       "VAR"    => "0",
+       "CONST"  => "0",
+       "UNUSED" => "0",
+       "CV"     => "0",
 );
 
 $op2_is_tmp_free = array(
-  "ANY"    => "IS_TMP_FREE(free_op2)",
-  "TMP"    => "1",
-  "VAR"    => "0",
-  "CONST"  => "0",
-  "UNUSED" => "0",
-  "CV"     => "0",
+       "ANY"    => "IS_TMP_FREE(free_op2)",
+       "TMP"    => "1",
+       "VAR"    => "0",
+       "CONST"  => "0",
+       "UNUSED" => "0",
+       "CV"     => "0",
 );
 
 $op1_free_op = array(
-  "ANY"    => "FREE_OP(free_op1)",
-  "TMP"    => "zval_dtor(free_op1.var)",
-  "VAR"    => "if (free_op1.var) {zval_ptr_dtor(&free_op1.var);}",
-  "CONST"  => "",
-  "UNUSED" => "",
-  "CV"     => "",
+       "ANY"    => "FREE_OP(free_op1)",
+       "TMP"    => "zval_dtor(free_op1.var)",
+       "VAR"    => "if (free_op1.var) {zval_ptr_dtor(&free_op1.var);}",
+       "CONST"  => "",
+       "UNUSED" => "",
+       "CV"     => "",
 );
 
 $op2_free_op = array(
-  "ANY"    => "FREE_OP(free_op2)",
-  "TMP"    => "zval_dtor(free_op2.var)",
-  "VAR"    => "if (free_op2.var) {zval_ptr_dtor(&free_op2.var);}",
-  "CONST"  => "",
-  "UNUSED" => "",
-  "CV"     => "",
+       "ANY"    => "FREE_OP(free_op2)",
+       "TMP"    => "zval_dtor(free_op2.var)",
+       "VAR"    => "if (free_op2.var) {zval_ptr_dtor(&free_op2.var);}",
+       "CONST"  => "",
+       "UNUSED" => "",
+       "CV"     => "",
 );
 
 $op1_free_op_if_var = array(
-  "ANY"    => "FREE_OP_IF_VAR(free_op1)",
-  "TMP"    => "",
-  "VAR"    => "if (free_op1.var) {zval_ptr_dtor(&free_op1.var);}",
-  "CONST"  => "",
-  "UNUSED" => "",
-  "CV"     => "",
+       "ANY"    => "FREE_OP_IF_VAR(free_op1)",
+       "TMP"    => "",
+       "VAR"    => "if (free_op1.var) {zval_ptr_dtor(&free_op1.var);}",
+       "CONST"  => "",
+       "UNUSED" => "",
+       "CV"     => "",
 );
 
 $op2_free_op_if_var = array(
-  "ANY"    => "FREE_OP_IF_VAR(free_op2)",
-  "TMP"    => "",
-  "VAR"    => "if (free_op2.var) {zval_ptr_dtor(&free_op2.var);}",
-  "CONST"  => "",
-  "UNUSED" => "",
-  "CV"     => "",
+       "ANY"    => "FREE_OP_IF_VAR(free_op2)",
+       "TMP"    => "",
+       "VAR"    => "if (free_op2.var) {zval_ptr_dtor(&free_op2.var);}",
+       "CONST"  => "",
+       "UNUSED" => "",
+       "CV"     => "",
 );
 
 $op1_free_op_var_ptr = array(
-  "ANY"    => "if (free_op1.var) {zval_ptr_dtor(&free_op1.var);}",
-  "TMP"    => "",
-  "VAR"    => "if (free_op1.var) {zval_ptr_dtor(&free_op1.var);}",
-  "CONST"  => "",
-  "UNUSED" => "",
-  "CV"     => "",
+       "ANY"    => "if (free_op1.var) {zval_ptr_dtor(&free_op1.var);}",
+       "TMP"    => "",
+       "VAR"    => "if (free_op1.var) {zval_ptr_dtor(&free_op1.var);}",
+       "CONST"  => "",
+       "UNUSED" => "",
+       "CV"     => "",
 );
 
 $op2_free_op_var_ptr = array(
-  "ANY"    => "if (free_op2.var) {zval_ptr_dtor(&free_op2.var);}",
-  "TMP"    => "",
-  "VAR"    => "if (free_op2.var) {zval_ptr_dtor(&free_op2.var);}",
-  "CONST"  => "",
-  "UNUSED" => "",
-  "CV"     => "",
+       "ANY"    => "if (free_op2.var) {zval_ptr_dtor(&free_op2.var);}",
+       "TMP"    => "",
+       "VAR"    => "if (free_op2.var) {zval_ptr_dtor(&free_op2.var);}",
+       "CONST"  => "",
+       "UNUSED" => "",
+       "CV"     => "",
 );
 
 $list    = array(); // list of opcode handlers and helpers in original order
@@ -208,792 +208,858 @@ $line_no = 1;
 
 // Writes $s into resulting executor
 function out($f, $s) {
-  global $line_no;
-  fputs($f,$s);
-  $line_no += substr_count($s, "\n");
+       global $line_no;
+
+       fputs($f,$s);
+       $line_no += substr_count($s, "\n");
 }
 
 // Resets #line directives in resulting executor
 function out_line($f) {
-  global $line_no, $executor_file;
-  fputs($f,"#line ".($line_no+1)." \"".$executor_file."\"\n");
-  ++$line_no;
+       global $line_no, $executor_file;
+
+       fputs($f,"#line ".($line_no+1)." \"".$executor_file."\"\n");
+       ++$line_no;
 }
 
 // Returns name of specialized helper
 function helper_name($name, $spec, $op1, $op2) {
-  global $prefix, $helpers;
-
-  if (isset($helpers[$name])) {
-    // If we haven't helper with specified spicialized operands then
-    // using unspecialized helper
-    if (!isset($helpers[$name]["op1"][$op1]) &&
-         isset($helpers[$name]["op1"]["ANY"])) {
-      $op1 = "ANY";
-    }
-    if (!isset($helpers[$name]["op2"][$op2]) &&
-         isset($helpers[$name]["op2"]["ANY"])) {
-      $op2 = "ANY";
-    }
-  }
-  return $name.($spec?"_SPEC":"").$prefix[$op1].$prefix[$op2];
+       global $prefix, $helpers;
+
+       if (isset($helpers[$name])) {
+               // If we haven't helper with specified spicialized operands then
+               // using unspecialized helper
+               if (!isset($helpers[$name]["op1"][$op1]) &&
+                   isset($helpers[$name]["op1"]["ANY"])) {
+                       $op1 = "ANY";
+               }
+               if (!isset($helpers[$name]["op2"][$op2]) &&
+                   isset($helpers[$name]["op2"]["ANY"])) {
+                       $op2 = "ANY";
+               }
+       }
+       return $name.($spec?"_SPEC":"").$prefix[$op1].$prefix[$op2];
 }
 
 // Generates code for opcode handler or helper
 function gen_code($f, $spec, $kind, $code, $op1, $op2) {
-  global $op1_type, $op2_type, $op1_get_zval_ptr, $op2_get_zval_ptr,
-    $op1_get_zval_ptr_ptr, $op2_get_zval_ptr_ptr,
-    $op1_get_obj_zval_ptr, $op2_get_obj_zval_ptr,
-    $op1_get_obj_zval_ptr_ptr, $op2_get_obj_zval_ptr_ptr,
-    $op1_is_tmp_free, $op2_is_tmp_free,
-    $op1_free_op, $op2_free_op, $op1_free_op_if_var, $op2_free_op_if_var,
-    $op1_free_op_var_ptr, $op2_free_op_var_ptr, $prefix;
-
-  // Specializing
-  $code = preg_replace(
-    array(
-      "/OP1_TYPE/",
-      "/OP2_TYPE/",
-      "/GET_OP1_ZVAL_PTR\(([^)]*)\)/",
-      "/GET_OP2_ZVAL_PTR\(([^)]*)\)/",
-      "/GET_OP1_ZVAL_PTR_PTR\(([^)]*)\)/",
-      "/GET_OP2_ZVAL_PTR_PTR\(([^)]*)\)/",
-      "/GET_OP1_OBJ_ZVAL_PTR\(([^)]*)\)/",
-      "/GET_OP2_OBJ_ZVAL_PTR\(([^)]*)\)/",
-      "/GET_OP1_OBJ_ZVAL_PTR_PTR\(([^)]*)\)/",
-      "/GET_OP2_OBJ_ZVAL_PTR_PTR\(([^)]*)\)/",
-      "/IS_OP1_TMP_FREE\(\)/",
-      "/IS_OP2_TMP_FREE\(\)/",
-      "/FREE_OP1\(\)/",
-      "/FREE_OP2\(\)/",
-      "/FREE_OP1_IF_VAR\(\)/",
-      "/FREE_OP2_IF_VAR\(\)/",
-      "/FREE_OP1_VAR_PTR\(\)/",
-      "/FREE_OP2_VAR_PTR\(\)/",
-      "/^#ifdef\s+ZEND_VM_SPEC\s*\n/m",
-      "/^#ifndef\s+ZEND_VM_SPEC\s*\n/m",
-      "/ZEND_VM_C_LABEL\(\s*([A-Za-z_]*)\s*\)/m",
-      "/ZEND_VM_C_GOTO\(\s*([A-Za-z_]*)\s*\)/m",
-    ),
-    array(
-      $op1_type[$op1],
-      $op2_type[$op2],
-      $op1_get_zval_ptr[$op1],
-      $op2_get_zval_ptr[$op2],
-      $op1_get_zval_ptr_ptr[$op1],
-      $op2_get_zval_ptr_ptr[$op2],
-      $op1_get_obj_zval_ptr[$op1],
-      $op2_get_obj_zval_ptr[$op2],
-      $op1_get_obj_zval_ptr_ptr[$op1],
-      $op2_get_obj_zval_ptr_ptr[$op2],
-      $op1_is_tmp_free[$op1],
-      $op2_is_tmp_free[$op2],
-      $op1_free_op[$op1],
-      $op2_free_op[$op2],
-      $op1_free_op_if_var[$op1],
-      $op2_free_op_if_var[$op2],
-      $op1_free_op_var_ptr[$op1],
-      $op2_free_op_var_ptr[$op2],
-      ($op1!="ANY"||$op2!="ANY")?"#if 1\n":"#if 0\n",
-      ($op1!="ANY"||$op2!="ANY")?"#if 0\n":"#if 1\n",
-      "\\1".(($spec && $kind != ZEND_VM_KIND_CALL)?("_SPEC".$prefix[$op1].$prefix[$op2]):""),
-      "goto \\1".(($spec && $kind != ZEND_VM_KIND_CALL)?("_SPEC".$prefix[$op1].$prefix[$op2]):""),
-    ),
-    $code); 
-
-  // Updating code according to selected threading model
-  switch($kind) {
-    case ZEND_VM_KIND_CALL:
-      $code = preg_replace(
-        array(
-          "/EXECUTE_DATA/m",
-          "/ZEND_VM_DISPATCH_TO_HANDLER\(\s*([A-Z_]*)\s*\)/m",
-          "/ZEND_VM_DISPATCH_TO_HELPER\(\s*([A-Za-z_]*)\s*\)/me",
-          "/ZEND_VM_DISPATCH_TO_HELPER_EX\(\s*([A-Za-z_]*)\s*,\s*[A-Za-z_]*\s*,\s*(.*)\s*\);/me",
-        ),
-        array(
-          "execute_data",
-          "return \\1".($spec?"_SPEC":"").$prefix[$op1].$prefix[$op2]."_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU)",
-          "'return '.helper_name('\\1',$spec,'$op1','$op2').'(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU)'",
-          "'return '.helper_name('\\1',$spec,'$op1','$op2').'(\\2, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);'",
-        ),
-        $code);
-      break;
-    case ZEND_VM_KIND_SWITCH:
-      $code = preg_replace(
-        array(
-          "/EXECUTE_DATA/m",
-          "/ZEND_VM_DISPATCH_TO_HANDLER\(\s*([A-Z_]*)\s*\)/m",
-          "/ZEND_VM_DISPATCH_TO_HELPER\(\s*([A-Za-z_]*)\s*\)/me",
-          "/ZEND_VM_DISPATCH_TO_HELPER_EX\(\s*([A-Za-z_]*)\s*,\s*([A-Za-z_]*)\s*,\s*(.*)\s*\);/me",
-        ),
-        array(
-          "&execute_data",
-          "goto \\1".($spec?"_SPEC":"").$prefix[$op1].$prefix[$op2]."_LABEL",
-          "'goto '.helper_name('\\1',$spec,'$op1','$op2')",
-          "'\\2 = \\3; goto '.helper_name('\\1',$spec,'$op1','$op2').';'",
-        ),
-        $code);
-      break;
-    case ZEND_VM_KIND_GOTO:
-      $code = preg_replace(
-        array(
-          "/EXECUTE_DATA/m",
-          "/ZEND_VM_DISPATCH_TO_HANDLER\(\s*([A-Z_]*)\s*\)/m",
-          "/ZEND_VM_DISPATCH_TO_HELPER\(\s*([A-Za-z_]*)\s*\)/me",
-          "/ZEND_VM_DISPATCH_TO_HELPER_EX\(\s*([A-Za-z_]*)\s*,\s*([A-Za-z_]*)\s*,\s*(.*)\s*\);/me",
-        ),
-        array(
-          "&execute_data",
-          "goto \\1".($spec?"_SPEC":"").$prefix[$op1].$prefix[$op2]."_HANDLER",
-          "'goto '.helper_name('\\1',$spec,'$op1','$op2')",
-          "'\\2 = \\3; goto '.helper_name('\\1',$spec,'$op1','$op2').';'",
-        ),
-        $code);
-      break;
-  }
-  
-  out($f, $code);
+       global $op1_type, $op2_type, $op1_get_zval_ptr, $op2_get_zval_ptr,
+               $op1_get_zval_ptr_ptr, $op2_get_zval_ptr_ptr,
+               $op1_get_obj_zval_ptr, $op2_get_obj_zval_ptr,
+               $op1_get_obj_zval_ptr_ptr, $op2_get_obj_zval_ptr_ptr,
+               $op1_is_tmp_free, $op2_is_tmp_free,
+               $op1_free_op, $op2_free_op, $op1_free_op_if_var, $op2_free_op_if_var,
+               $op1_free_op_var_ptr, $op2_free_op_var_ptr, $prefix;
+
+       // Specializing
+       $code = preg_replace(
+               array(
+                       "/OP1_TYPE/",
+                       "/OP2_TYPE/",
+                       "/GET_OP1_ZVAL_PTR\(([^)]*)\)/",
+                       "/GET_OP2_ZVAL_PTR\(([^)]*)\)/",
+                       "/GET_OP1_ZVAL_PTR_PTR\(([^)]*)\)/",
+                       "/GET_OP2_ZVAL_PTR_PTR\(([^)]*)\)/",
+                       "/GET_OP1_OBJ_ZVAL_PTR\(([^)]*)\)/",
+                       "/GET_OP2_OBJ_ZVAL_PTR\(([^)]*)\)/",
+                       "/GET_OP1_OBJ_ZVAL_PTR_PTR\(([^)]*)\)/",
+                       "/GET_OP2_OBJ_ZVAL_PTR_PTR\(([^)]*)\)/",
+                       "/IS_OP1_TMP_FREE\(\)/",
+                       "/IS_OP2_TMP_FREE\(\)/",
+                       "/FREE_OP1\(\)/",
+                       "/FREE_OP2\(\)/",
+                       "/FREE_OP1_IF_VAR\(\)/",
+                       "/FREE_OP2_IF_VAR\(\)/",
+                       "/FREE_OP1_VAR_PTR\(\)/",
+                       "/FREE_OP2_VAR_PTR\(\)/",
+                       "/^#ifdef\s+ZEND_VM_SPEC\s*\n/m",
+                       "/^#ifndef\s+ZEND_VM_SPEC\s*\n/m",
+                       "/ZEND_VM_C_LABEL\(\s*([A-Za-z_]*)\s*\)/m",
+                       "/ZEND_VM_C_GOTO\(\s*([A-Za-z_]*)\s*\)/m",
+               ),
+               array(
+                       $op1_type[$op1],
+                       $op2_type[$op2],
+                       $op1_get_zval_ptr[$op1],
+                       $op2_get_zval_ptr[$op2],
+                       $op1_get_zval_ptr_ptr[$op1],
+                       $op2_get_zval_ptr_ptr[$op2],
+                       $op1_get_obj_zval_ptr[$op1],
+                       $op2_get_obj_zval_ptr[$op2],
+                       $op1_get_obj_zval_ptr_ptr[$op1],
+                       $op2_get_obj_zval_ptr_ptr[$op2],
+                       $op1_is_tmp_free[$op1],
+                       $op2_is_tmp_free[$op2],
+                       $op1_free_op[$op1],
+                       $op2_free_op[$op2],
+                       $op1_free_op_if_var[$op1],
+                       $op2_free_op_if_var[$op2],
+                       $op1_free_op_var_ptr[$op1],
+                       $op2_free_op_var_ptr[$op2],
+                       ($op1!="ANY"||$op2!="ANY")?"#if 1\n":"#if 0\n",
+                       ($op1!="ANY"||$op2!="ANY")?"#if 0\n":"#if 1\n",
+                       "\\1".(($spec && $kind != ZEND_VM_KIND_CALL)?("_SPEC".$prefix[$op1].$prefix[$op2]):""),
+                       "goto \\1".(($spec && $kind != ZEND_VM_KIND_CALL)?("_SPEC".$prefix[$op1].$prefix[$op2]):""),
+               ),
+               $code);
+
+       // Updating code according to selected threading model
+       switch($kind) {
+               case ZEND_VM_KIND_CALL:
+                       $code = preg_replace(
+                               array(
+                                       "/EXECUTE_DATA/m",
+                                       "/ZEND_VM_DISPATCH_TO_HANDLER\(\s*([A-Z_]*)\s*\)/m",
+                                       "/ZEND_VM_DISPATCH_TO_HELPER\(\s*([A-Za-z_]*)\s*\)/me",
+                                       "/ZEND_VM_DISPATCH_TO_HELPER_EX\(\s*([A-Za-z_]*)\s*,\s*[A-Za-z_]*\s*,\s*(.*)\s*\);/me",
+                               ),
+                               array(
+                                       "execute_data",
+                                       "return \\1".($spec?"_SPEC":"").$prefix[$op1].$prefix[$op2]."_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU)",
+                                       "'return '.helper_name('\\1',$spec,'$op1','$op2').'(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU)'",
+                                       "'return '.helper_name('\\1',$spec,'$op1','$op2').'(\\2, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);'",
+                               ),
+                               $code);
+                       break;
+               case ZEND_VM_KIND_SWITCH:
+                       $code = preg_replace(
+                               array(
+                                       "/EXECUTE_DATA/m",
+                                       "/ZEND_VM_DISPATCH_TO_HANDLER\(\s*([A-Z_]*)\s*\)/m",
+                                       "/ZEND_VM_DISPATCH_TO_HELPER\(\s*([A-Za-z_]*)\s*\)/me",
+                                       "/ZEND_VM_DISPATCH_TO_HELPER_EX\(\s*([A-Za-z_]*)\s*,\s*([A-Za-z_]*)\s*,\s*(.*)\s*\);/me",
+                               ),
+                               array(
+                                       "&execute_data",
+                                       "goto \\1".($spec?"_SPEC":"").$prefix[$op1].$prefix[$op2]."_LABEL",
+                                       "'goto '.helper_name('\\1',$spec,'$op1','$op2')",
+                                       "'\\2 = \\3; goto '.helper_name('\\1',$spec,'$op1','$op2').';'",
+                               ),
+                               $code);
+                       break;
+               case ZEND_VM_KIND_GOTO:
+                       $code = preg_replace(
+                               array(
+                                       "/EXECUTE_DATA/m",
+                                       "/ZEND_VM_DISPATCH_TO_HANDLER\(\s*([A-Z_]*)\s*\)/m",
+                                       "/ZEND_VM_DISPATCH_TO_HELPER\(\s*([A-Za-z_]*)\s*\)/me",
+                                       "/ZEND_VM_DISPATCH_TO_HELPER_EX\(\s*([A-Za-z_]*)\s*,\s*([A-Za-z_]*)\s*,\s*(.*)\s*\);/me",
+                               ),
+                               array(
+                                       "&execute_data",
+                                       "goto \\1".($spec?"_SPEC":"").$prefix[$op1].$prefix[$op2]."_HANDLER",
+                                       "'goto '.helper_name('\\1',$spec,'$op1','$op2')",
+                                       "'\\2 = \\3; goto '.helper_name('\\1',$spec,'$op1','$op2').';'",
+                               ),
+                               $code);
+                       break;
+       }
+
+       out($f, $code);
 }
 
 // Generates opcode handler
 function gen_handler($f, $spec, $kind, $name, $op1, $op2, $use, $code, $lineno) {
-  global $definition_file, $prefix, $typecode, $opnames;
-
-  if (ZEND_VM_LINES) {
-    out($f, "#line $lineno \"$definition_file\"\n");
-  }
-
-  // Generate opcode handler's entry point according to selected threading model
-  switch($kind) {
-    case ZEND_VM_KIND_CALL:
-      out($f,"static int ".$name.($spec?"_SPEC":"").$prefix[$op1].$prefix[$op2]."_HANDLER(ZEND_OPCODE_HANDLER_ARGS)\n");
-      break;
-    case ZEND_VM_KIND_SWITCH:
-      if ($spec) {
-        out($f,"case ".((string)($opnames[$name]*25+($typecode[$op1]*5)+$typecode[$op2])).": /*".$name."_SPEC".$prefix[$op1].$prefix[$op2]."_HANDLER*/");
-      } else {
-        out($f,"case ".$name.":");
-      }
-      if ($use) {
-        // This handler is used by other handlers. We will add label to call it.
-        out($f," ".$name.($spec?"_SPEC":"").$prefix[$op1].$prefix[$op2]."_LABEL:\n");
-      } else {
-        out($f,"\n");
-      }
-      break;
-    case ZEND_VM_KIND_GOTO:
-      out($f,$name.($spec?"_SPEC":"").$prefix[$op1].$prefix[$op2]."_HANDLER:\n");
-      break;
-  }
-
-  // Generate opcode handler's code
-  gen_code($f, $spec, $kind, $code, $op1, $op2);
+       global $definition_file, $prefix, $typecode, $opnames;
+
+       if (ZEND_VM_LINES) {
+               out($f, "#line $lineno \"$definition_file\"\n");
+       }
+
+       // Generate opcode handler's entry point according to selected threading model
+       switch($kind) {
+               case ZEND_VM_KIND_CALL:
+                       out($f,"static int ".$name.($spec?"_SPEC":"").$prefix[$op1].$prefix[$op2]."_HANDLER(ZEND_OPCODE_HANDLER_ARGS)\n");
+                       break;
+               case ZEND_VM_KIND_SWITCH:
+                       if ($spec) {
+                               out($f,"case ".((string)($opnames[$name]*25+($typecode[$op1]*5)+$typecode[$op2])).": /*".$name."_SPEC".$prefix[$op1].$prefix[$op2]."_HANDLER*/");
+                       } else {
+                               out($f,"case ".$name.":");
+                       }
+                       if ($use) {
+                               // This handler is used by other handlers. We will add label to call it.
+                               out($f," ".$name.($spec?"_SPEC":"").$prefix[$op1].$prefix[$op2]."_LABEL:\n");
+                       } else {
+                               out($f,"\n");
+                       }
+                       break;
+               case ZEND_VM_KIND_GOTO:
+                       out($f,$name.($spec?"_SPEC":"").$prefix[$op1].$prefix[$op2]."_HANDLER:\n");
+                       break;
+       }
+
+       // Generate opcode handler's code
+       gen_code($f, $spec, $kind, $code, $op1, $op2);
 }
 
 // Generates helper
 function gen_helper($f, $spec, $kind, $name, $op1, $op2, $param, $code, $lineno) {
-  global $definition_file, $prefix;
-
-  if (ZEND_VM_LINES) {
-    out($f, "#line $lineno \"$definition_file\"\n");
-  }
-
-  // Generate helper's entry point according to selected threading model
-  switch($kind) {
-    case ZEND_VM_KIND_CALL:
-      if ($param == null) {
-        out($f, "static int ".$name.($spec?"_SPEC":"").$prefix[$op1].$prefix[$op2]."(ZEND_OPCODE_HANDLER_ARGS)\n");
-      } else {
-        out($f, "static int ".$name.($spec?"_SPEC":"").$prefix[$op1].$prefix[$op2]."(".$param.", ZEND_OPCODE_HANDLER_ARGS)\n");
-      }
-      break;
-    case ZEND_VM_KIND_SWITCH:
-      out($f, $name.($spec?"_SPEC":"").$prefix[$op1].$prefix[$op2].":\n");
-      break;
-    case ZEND_VM_KIND_GOTO:
-      out($f, $name.($spec?"_SPEC":"").$prefix[$op1].$prefix[$op2].":\n");
-      break;
-  }
-
-  // Generate helper's code
-  gen_code($f, $spec, $kind, $code, $op1, $op2);
+       global $definition_file, $prefix;
+
+       if (ZEND_VM_LINES) {
+               out($f, "#line $lineno \"$definition_file\"\n");
+       }
+
+       // Generate helper's entry point according to selected threading model
+       switch($kind) {
+               case ZEND_VM_KIND_CALL:
+                       if ($param == null) {
+                         // Helper without parameters
+                               out($f, "static int ".$name.($spec?"_SPEC":"").$prefix[$op1].$prefix[$op2]."(ZEND_OPCODE_HANDLER_ARGS)\n");
+                       } else {
+                         // Helper with parameter
+                               out($f, "static int ".$name.($spec?"_SPEC":"").$prefix[$op1].$prefix[$op2]."(".$param.", ZEND_OPCODE_HANDLER_ARGS)\n");
+                       }
+                       break;
+               case ZEND_VM_KIND_SWITCH:
+                       out($f, $name.($spec?"_SPEC":"").$prefix[$op1].$prefix[$op2].":\n");
+                       break;
+               case ZEND_VM_KIND_GOTO:
+                       out($f, $name.($spec?"_SPEC":"").$prefix[$op1].$prefix[$op2].":\n");
+                       break;
+       }
+
+       // Generate helper's code
+       gen_code($f, $spec, $kind, $code, $op1, $op2);
 }
 
 // Generates array of opcode handlers (specialized or unspecialized)
 function gen_labels($f, $spec, $kind, $prolog) {
-  global $opcodes, $op_types, $prefix, $typecode;
-
-  $next = 0;
-  if ($spec) {
-    foreach($opcodes as $num => $dsc) {
-      while ($next != $num) {
-        $op1t = $op_types;
-        foreach($op1t as $op1) {
-          if ($op1 != "ANY") {
-            $op2t = $op_types;
-            foreach($op2t as $op2) {
-              if ($op2 != "ANY") {              
-                switch ($kind) {
-                  case ZEND_VM_KIND_CALL:
-                    out($f,$prolog."ZEND_NULL_HANDLER,\n");
-                    break;
-                  case ZEND_VM_KIND_SWITCH:
-                    out($f,$prolog."(opcode_handler_t)-1,\n");
-                    break;
-                  case ZEND_VM_KIND_GOTO:
-                    out($f,$prolog."(opcode_handler_t)&&ZEND_NULL_HANDLER,\n");
-                    break;
-                }
-              }
-            }
-          }
-        }
-        $next++;
-      }
-      $next = $num + 1;
-      $op1t = $op_types;
-      foreach($op1t as $op1) {
-        if ($op1 != "ANY") {
-          if (!isset($dsc["op1"][$op1])) {
-            $op1 = "ANY";
-          }
-          $op2t = $op_types;
-          foreach($op2t as $op2) {
-            if ($op2 != "ANY") {              
-              if (!isset($dsc["op2"][$op2])) {
-                $op2 = "ANY";
-              }
-              if (isset($dsc["op1"][$op1]) &&
-                  isset($dsc["op2"][$op2])) {
-                switch ($kind) {
-                  case ZEND_VM_KIND_CALL:
-                    out($f,$prolog.$dsc["op"]."_SPEC".$prefix[$op1].$prefix[$op2]."_HANDLER,\n");
-                    break;
-                  case ZEND_VM_KIND_SWITCH:
-                    out($f,$prolog."(opcode_handler_t)".((string)($num*25+$typecode[$op1]*5+$typecode[$op2])).",\n");
-                    break;
-                  case ZEND_VM_KIND_GOTO:
-                    out($f,$prolog."(opcode_handler_t)&&".$dsc["op"]."_SPEC".$prefix[$op1].$prefix[$op2]."_HANDLER,\n");
-                    break;
-                }
-              } else {
-                switch ($kind) {
-                  case ZEND_VM_KIND_CALL:
-                    out($f,$prolog."ZEND_NULL_HANDLER,\n");
-                    break;
-                  case ZEND_VM_KIND_SWITCH:
-                    out($f,$prolog."(opcode_handler_t)-1,\n");
-                    break;
-                  case ZEND_VM_KIND_GOTO:
-                    out($f,$prolog."(opcode_handler_t)&&ZEND_NULL_HANDLER,\n");
-                    break;
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  } else {
-    foreach($opcodes as $num => $dsc) {
-      while ($next != $num) {
-        switch ($kind) {
-          case ZEND_VM_KIND_CALL:
-            out($f,$prolog."ZEND_NULL_HANDLER,\n");
-            break;
-          case ZEND_VM_KIND_SWITCH:
-            out($f,$prolog."(opcode_handler_t)-1,\n");
-            break;
-          case ZEND_VM_KIND_GOTO:
-            out($f,$prolog."(opcode_handler_t)&&ZEND_NULL_HANDLER,\n");
-            break;
-        }
-        $next++;
-      }
-      $next = $num+1;
-      switch ($kind) {
-        case ZEND_VM_KIND_CALL:
-          out($f,$prolog.$dsc["op"]."_HANDLER,\n");
-          break;
-        case ZEND_VM_KIND_SWITCH:
-          out($f,$prolog."(opcode_handler_t)".((string)$num).",\n");
-          break;
-        case ZEND_VM_KIND_GOTO:
-          out($f,$prolog."(opcode_handler_t)&&".$dsc["op"]."_HANDLER,\n");
-          break;
-      }
-    }
-  }
-
-  // Last handler
-  switch ($kind) {
-    case ZEND_VM_KIND_CALL:
-      out($f,$prolog."ZEND_NULL_HANDLER\n");
-      break;
-    case ZEND_VM_KIND_SWITCH:
-      out($f,$prolog."(opcode_handler_t)-1\n");
-      break;
-    case ZEND_VM_KIND_GOTO:
-      out($f,$prolog."(opcode_handler_t)&&ZEND_NULL_HANDLER\n");
-      break;
-  }
+       global $opcodes, $op_types, $prefix, $typecode;
+
+       $next = 0;
+       if ($spec) {
+         // Emit labels for specialized executor
+
+         // For each opcode in opcode number order
+               foreach($opcodes as $num => $dsc) {
+                       while ($next != $num) {
+                         // If some opcode numbers are not used then fill hole with pointers
+                         // to handler of undefined opcode
+                               $op1t = $op_types;
+                               // For each op1.op_type except ANY
+                               foreach($op1t as $op1) {
+                                       if ($op1 != "ANY") {
+                                               $op2t = $op_types;
+                                               // For each op2.op_type except ANY
+                                               foreach($op2t as $op2) {
+                                                       if ($op2 != "ANY") {
+                                                         // Emit pointer to handler of undefined opcode
+                                                               switch ($kind) {
+                                                                       case ZEND_VM_KIND_CALL:
+                                                                               out($f,$prolog."ZEND_NULL_HANDLER,\n");
+                                                                               break;
+                                                                       case ZEND_VM_KIND_SWITCH:
+                                                                               out($f,$prolog."(opcode_handler_t)-1,\n");
+                                                                               break;
+                                                                       case ZEND_VM_KIND_GOTO:
+                                                                               out($f,$prolog."(opcode_handler_t)&&ZEND_NULL_HANDLER,\n");
+                                                                               break;
+                                                               }
+                                                       }
+                                               }
+                                       }
+                               }
+                               $next++;
+                       }
+                       $next = $num + 1;
+                       $op1t = $op_types;
+                       // For each op1.op_type except ANY
+                       foreach($op1t as $op1) {
+                               if ($op1 != "ANY") {
+                                       if (!isset($dsc["op1"][$op1])) {
+                                               // Try to use unspecialized handler
+                                               $op1 = "ANY";
+                                       }
+                                       $op2t = $op_types;
+                                       // For each op2.op_type except ANY
+                                       foreach($op2t as $op2) {
+                                               if ($op2 != "ANY") {
+                                                       if (!isset($dsc["op2"][$op2])) {
+                                                               // Try to use unspecialized handler
+                                                               $op2 = "ANY";
+                                                       }
+                                                       // Check if specialized handler is defined 
+                                                       if (isset($dsc["op1"][$op1]) &&
+                                                           isset($dsc["op2"][$op2])) {
+                                                         // Emit pointer to specialized handler
+                                                               switch ($kind) {
+                                                                       case ZEND_VM_KIND_CALL:
+                                                                               out($f,$prolog.$dsc["op"]."_SPEC".$prefix[$op1].$prefix[$op2]."_HANDLER,\n");
+                                                                               break;
+                                                                       case ZEND_VM_KIND_SWITCH:
+                                                                               out($f,$prolog."(opcode_handler_t)".((string)($num*25+$typecode[$op1]*5+$typecode[$op2])).",\n");
+                                                                               break;
+                                                                       case ZEND_VM_KIND_GOTO:
+                                                                               out($f,$prolog."(opcode_handler_t)&&".$dsc["op"]."_SPEC".$prefix[$op1].$prefix[$op2]."_HANDLER,\n");
+                                                                               break;
+                                                               }
+                                                       } else {
+                                                         // Emit pinter to handler of undefined opcode
+                                                               switch ($kind) {
+                                                                       case ZEND_VM_KIND_CALL:
+                                                                               out($f,$prolog."ZEND_NULL_HANDLER,\n");
+                                                                               break;
+                                                                       case ZEND_VM_KIND_SWITCH:
+                                                                               out($f,$prolog."(opcode_handler_t)-1,\n");
+                                                                               break;
+                                                                       case ZEND_VM_KIND_GOTO:
+                                                                               out($f,$prolog."(opcode_handler_t)&&ZEND_NULL_HANDLER,\n");
+                                                                               break;
+                                                               }
+                                                       }
+                                               }
+                                       }
+                               }
+                       }
+               }
+       } else {
+         // Emit labels for unspecialized executor
+
+         // For each opcode in opcode number order
+               foreach($opcodes as $num => $dsc) {
+                       while ($next != $num) {
+                         // If some opcode numbers are not used then fill hole with pointers
+                         // to handler of undefined opcode
+                               switch ($kind) {
+                                       case ZEND_VM_KIND_CALL:
+                                               out($f,$prolog."ZEND_NULL_HANDLER,\n");
+                                               break;
+                                       case ZEND_VM_KIND_SWITCH:
+                                               out($f,$prolog."(opcode_handler_t)-1,\n");
+                                               break;
+                                       case ZEND_VM_KIND_GOTO:
+                                               out($f,$prolog."(opcode_handler_t)&&ZEND_NULL_HANDLER,\n");
+                                               break;
+                               }
+                               $next++;
+                       }
+                       $next = $num+1;
+                 // Emit pointer to unspecialized handler
+                       switch ($kind) {
+                               case ZEND_VM_KIND_CALL:
+                                       out($f,$prolog.$dsc["op"]."_HANDLER,\n");
+                                       break;
+                               case ZEND_VM_KIND_SWITCH:
+                                       out($f,$prolog."(opcode_handler_t)".((string)$num).",\n");
+                                       break;
+                               case ZEND_VM_KIND_GOTO:
+                                       out($f,$prolog."(opcode_handler_t)&&".$dsc["op"]."_HANDLER,\n");
+                                       break;
+                       }
+               }
+       }
+
+       // Emit last handler's label (undefined opcode)
+       switch ($kind) {
+               case ZEND_VM_KIND_CALL:
+                       out($f,$prolog."ZEND_NULL_HANDLER\n");
+                       break;
+               case ZEND_VM_KIND_SWITCH:
+                       out($f,$prolog."(opcode_handler_t)-1\n");
+                       break;
+               case ZEND_VM_KIND_GOTO:
+                       out($f,$prolog."(opcode_handler_t)&&ZEND_NULL_HANDLER\n");
+                       break;
+       }
 }
 
 // Generates handler for undefined opcodes (CALL threading model)
 function gen_null_handler($f) {
-  static $done = 0;
-
-  if (!$done) {
-    $done = 1;
-    out($f,"static int ZEND_NULL_HANDLER(ZEND_OPCODE_HANDLER_ARGS)\n");
-    out($f,"{\n");
-    out($f,"\tzend_error_noreturn(E_ERROR, \"Invalid opcode %d/%d/%d.\", EX(opline)->opcode, EX(opline)->op1.op_type, EX(opline)->op2.op_type);\n");
-    out($f,"\tZEND_VM_RETURN_FROM_EXECUTE_LOOP();\n");
-    out($f,"}\n\n");
-  }
+       static $done = 0;
+
+       // New and all executors with CALL threading model can use the same handler 
+       // for undefined opcodes, do we emit code for it only once
+       if (!$done) {
+               $done = 1;
+               out($f,"static int ZEND_NULL_HANDLER(ZEND_OPCODE_HANDLER_ARGS)\n");
+               out($f,"{\n");
+               out($f,"\tzend_error_noreturn(E_ERROR, \"Invalid opcode %d/%d/%d.\", EX(opline)->opcode, EX(opline)->op1.op_type, EX(opline)->op2.op_type);\n");
+               out($f,"\tZEND_VM_RETURN_FROM_EXECUTE_LOOP();\n");
+               out($f,"}\n\n");
+       }
 }
 
 // Generates all opcode handlers and helpers (specialized or unspecilaized)
 function gen_executor_code($f, $spec, $kind, $prolog) {
-  global $list, $opcodes, $helpers, $op_types;
-
-  if ($spec) {
-    $op1t = $op_types;
-    foreach($op1t as $op1) {
-      $op2t = $op_types;
-      foreach($op2t as $op2) {
-        foreach ($list as $lineno => $dsc) {
-          if (isset($dsc["handler"])) {
-            $num = $dsc["handler"];
-            if (isset($opcodes[$num]["op1"][$op1]) &&
-                isset($opcodes[$num]["op2"][$op2])) {
-              gen_handler($f, 1, $kind, $opcodes[$num]["op"], $op1, $op2, isset($opcodes[$num]["use"]), $opcodes[$num]["code"], $lineno);
-            }
-          } else if (isset($dsc["helper"])) {
-            $num = $dsc["helper"];
-            if (isset($helpers[$num]["op1"][$op1]) &&
-                isset($helpers[$num]["op2"][$op2])) {
-              gen_helper($f, 1, $kind, $num, $op1, $op2, $helpers[$num]["param"], $helpers[$num]["code"], $lineno);
-            }
-          } else {
-            var_dump($dsc);
-            die("??? $kind:$num\n");
-          }
-        }
-      }
-    }
-  } else {
-    foreach ($list as $lineno => $dsc) {
-      if (isset($dsc["handler"])) {
-        $num = $dsc["handler"];
-        gen_handler($f, 0, $kind, $opcodes[$num]["op"], "ANY", "ANY", isset($opcodes[$num]["use"]), $opcodes[$num]["code"], $lineno);
-      } else if (isset($dsc["helper"])) {
-        $num = $dsc["helper"];
-        gen_helper($f, 0, $kind, $num, "ANY", "ANY", $helpers[$num]["param"], $helpers[$num]["code"], $lineno);
-      } else {
-        var_dump($dsc);
-        die("??? $kind:$num\n");
-      }
-    }
-  }
-  if (ZEND_VM_LINES) {
-    out_line($f);
-  }
-
-  // Generate handler for undefined opcodes
-  switch ($kind) {
-    case ZEND_VM_KIND_CALL:
-      gen_null_handler($f);
-      break;
-    case ZEND_VM_KIND_SWITCH:
-      out($f,"default:\n");
-      out($f,"\tzend_error_noreturn(E_ERROR, \"Invalid opcode %d/%d/%d.\", EX(opline)->opcode, EX(opline)->op1.op_type, EX(opline)->op2.op_type);\n");
-      out($f,"\tZEND_VM_RETURN_FROM_EXECUTE_LOOP();\n");
-      break;
-    case ZEND_VM_KIND_GOTO:
-      out($f,"ZEND_NULL_HANDLER:\n");
-      out($f,"\tzend_error_noreturn(E_ERROR, \"Invalid opcode %d/%d/%d.\", EX(opline)->opcode, EX(opline)->op1.op_type, EX(opline)->op2.op_type);\n");
-      out($f,"\tZEND_VM_RETURN_FROM_EXECUTE_LOOP();\n");
-      break;
-  }
+       global $list, $opcodes, $helpers, $op_types;
+
+       if ($spec) {
+               // Produce specialized executor
+               $op1t = $op_types;
+               // for each op1.op_type 
+               foreach($op1t as $op1) {
+                       $op2t = $op_types;
+                       // for each op2.op_type 
+                       foreach($op2t as $op2) {
+                               // for each handlers in helpers in original order
+                               foreach ($list as $lineno => $dsc) {
+                                       if (isset($dsc["handler"])) {
+                                               $num = $dsc["handler"];
+                                               // Check if handler accepts such types of operands (op1 and op2)
+                                               if (isset($opcodes[$num]["op1"][$op1]) &&
+                                                   isset($opcodes[$num]["op2"][$op2])) {
+                                                 // Generate handler code
+                                                       gen_handler($f, 1, $kind, $opcodes[$num]["op"], $op1, $op2, isset($opcodes[$num]["use"]), $opcodes[$num]["code"], $lineno);
+                                               }
+                                       } else if (isset($dsc["helper"])) {
+                                               $num = $dsc["helper"];
+                                               // Check if handler accepts such types of operands (op1 and op2)
+                                               if (isset($helpers[$num]["op1"][$op1]) &&
+                                                   isset($helpers[$num]["op2"][$op2])) {
+                                                 // Generate helper code
+                                                       gen_helper($f, 1, $kind, $num, $op1, $op2, $helpers[$num]["param"], $helpers[$num]["code"], $lineno);
+                                               }
+                                       } else {
+                                               var_dump($dsc);
+                                               die("??? $kind:$num\n");
+                                       }
+                               }
+                       }
+               }
+       } else {
+               // Produce unspecialized executor
+
+               // for each handlers in helpers in original order
+               foreach ($list as $lineno => $dsc) {
+                       if (isset($dsc["handler"])) {
+                               $num = $dsc["handler"];
+                         // Generate handler code
+                               gen_handler($f, 0, $kind, $opcodes[$num]["op"], "ANY", "ANY", isset($opcodes[$num]["use"]), $opcodes[$num]["code"], $lineno);
+                       } else if (isset($dsc["helper"])) {
+                               $num = $dsc["helper"];
+                         // Generate helper code
+                               gen_helper($f, 0, $kind, $num, "ANY", "ANY", $helpers[$num]["param"], $helpers[$num]["code"], $lineno);
+                       } else {
+                               var_dump($dsc);
+                               die("??? $kind:$num\n");
+                       }
+               }
+       }
+
+       if (ZEND_VM_LINES) {
+               // Reset #line directives
+               out_line($f);
+       }
+
+       // Generate handler for undefined opcodes
+       switch ($kind) {
+               case ZEND_VM_KIND_CALL:
+                       gen_null_handler($f);
+                       break;
+               case ZEND_VM_KIND_SWITCH:
+                       out($f,"default:\n");
+                       out($f,"\tzend_error_noreturn(E_ERROR, \"Invalid opcode %d/%d/%d.\", EX(opline)->opcode, EX(opline)->op1.op_type, EX(opline)->op2.op_type);\n");
+                       out($f,"\tZEND_VM_RETURN_FROM_EXECUTE_LOOP();\n");
+                       break;
+               case ZEND_VM_KIND_GOTO:
+                       out($f,"ZEND_NULL_HANDLER:\n");
+                       out($f,"\tzend_error_noreturn(E_ERROR, \"Invalid opcode %d/%d/%d.\", EX(opline)->opcode, EX(opline)->op1.op_type, EX(opline)->op2.op_type);\n");
+                       out($f,"\tZEND_VM_RETURN_FROM_EXECUTE_LOOP();\n");
+                       break;
+       }
 }
 
 function skip_blanks($f, $prolog, $epilog) {
-  if (trim($prolog) != "" || trim($epilog) != "") {
-    out($f, $prolog.$epilog);
-  }
+       if (trim($prolog) != "" || trim($epilog) != "") {
+               out($f, $prolog.$epilog);
+       }
 }
 
 // Generates executor from skeleton file and definition (specialized or unspecialized)
 function gen_executor($f, $skl, $spec, $kind, $executor_name, $initializer_name, $old) {
-  global $params, $skeleton_file, $line_no;
-
-  $lineno      = 0;
-//  $old_line_no = -1;
-  foreach ($skl as $line) {
-//    if (ZEND_VM_LINES) {
-//      ++$lineno;
-//      if ($old_line_no+1 != $line_no) {
-//        out($f,"#line $lineno \"$skeleton_file\" /* $old_line_no, $line_no*/\n");
-//      }
-//      $old_line_no = $line_no;
-//    }
-    if (preg_match("/(.*)[{][%]([A-Z_]*)[%][}](.*)/", $line, $m)) {
-      switch ($m[2]) {
-        case "DEFINES":
-          switch ($kind) {
-            case ZEND_VM_KIND_CALL:
-              out($f,"\n");
-              out($f,"#define ZEND_VM_CONTINUE() return 0\n");
-              out($f,"#define ZEND_VM_RETURN()   return 1\n");
-              break;
-            case ZEND_VM_KIND_SWITCH:
-              out($f,"\n");
-              out($f,"#define ZEND_VM_CONTINUE() goto zend_vm_continue\n");
-              out($f,"#define ZEND_VM_RETURN()   return\n");
-              break;
-            case ZEND_VM_KIND_GOTO:
-              out($f,"\n");
-              out($f,"#define ZEND_VM_CONTINUE() goto *(void**)(EX(opline)->handler)\n");
-              out($f,"#define ZEND_VM_RETURN()   return\n");
-              break;
-          }
-          break;
-        case "EXECUTOR_NAME":
-          out($f, $m[1].$executor_name.$m[3]."\n");
-          break;
-        case "HELPER_VARS":
-          if ($kind != ZEND_VM_KIND_CALL) {
-            foreach ($params as $param => $x) {
-              out($f,$m[1].$param.";\n");
-            }
-          } else {
-            skip_blanks($f, $m[1], $m[3]."\n");
-          }
-          break;
-        case "INTERANL_LABELS":
-          if ($kind == ZEND_VM_KIND_GOTO) {
-            $prolog = $m[1];
-            out($f,$prolog."if (op_array == NULL) {\n");
-            out($f,$prolog."\tstatic const opcode_handler_t labels[] = {\n");
-            gen_labels($f, $spec, $kind, $prolog."\t\t");
-            out($f,$prolog."\t};\n");
-            out($f,$prolog."\tzend_opcode_handlers = (opcode_handler_t*)labels;\n");
-            out($f,$prolog."\treturn;\n");
-            out($f,$prolog."}\n");
-          } else {
-            skip_blanks($f, $m[1], $m[3]);
-          }
-          break;
-        case "ZEND_VM_CONTINUE_LABEL":
-          if ($kind == ZEND_VM_KIND_SWITCH) {
-            out($f,$m[1]."zend_vm_continue:".$m[3]."\n");
-          } else {
-            skip_blanks($f, $m[1], $m[3]);
-          }
-          break;
-        case "ZEND_VM_DISPATCH":
-          switch ($kind) {
-            case ZEND_VM_KIND_CALL:
-              out($f, $m[1]."if (EX(opline)->handler(&execute_data TSRMLS_CC) > 0)".$m[3]."\n");
-              break;
-            case ZEND_VM_KIND_SWITCH:
-              out($f, $m[1]."switch ((int)EX(opline)->handler)".$m[3]."\n");
-              break;
-            case ZEND_VM_KIND_GOTO:
-              out($f, $m[1]."goto *(void**)(EX(opline)->handler);".$m[3]."\n");
-              break;
-          }
-          break;
-        case "INTERNAL_EXECUTOR":
-          if ($kind == ZEND_VM_KIND_CALL) {
-            out($f, $m[1]."return;".$m[3]."\n");
-          } else {
-            gen_executor_code($f, $spec, $kind, $m[1]);
-          }
-          break;
-        case "EXTERNAL_EXECUTOR":
-          if ($kind == ZEND_VM_KIND_CALL) {
-            if (!$old || ZEND_VM_SPEC || (ZEND_VM_KIND != ZEND_VM_KIND_CALL)) {
-              out($f,"#undef EX\n");
-              out($f,"#define EX(element) execute_data->element\n\n");
-              gen_executor_code($f, $spec, $kind, $m[1]);
-            }
-          }
-          break;
-        case "INITIALIZER_NAME":
-          out($f, $m[1].$initializer_name.$m[3]."\n");
-          break;
-        case "EXTERNAL_LABELS":
-          $prolog = $m[1];
-          if ($kind == ZEND_VM_KIND_GOTO) {
-            out($f,$prolog."TSRMLS_FETCH();\n");
-            out($f,$prolog."zend_execute(NULL TSRMLS_CC);\n");
-          } else {
-            if ($old) {
-              out($f,$prolog."static opcode_handler_t labels[512] = {\n");
-            } else {
-              out($f,$prolog."static const opcode_handler_t labels[] = {\n");
-            }
-            gen_labels($f, $spec, $kind, $prolog."\t");
-            out($f,$prolog."};\n");
-            out($f,$prolog."zend_opcode_handlers = (opcode_handler_t*)labels;\n");
-            if ($old) {
-              out($f,$prolog."zend_vm_old_executor = 1;\n");
-              out($f,$prolog."zend_execute = old_execute;\n");
-            }
-          }
-          break;
-        default:
-          die("ERROR: Unknown keyword ".$m[2]." in skeleton file.\n");
-      }
-    } else {
-      out($f, $line);
-    }
-  }  
+       global $params, $skeleton_file, $line_no;
+
+       $lineno      = 0;
+       foreach ($skl as $line) {
+         // Skeleton file contains special markers in form %NAME% those are
+         // substituted by custom code
+               if (preg_match("/(.*)[{][%]([A-Z_]*)[%][}](.*)/", $line, $m)) {
+                       switch ($m[2]) {
+                               case "DEFINES":
+                                       switch ($kind) {
+                                               case ZEND_VM_KIND_CALL:
+                                                       out($f,"\n");
+                                                       out($f,"#define ZEND_VM_CONTINUE() return 0\n");
+                                                       out($f,"#define ZEND_VM_RETURN()   return 1\n");
+                                                       break;
+                                               case ZEND_VM_KIND_SWITCH:
+                                                       out($f,"\n");
+                                                       out($f,"#define ZEND_VM_CONTINUE() goto zend_vm_continue\n");
+                                                       out($f,"#define ZEND_VM_RETURN()   return\n");
+                                                       break;
+                                               case ZEND_VM_KIND_GOTO:
+                                                       out($f,"\n");
+                                                       out($f,"#define ZEND_VM_CONTINUE() goto *(void**)(EX(opline)->handler)\n");
+                                                       out($f,"#define ZEND_VM_RETURN()   return\n");
+                                                       break;
+                                       }
+                                       break;
+                               case "EXECUTOR_NAME":
+                                       out($f, $m[1].$executor_name.$m[3]."\n");
+                                       break;
+                               case "HELPER_VARS":
+                                       if ($kind != ZEND_VM_KIND_CALL) {
+                                         // Emit local variables those are used for helpers' parameters
+                                               foreach ($params as $param => $x) {
+                                                       out($f,$m[1].$param.";\n");
+                                               }
+                                       } else {
+                                               skip_blanks($f, $m[1], $m[3]."\n");
+                                       }
+                                       break;
+                               case "INTERANL_LABELS":
+                                       if ($kind == ZEND_VM_KIND_GOTO) {
+                                         // Emit array of labels of opcode handlers and code for
+                                         // zend_opcode_handlers initialization
+                                               $prolog = $m[1];
+                                               out($f,$prolog."if (op_array == NULL) {\n");
+                                               out($f,$prolog."\tstatic const opcode_handler_t labels[] = {\n");
+                                               gen_labels($f, $spec, $kind, $prolog."\t\t");
+                                               out($f,$prolog."\t};\n");
+                                               out($f,$prolog."\tzend_opcode_handlers = (opcode_handler_t*)labels;\n");
+                                               out($f,$prolog."\treturn;\n");
+                                               out($f,$prolog."}\n");
+                                       } else {
+                                               skip_blanks($f, $m[1], $m[3]);
+                                       }
+                                       break;
+                               case "ZEND_VM_CONTINUE_LABEL":
+                                       if ($kind == ZEND_VM_KIND_SWITCH) {
+                                         // Only SWITCH dispatch method use it
+                                               out($f,$m[1]."zend_vm_continue:".$m[3]."\n");
+                                       } else {
+                                               skip_blanks($f, $m[1], $m[3]);
+                                       }
+                                       break;
+                               case "ZEND_VM_DISPATCH":
+                                 // Emit code that dispatches to opcode handler
+                                       switch ($kind) {
+                                               case ZEND_VM_KIND_CALL:
+                                                       out($f, $m[1]."if (EX(opline)->handler(&execute_data TSRMLS_CC) > 0)".$m[3]."\n");
+                                                       break;
+                                               case ZEND_VM_KIND_SWITCH:
+                                                       out($f, $m[1]."switch ((int)EX(opline)->handler)".$m[3]."\n");
+                                                       break;
+                                               case ZEND_VM_KIND_GOTO:
+                                                       out($f, $m[1]."goto *(void**)(EX(opline)->handler);".$m[3]."\n");
+                                                       break;
+                                       }
+                                       break;
+                               case "INTERNAL_EXECUTOR":
+                                       if ($kind == ZEND_VM_KIND_CALL) {
+                                         // Executor is defined as a set of functions
+                                               out($f, $m[1]."return;".$m[3]."\n");
+                                       } else {
+                                         // Emit executor code
+                                               gen_executor_code($f, $spec, $kind, $m[1]);
+                                       }
+                                       break;
+                               case "EXTERNAL_EXECUTOR":
+                                       if ($kind == ZEND_VM_KIND_CALL) {
+                                         // Unspecialized executor with CALL threading is the same as the
+                                         // old one, so we don't need to produce code twitch
+                                               if (!$old || ZEND_VM_SPEC || (ZEND_VM_KIND != ZEND_VM_KIND_CALL)) {
+                                                       out($f,"#undef EX\n");
+                                                       out($f,"#define EX(element) execute_data->element\n\n");
+                                                 // Emit executor code
+                                                       gen_executor_code($f, $spec, $kind, $m[1]);
+                                               }
+                                       }
+                                       break;
+                               case "INITIALIZER_NAME":
+                                       out($f, $m[1].$initializer_name.$m[3]."\n");
+                                       break;
+                               case "EXTERNAL_LABELS":
+                                 // Emit code that initializes zend_opcode_handlers array
+                                       $prolog = $m[1];
+                                       if ($kind == ZEND_VM_KIND_GOTO) {
+                                         // Labels are defined in the executor itself, so we call it
+                                         // with op_array NULL and it sets zend_opcode_handlers array
+                                               out($f,$prolog."TSRMLS_FETCH();\n");
+                                               out($f,$prolog."zend_execute(NULL TSRMLS_CC);\n");
+                                       } else {
+                                               if ($old) {
+                                                 // Reserving space for user-defined opcodes
+                                                       out($f,$prolog."static opcode_handler_t labels[512] = {\n");
+                                               } else {
+                                                       out($f,$prolog."static const opcode_handler_t labels[] = {\n");
+                                               }
+                                               gen_labels($f, $spec, $kind, $prolog."\t");
+                                               out($f,$prolog."};\n");
+                                               out($f,$prolog."zend_opcode_handlers = (opcode_handler_t*)labels;\n");
+                                               if ($old) {
+                                                 // Setup old executor
+                                                       out($f,$prolog."zend_vm_old_executor = 1;\n");
+                                                       out($f,$prolog."zend_execute = old_execute;\n");
+                                               }
+                                       }
+                                       break;
+                               default:
+                                       die("ERROR: Unknown keyword ".$m[2]." in skeleton file.\n");
+                       }
+               } else {
+                 // Copy the line as is
+                       out($f, $line);
+               }
+       }
 }
 
 function gen_vm($def, $skel) {
-  global $definition_file, $skeleton_file, $executor_file,
-    $op_types, $list, $opcodes, $helpers, $params, $opnames;
-
-  // Load definition file
-  $in = @file($def);
-  if (!$in) {
-    die("ERROR: Can not open definition file '$def'\n");
-  }
-  $definition_file = realpath($def);
-
-  // Load skeleton file
-  $skl = @file($skel);
-  if (!$skl) {
-    die("ERROR: Can not open skeleton file '$skel'\n");
-  }
-  $skeleton_file = realpath($skel);
-
-  // Parse definition file into tree
-  $lineno         = 0;
-  $handler        = null;
-  $helper         = null;
-  $max_opcode_len = 0;
-  $max_opcode     = 0;
-  foreach ($in as $line) {
-    ++$lineno;
-    if (strpos($line,"ZEND_VM_HANDLER(") === 0) {
-      if (preg_match(
-        "/^ZEND_VM_HANDLER\(\s*([0-9]+)\s*,\s*([A-Z_]+)\s*,\s*([A-Z|]+)\s*,\s*([A-Z|]+)\s*\)/",
-        $line,
-        $m) == 0) {
-        die("ERROR ($def:$lineno): Invalid ZEND_VM_HANDLER definition.\n");
-      }
-      $code = (int)$m[1];
-      $op   = $m[2];
-      $len  = strlen($op);
-      $op1  = array_flip(explode("|",$m[3]));
-      $op2  = array_flip(explode("|",$m[4]));
-
-      if ($len > $max_opcode_len) {
-        $max_opcode_len = $len;
-      }
-      if ($code > $max_opcode) {
-        $max_opcode = $code;
-      }
-      if (isset($opcodes[$code])) {
-        die("ERROR ($def:$lineno): Opcode with code '$code' is already defined.\n");
-      }
-      if (isset($opnames[$op])) {
-        die("ERROR ($def:$lineno): Opcode with name '$op' is already defined.\n");
-      }
-      $opcodes[$code] = array("op"=>$op,"op1"=>$op1,"op2"=>$op2,"code"=>"");
-      $opnames[$op] = $code;
-      $handler = $code;
-      $helper = null;
-      $list[$lineno] = array("handler"=>$handler);
-    } else if (strpos($line,"ZEND_VM_HELPER(") === 0) {
-      if (preg_match(
-        "/^ZEND_VM_HELPER\(\s*([A-Za-z_]+)\s*,\s*([A-Z|]+)\s*,\s*([A-Z|]+)\s*\)/",
-        $line,
-        $m) == 0) {
-        die("ERROR ($def:$lineno): Invalid ZEND_VM_HELPER definition.\n");
-      }
-      $helper = $m[1];
-      $op1    = array_flip(explode("|",$m[2]));
-      $op2    = array_flip(explode("|",$m[3]));
-      if (isset($helpers[$helper])) {
-        die("ERROR ($def:$lineno): Helper with name '$helper' is already defined.\n");
-      }
-      $helpers[$helper] = array("op1"=>$op1,"op2"=>$op2,"param"=>null,"code"=>"");
-      $handler = null;
-      $list[$lineno] = array("helper"=>$helper);
-    } else if (strpos($line,"ZEND_VM_HELPER_EX(") === 0) {
-      if (preg_match(
-        "/^ZEND_VM_HELPER_EX\(\s*([A-Za-z_]+)\s*,\s*([A-Z|]+)\s*,\s*([A-Z|]+)\s*,\s*(.*)\s*\)/",
-        $line,
-        $m) == 0) {
-        die("ERROR ($def:$lineno): Invalid ZEND_VM_HELPER definition.\n");
-      }
-      $helper = $m[1];
-      $op1    = array_flip(explode("|",$m[2]));
-      $op2    = array_flip(explode("|",$m[3]));
-      $param  = $m[4];
-      if (isset($helpers[$helper])) {
-        die("ERROR ($def:$lineno): Helper with name '$helper' is already defined.\n");
-      }
-      $params[$param] = 1;
-
-      $helpers[$helper] = array("op1"=>$op1,"op2"=>$op2,"param"=>$param,"code"=>"");
-      $handler = null;
-      $list[$lineno] = array("helper"=>$helper);
-    } else if ($handler !== null) {
-      $opcodes[$handler]["code"] .= $line;
-    } else if ($helper !== null) {
-      $helpers[$helper]["code"] .= $line;
-    }
-  }
-
-  ksort($opcodes);
-
-  // Search for opcode handlers those are used by other opcode handlers
-  foreach ($opcodes as $dsc) {
-    if (preg_match("/ZEND_VM_DISPATCH_TO_HANDLER\(\s*([A-Z_]*)\s*\)/m", $dsc["code"], $m)) {
-      $op = $m[1];
-      if (!isset($opnames[$op])) {
-        die("ERROR ($def:$lineno): Opcode with name '$op' is not defined.\n");
-      }
-      $code = $opnames[$op];
-      $opcodes[$code]['use'] = 1;
-    }
-  }
-
-  // Generate opcode #defines (zend_vm_opcodes.h)
-  $code_len = strlen((string)$max_opcode);
-  $f = fopen("zend_vm_opcodes.h", "w+") or die("ERROR: Cannot create zend_vm_opcodes.h\n");
-  ksort($opcodes);
-  foreach ($opcodes as $code => $dsc) {
-    $code = str_pad((string)$code,$code_len," ",STR_PAD_LEFT);
-    $op = str_pad($dsc["op"],$max_opcode_len);
-    fputs($f,"#define $op $code\n");
-  }
-  fclose($f);
-  echo "zend_vm_opcodes.h generated succesfull.\n";
-
-  // Generate zend_vm_execute.h
-  $f = fopen("zend_vm_execute.h", "w+") or die("ERROR: Cannot create zend_vm_execute.h\n");
-  $executor_file = realpath("zend_vm_execute.h");
-  
-  // Generate specialized executor
-  gen_executor($f, $skl, ZEND_VM_SPEC, ZEND_VM_KIND, "execute", "zend_init_opcodes_handlers", 0);
-
-  // Generate un-specialized executor
-  if (ZEND_VM_OLD_EXECUTOR) {
-    out($f,"\n/* Old executor */\n\n");
-    out($f,"#undef EX\n");
-    out($f,"#define EX(element) execute_data.element\n\n");
-    out($f,"#undef ZEND_VM_CONTINUE\n\n");
-    out($f,"#undef ZEND_VM_RETURN\n\n");
-    gen_executor($f, $skl, 0, ZEND_VM_KIND_CALL, "old_execute", "zend_vm_use_old_executor", 1);
-  }
-
-  // Generate zend_vm_set_opcode_handler() function
-  out($f, "void zend_vm_set_opcode_handler(zend_op* op)\n");
-  out($f, "{\n");
-  if (!ZEND_VM_SPEC) {
-    out($f, "\top->handler = zend_opcode_handlers[op->opcode];\n");
-  } else {
-    if (ZEND_VM_OLD_EXECUTOR) {
-      out($f, "\tif (zend_vm_old_executor) {\n");
-      out($f, "\t\top->handler = zend_opcode_handlers[op->opcode];\n");
-      out($f, "\t} else {\n");
-    }
-    out($f, "\t\tstatic const int zend_vm_decode[] = {\n");
-    out($f, "\t\t\t_UNUSED_CODE, /* 0              */\n");
-    out($f, "\t\t\t_CONST_CODE,  /* 1 = IS_CONST   */\n");
-    out($f, "\t\t\t_TMP_CODE,    /* 2 = IS_TMP_VAR */\n");
-    out($f, "\t\t\t_UNUSED_CODE, /* 3              */\n");
-    out($f, "\t\t\t_VAR_CODE,    /* 4 = IS_VAR     */\n");
-    out($f, "\t\t\t_UNUSED_CODE, /* 5              */\n");
-    out($f, "\t\t\t_UNUSED_CODE, /* 6              */\n");
-    out($f, "\t\t\t_UNUSED_CODE, /* 7              */\n");
-    out($f, "\t\t\t_UNUSED_CODE, /* 8 = IS_UNUSED  */\n");
-    out($f, "\t\t\t_UNUSED_CODE, /* 9              */\n");
-    out($f, "\t\t\t_UNUSED_CODE, /* 10             */\n");
-    out($f, "\t\t\t_UNUSED_CODE, /* 11             */\n");
-    out($f, "\t\t\t_UNUSED_CODE, /* 12             */\n");
-    out($f, "\t\t\t_UNUSED_CODE, /* 13             */\n");
-    out($f, "\t\t\t_UNUSED_CODE, /* 14             */\n");
-    out($f, "\t\t\t_UNUSED_CODE, /* 15             */\n");
-    out($f, "\t\t\t_CV_CODE      /* 16 = IS_CV     */\n");
-    out($f, "\t\t};\n");
-    out($f, "\t\top->handler = zend_opcode_handlers[op->opcode * 25 + zend_vm_decode[op->op1.op_type] * 5 + zend_vm_decode[op->op2.op_type]];\n");
-    if (ZEND_VM_OLD_EXECUTOR) {
-      out($f, "\t}\n");
-    }
-  }
-  out($f, "}\n\n");
-
-  fclose($f);
-  echo "zend_vm_execute.h generated succesfull.\n";
+       global $definition_file, $skeleton_file, $executor_file,
+               $op_types, $list, $opcodes, $helpers, $params, $opnames;
+
+       // Load definition file
+       $in = @file($def);
+       if (!$in) {
+               die("ERROR: Can not open definition file '$def'\n");
+       }
+       // We need absolute path to definition file to use it in #line directives
+       $definition_file = realpath($def);
+
+       // Load skeleton file
+       $skl = @file($skel);
+       if (!$skl) {
+               die("ERROR: Can not open skeleton file '$skel'\n");
+       }
+       // We need absolute path to skeleton file to use it in #line directives
+       $skeleton_file = realpath($skel);
+
+       // Parse definition file into tree
+       $lineno         = 0;
+       $handler        = null;
+       $helper         = null;
+       $max_opcode_len = 0;
+       $max_opcode     = 0;
+       foreach ($in as $line) {
+               ++$lineno;
+               if (strpos($line,"ZEND_VM_HANDLER(") === 0) {
+                 // Parsing opcode handler's definition
+                       if (preg_match(
+                                       "/^ZEND_VM_HANDLER\(\s*([0-9]+)\s*,\s*([A-Z_]+)\s*,\s*([A-Z|]+)\s*,\s*([A-Z|]+)\s*\)/",
+                                       $line,
+                                       $m) == 0) {
+                               die("ERROR ($def:$lineno): Invalid ZEND_VM_HANDLER definition.\n");
+                       }
+                       $code = (int)$m[1];
+                       $op   = $m[2];
+                       $len  = strlen($op);
+                       $op1  = array_flip(explode("|",$m[3]));
+                       $op2  = array_flip(explode("|",$m[4]));
+
+                       if ($len > $max_opcode_len) {
+                               $max_opcode_len = $len;
+                       }
+                       if ($code > $max_opcode) {
+                               $max_opcode = $code;
+                       }
+                       if (isset($opcodes[$code])) {
+                               die("ERROR ($def:$lineno): Opcode with code '$code' is already defined.\n");
+                       }
+                       if (isset($opnames[$op])) {
+                               die("ERROR ($def:$lineno): Opcode with name '$op' is already defined.\n");
+                       }
+                       $opcodes[$code] = array("op"=>$op,"op1"=>$op1,"op2"=>$op2,"code"=>"");
+                       $opnames[$op] = $code;
+                       $handler = $code;
+                       $helper = null;
+                       $list[$lineno] = array("handler"=>$handler);
+               } else if (strpos($line,"ZEND_VM_HELPER(") === 0) {
+                 // Parsing helper's definition
+                       if (preg_match(
+                                       "/^ZEND_VM_HELPER\(\s*([A-Za-z_]+)\s*,\s*([A-Z|]+)\s*,\s*([A-Z|]+)\s*\)/",
+                                       $line,
+                                       $m) == 0) {
+                               die("ERROR ($def:$lineno): Invalid ZEND_VM_HELPER definition.\n");
+                       }
+                       $helper = $m[1];
+                       $op1    = array_flip(explode("|",$m[2]));
+                       $op2    = array_flip(explode("|",$m[3]));
+                       if (isset($helpers[$helper])) {
+                               die("ERROR ($def:$lineno): Helper with name '$helper' is already defined.\n");
+                       }
+                       $helpers[$helper] = array("op1"=>$op1,"op2"=>$op2,"param"=>null,"code"=>"");
+                       $handler = null;
+                       $list[$lineno] = array("helper"=>$helper);
+               } else if (strpos($line,"ZEND_VM_HELPER_EX(") === 0) {
+                 // Parsing helper with parameter definition
+                       if (preg_match(
+                                       "/^ZEND_VM_HELPER_EX\(\s*([A-Za-z_]+)\s*,\s*([A-Z|]+)\s*,\s*([A-Z|]+)\s*,\s*(.*)\s*\)/",
+                                       $line,
+                                       $m) == 0) {
+                               die("ERROR ($def:$lineno): Invalid ZEND_VM_HELPER definition.\n");
+                       }
+                       $helper = $m[1];
+                       $op1    = array_flip(explode("|",$m[2]));
+                       $op2    = array_flip(explode("|",$m[3]));
+                       $param  = $m[4];
+                       if (isset($helpers[$helper])) {
+                               die("ERROR ($def:$lineno): Helper with name '$helper' is already defined.\n");
+                       }
+
+                       // Store parameter
+                       $params[$param] = 1;
+
+                       $helpers[$helper] = array("op1"=>$op1,"op2"=>$op2,"param"=>$param,"code"=>"");
+                       $handler = null;
+                       $list[$lineno] = array("helper"=>$helper);
+               } else if ($handler !== null) {
+                 // Add line of code to current opcode handler
+                       $opcodes[$handler]["code"] .= $line;
+               } else if ($helper !== null) {
+                 // Add line of code to current helper
+                       $helpers[$helper]["code"] .= $line;
+               }
+       }
+
+       ksort($opcodes);
+
+       // Search for opcode handlers those are used by other opcode handlers
+       foreach ($opcodes as $dsc) {
+               if (preg_match("/ZEND_VM_DISPATCH_TO_HANDLER\(\s*([A-Z_]*)\s*\)/m", $dsc["code"], $m)) {
+                       $op = $m[1];
+                       if (!isset($opnames[$op])) {
+                               die("ERROR ($def:$lineno): Opcode with name '$op' is not defined.\n");
+                       }
+                       $code = $opnames[$op];
+                       $opcodes[$code]['use'] = 1;
+               }
+       }
+
+       // Generate opcode #defines (zend_vm_opcodes.h)
+       $code_len = strlen((string)$max_opcode);
+       $f = fopen("zend_vm_opcodes.h", "w+") or die("ERROR: Cannot create zend_vm_opcodes.h\n");
+       foreach ($opcodes as $code => $dsc) {
+               $code = str_pad((string)$code,$code_len," ",STR_PAD_LEFT);
+               $op = str_pad($dsc["op"],$max_opcode_len);
+               fputs($f,"#define $op $code\n");
+       }
+       fclose($f);
+       echo "zend_vm_opcodes.h generated succesfull.\n";
+
+       // Generate zend_vm_execute.h
+       $f = fopen("zend_vm_execute.h", "w+") or die("ERROR: Cannot create zend_vm_execute.h\n");
+       $executor_file = realpath("zend_vm_execute.h");
+
+       // Generate specialized executor
+       gen_executor($f, $skl, ZEND_VM_SPEC, ZEND_VM_KIND, "execute", "zend_init_opcodes_handlers", 0);
+
+       // Generate un-specialized executor
+       if (ZEND_VM_OLD_EXECUTOR) {
+               out($f,"\n/* Old executor */\n\n");
+               out($f,"#undef EX\n");
+               out($f,"#define EX(element) execute_data.element\n\n");
+               out($f,"#undef ZEND_VM_CONTINUE\n\n");
+               out($f,"#undef ZEND_VM_RETURN\n\n");
+               gen_executor($f, $skl, 0, ZEND_VM_KIND_CALL, "old_execute", "zend_vm_use_old_executor", 1);
+       }
+
+       // Generate zend_vm_set_opcode_handler() function
+       out($f, "void zend_vm_set_opcode_handler(zend_op* op)\n");
+       out($f, "{\n");
+       if (!ZEND_VM_SPEC) {
+               out($f, "\top->handler = zend_opcode_handlers[op->opcode];\n");
+       } else {
+               if (ZEND_VM_OLD_EXECUTOR) {
+                       out($f, "\tif (zend_vm_old_executor) {\n");
+                       out($f, "\t\top->handler = zend_opcode_handlers[op->opcode];\n");
+                       out($f, "\t} else {\n");
+               }
+               out($f, "\t\tstatic const int zend_vm_decode[] = {\n");
+               out($f, "\t\t\t_UNUSED_CODE, /* 0              */\n");
+               out($f, "\t\t\t_CONST_CODE,  /* 1 = IS_CONST   */\n");
+               out($f, "\t\t\t_TMP_CODE,    /* 2 = IS_TMP_VAR */\n");
+               out($f, "\t\t\t_UNUSED_CODE, /* 3              */\n");
+               out($f, "\t\t\t_VAR_CODE,    /* 4 = IS_VAR     */\n");
+               out($f, "\t\t\t_UNUSED_CODE, /* 5              */\n");
+               out($f, "\t\t\t_UNUSED_CODE, /* 6              */\n");
+               out($f, "\t\t\t_UNUSED_CODE, /* 7              */\n");
+               out($f, "\t\t\t_UNUSED_CODE, /* 8 = IS_UNUSED  */\n");
+               out($f, "\t\t\t_UNUSED_CODE, /* 9              */\n");
+               out($f, "\t\t\t_UNUSED_CODE, /* 10             */\n");
+               out($f, "\t\t\t_UNUSED_CODE, /* 11             */\n");
+               out($f, "\t\t\t_UNUSED_CODE, /* 12             */\n");
+               out($f, "\t\t\t_UNUSED_CODE, /* 13             */\n");
+               out($f, "\t\t\t_UNUSED_CODE, /* 14             */\n");
+               out($f, "\t\t\t_UNUSED_CODE, /* 15             */\n");
+               out($f, "\t\t\t_CV_CODE      /* 16 = IS_CV     */\n");
+               out($f, "\t\t};\n");
+               out($f, "\t\top->handler = zend_opcode_handlers[op->opcode * 25 + zend_vm_decode[op->op1.op_type] * 5 + zend_vm_decode[op->op2.op_type]];\n");
+               if (ZEND_VM_OLD_EXECUTOR) {
+                       out($f, "\t}\n");
+               }
+       }
+       out($f, "}\n\n");
+
+       fclose($f);
+       echo "zend_vm_execute.h generated succesfull.\n";
 }
 
 function usage() {
-  echo("\nUsage: php zend_vm_gen.php [options]\n".
-       "\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  --without-lines                 - disable #line directives".
-       "\n\n");
-
+       echo("\nUsage: php zend_vm_gen.php [options]\n".
+            "\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  --without-lines                 - disable #line directives".
+            "\n\n");
 }
 
 // Parse arguments
-for ($i = 1;  $i < $argc; $i++) {  
-  if (strpos($argv[$i],"--with-vm-kind=") === 0) {
-    $kind = substr($argv[$i], strlen("--with-vm-kind="));
-    switch ($kind) {
-      case "CALL":
-        define("ZEND_VM_KIND", ZEND_VM_KIND_CALL);
-        break;
-      case "SWITCH":
-        define("ZEND_VM_KIND", ZEND_VM_KIND_SWITCH);
-        break;
-      case "GOTO":
-        define("ZEND_VM_KIND", ZEND_VM_KIND_GOTO);
-        break;
-      default:
-        echo("ERROR: Invalid vm kind '$kind'\n");
-        usage();
-        die();
-    }
-  } else if ($argv[$i] == "--without-specializer") {
-    define("ZEND_VM_SPEC", 0);
-  } else if ($argv[$i] == "--without-old-executor") {
-    define("ZEND_VM_OLD_EXECUTOR", 0);
-  } else if ($argv[$i] == "--without-lines") {
-    define("ZEND_VM_LINES", 0);
-  } else if ($argv[$i] == "--help") {
-    usage();
-    exit();
-  } else {
-    echo("ERROR: Invalid option '".$argv[$i]."'\n");
-    usage();
-    die();
-  }
+for ($i = 1;  $i < $argc; $i++) {
+       if (strpos($argv[$i],"--with-vm-kind=") === 0) {
+               $kind = substr($argv[$i], strlen("--with-vm-kind="));
+               switch ($kind) {
+                       case "CALL":
+                               define("ZEND_VM_KIND", ZEND_VM_KIND_CALL);
+                               break;
+                       case "SWITCH":
+                               define("ZEND_VM_KIND", ZEND_VM_KIND_SWITCH);
+                               break;
+                       case "GOTO":
+                               define("ZEND_VM_KIND", ZEND_VM_KIND_GOTO);
+                               break;
+                       default:
+                               echo("ERROR: Invalid vm kind '$kind'\n");
+                               usage();
+                               die();
+               }
+       } else if ($argv[$i] == "--without-specializer") {
+         // Disabling specialization
+               define("ZEND_VM_SPEC", 0);
+       } else if ($argv[$i] == "--without-old-executor") {
+         // Disabling code for old-style executor
+               define("ZEND_VM_OLD_EXECUTOR", 0);
+       } else if ($argv[$i] == "--without-lines") {
+               // Disabling debuging using original zend_vm_def.h
+               define("ZEND_VM_LINES", 0);
+       } else if ($argv[$i] == "--help") {
+               usage();
+               exit();
+       } else {
+               echo("ERROR: Invalid option '".$argv[$i]."'\n");
+               usage();
+               die();
+       }
 }
 
 // Using defaults
 if (!defined("ZEND_VM_KIND")) {
-  define("ZEND_VM_KIND", ZEND_VM_KIND_CALL);
+  // Using CALL threading by default
+       define("ZEND_VM_KIND", ZEND_VM_KIND_CALL);
 }
 if (!defined("ZEND_VM_SPEC")) {
-  define("ZEND_VM_SPEC", 1);
+  // Using specialized executor by default
+       define("ZEND_VM_SPEC", 1);
 }
 if (!defined("ZEND_VM_OLD_EXECUTOR")) {
-  define("ZEND_VM_OLD_EXECUTOR", 1);
+  // Include old-style executor by default
+       define("ZEND_VM_OLD_EXECUTOR", 1);
 }
 if (!defined("ZEND_VM_LINES")) {
-  define("ZEND_VM_LINES", 1);
+  // Using #line directives to debug with original zend_vm_def.h by default
+       define("ZEND_VM_LINES", 1);
 }
 
 gen_vm("zend_vm_def.h", "zend_vm_execute.skl");