]> granicus.if.org Git - php/commitdiff
Eliminate another TSRMLS_FETCH() in i_zend_is_true()
authorKalle Sommer Nielsen <kalle@php.net>
Wed, 18 Dec 2013 06:25:05 +0000 (07:25 +0100)
committerKalle Sommer Nielsen <kalle@php.net>
Wed, 18 Dec 2013 06:25:05 +0000 (07:25 +0100)
# Affected extensions have all been updated, ext/opcache and ext/zip
# both have macros for cross version compatibility

21 files changed:
Zend/zend_ast.c
Zend/zend_execute.h
Zend/zend_execute_API.c
Zend/zend_interfaces.c
Zend/zend_object_handlers.c
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
ext/dom/php_dom.c
ext/opcache/Optimizer/block_pass.c
ext/opcache/Optimizer/pass2.c
ext/openssl/xp_ssl.c
ext/soap/php_encoding.c
ext/spl/spl_array.c
ext/spl/spl_directory.c
ext/spl/spl_fixedarray.c
ext/spl/spl_iterators.c
ext/standard/array.c
ext/standard/http_fopen_wrapper.c
ext/standard/type.c
ext/zip/php_zip.c
main/streams/userspace.c

index 66330d597b665dfe166bde524ed3f2f1d781fe3e..7a15762a105e6f3acfd2f7d497af16b0175e3cfc 100644 (file)
@@ -231,9 +231,9 @@ ZEND_API void zend_ast_evaluate(zval *result, zend_ast *ast, zend_class_entry *s
                        break;
                case ZEND_BOOL_AND:
                        zend_ast_evaluate(&op1, (&ast->u.child)[0], scope TSRMLS_CC);
-                       if (zend_is_true(&op1)) {
+                       if (zend_is_true(&op1 TSRMLS_CC)) {
                                zend_ast_evaluate(&op2, (&ast->u.child)[1], scope TSRMLS_CC);
-                               ZVAL_BOOL(result, zend_is_true(&op2));
+                               ZVAL_BOOL(result, zend_is_true(&op2 TSRMLS_CC));
                                zval_dtor(&op2);
                        } else {
                                ZVAL_BOOL(result, 0);
@@ -242,18 +242,18 @@ ZEND_API void zend_ast_evaluate(zval *result, zend_ast *ast, zend_class_entry *s
                        break;
                case ZEND_BOOL_OR:
                        zend_ast_evaluate(&op1, (&ast->u.child)[0], scope TSRMLS_CC);
-                       if (zend_is_true(&op1)) {
+                       if (zend_is_true(&op1 TSRMLS_CC)) {
                                ZVAL_BOOL(result, 1);
                        } else {
                                zend_ast_evaluate(&op2, (&ast->u.child)[1], scope TSRMLS_CC);
-                               ZVAL_BOOL(result, zend_is_true(&op2));
+                               ZVAL_BOOL(result, zend_is_true(&op2 TSRMLS_CC));
                                zval_dtor(&op2);
                        }
                        zval_dtor(&op1);
                        break;
                case ZEND_SELECT:
                        zend_ast_evaluate(&op1, (&ast->u.child)[0], scope TSRMLS_CC);
-                       if (zend_is_true(&op1)) {
+                       if (zend_is_true(&op1 TSRMLS_CC)) {
                                if (!(&ast->u.child)[1]) {
                                        *result = op1;
                                } else {
index ca619dbf509d7010ae6463261ddf18ee79507c97..4802f0a19dde075c4c401a5b00203c58be35f0d3 100644 (file)
@@ -60,7 +60,7 @@ ZEND_API zend_execute_data *zend_create_execute_data_from_op_array(zend_op_array
 ZEND_API void zend_execute(zend_op_array *op_array TSRMLS_DC);
 ZEND_API void execute_ex(zend_execute_data *execute_data TSRMLS_DC);
 ZEND_API void execute_internal(zend_execute_data *execute_data_ptr, struct _zend_fcall_info *fci, int return_value_used TSRMLS_DC);
-ZEND_API int zend_is_true(zval *op);
+ZEND_API int zend_is_true(zval *op TSRMLS_DC);
 ZEND_API int zend_lookup_class(const char *name, int name_length, zend_class_entry ***ce TSRMLS_DC);
 ZEND_API int zend_lookup_class_ex(const char *name, int name_length, const zend_literal *key, int use_autoload, zend_class_entry ***ce TSRMLS_DC);
 ZEND_API int zend_eval_string(char *str, zval *retval_ptr, char *string_name TSRMLS_DC);
@@ -101,7 +101,7 @@ static zend_always_inline void i_zval_ptr_dtor_nogc(zval *zval_ptr ZEND_FILE_LIN
        }
 }
 
-static zend_always_inline int i_zend_is_true(zval *op)
+static zend_always_inline int i_zend_is_true(zval *op TSRMLS_DC)
 {
        int result;
 
@@ -130,8 +130,6 @@ static zend_always_inline int i_zend_is_true(zval *op)
                        break;
                case IS_OBJECT:
                        if(IS_ZEND_STD_OBJECT(*op)) {
-                               TSRMLS_FETCH();
-
                                if (Z_OBJ_HT_P(op)->cast_object) {
                                        zval tmp;
                                        if (Z_OBJ_HT_P(op)->cast_object(op, &tmp, IS_BOOL TSRMLS_CC) == SUCCESS) {
index 82689ed7d61969ff64c8a87a148f7e96d6d03a99..9c57300c84205a31ee17becfd71ceb597bcf764c 100644 (file)
@@ -443,9 +443,9 @@ ZEND_API void _zval_internal_ptr_dtor(zval **zval_ptr ZEND_FILE_LINE_DC) /* {{{
 }
 /* }}} */
 
-ZEND_API int zend_is_true(zval *op) /* {{{ */
+ZEND_API int zend_is_true(zval *op TSRMLS_DC) /* {{{ */
 {
-       return i_zend_is_true(op);
+       return i_zend_is_true(op TSRMLS_CC);
 }
 /* }}} */
 
index 16751549b46c2478ea54d1a698acc52c753beac5..b2c7eb7dd6aa7f88f7b20280d9345c90fe6ca0b4 100644 (file)
@@ -162,7 +162,7 @@ ZEND_API int zend_user_it_valid(zend_object_iterator *_iter TSRMLS_DC)
 
                zend_call_method_with_0_params(&object, iter->ce, &iter->ce->iterator_funcs.zf_valid, "valid", &more);
                if (more) {
-                       result = i_zend_is_true(more);
+                       result = i_zend_is_true(more TSRMLS_CC);
                        zval_ptr_dtor(&more);
                        return result ? SUCCESS : FAILURE;
                }
index 438df1642683edd0a4a085c4bd1ac1c1cd029311..b3afe1e4f70e64d3187a482a1a1461af4dfc6a41 100644 (file)
@@ -189,7 +189,7 @@ static int zend_std_call_setter(zval *object, zval *member, zval *value TSRMLS_D
        zval_ptr_dtor(&value);
 
        if (retval) {
-               result = i_zend_is_true(retval) ? SUCCESS : FAILURE;
+               result = i_zend_is_true(retval TSRMLS_CC) ? SUCCESS : FAILURE;
                zval_ptr_dtor(&retval);
                return result;
        } else {
@@ -694,12 +694,12 @@ static int zend_std_has_dimension(zval *object, zval *offset, int check_empty TS
                SEPARATE_ARG_IF_REF(offset);
                zend_call_method_with_1_params(&object, ce, NULL, "offsetexists", &retval, offset);
                if (EXPECTED(retval != NULL)) {
-                       result = i_zend_is_true(retval);
+                       result = i_zend_is_true(retval TSRMLS_CC);
                        zval_ptr_dtor(&retval);
                        if (check_empty && result && EXPECTED(!EG(exception))) {
                                zend_call_method_with_1_params(&object, ce, NULL, "offsetget", &retval, offset);
                                if (retval) {
-                                       result = i_zend_is_true(retval);
+                                       result = i_zend_is_true(retval TSRMLS_CC);
                                        zval_ptr_dtor(&retval);
                                }
                        }
@@ -1447,7 +1447,7 @@ static int zend_std_has_property(zval *object, zval *member, int has_set_exists,
                        guard->in_isset = 1; /* prevent circular getting */
                        rv = zend_std_call_issetter(object, member TSRMLS_CC);
                        if (rv) {
-                               result = zend_is_true(rv);
+                               result = zend_is_true(rv TSRMLS_CC);
                                zval_ptr_dtor(&rv);
                                if (has_set_exists && result) {
                                        if (EXPECTED(!EG(exception)) && zobj->ce->__get && !guard->in_get) {
@@ -1456,7 +1456,7 @@ static int zend_std_has_property(zval *object, zval *member, int has_set_exists,
                                                guard->in_get = 0;
                                                if (rv) {
                                                        Z_ADDREF_P(rv);
-                                                       result = i_zend_is_true(rv);
+                                                       result = i_zend_is_true(rv TSRMLS_CC);
                                                        zval_ptr_dtor(&rv);
                                                } else {
                                                        result = 0;
@@ -1475,7 +1475,7 @@ static int zend_std_has_property(zval *object, zval *member, int has_set_exists,
                        result = (Z_TYPE_PP(value) != IS_NULL);
                        break;
                default:
-                       result = zend_is_true(*value);
+                       result = zend_is_true(*value TSRMLS_CC);
                        break;
                case 2:
                        result = 1;
index 5385f3eec99c82e5de99f03510381ada09cf7914..c0a3f37fcbeb80a7c421af720507cd449bafb4cf 100644 (file)
@@ -2101,7 +2101,7 @@ ZEND_VM_HANDLER(43, ZEND_JMPZ, CONST|TMP|VAR|CV, ANY)
        if (OP1_TYPE == IS_TMP_VAR && EXPECTED(Z_TYPE_P(val) == IS_BOOL)) {
                ret = Z_LVAL_P(val);
        } else {
-               ret = i_zend_is_true(val);
+               ret = i_zend_is_true(val TSRMLS_CC);
                FREE_OP1();
                if (UNEXPECTED(EG(exception) != NULL)) {
                        HANDLE_EXCEPTION();
@@ -2131,7 +2131,7 @@ ZEND_VM_HANDLER(44, ZEND_JMPNZ, CONST|TMP|VAR|CV, ANY)
        if (OP1_TYPE == IS_TMP_VAR && EXPECTED(Z_TYPE_P(val) == IS_BOOL)) {
                ret = Z_LVAL_P(val);
        } else {
-               ret = i_zend_is_true(val);
+               ret = i_zend_is_true(val TSRMLS_CC);
                FREE_OP1();
                if (UNEXPECTED(EG(exception) != NULL)) {
                        HANDLE_EXCEPTION();
@@ -2161,7 +2161,7 @@ ZEND_VM_HANDLER(45, ZEND_JMPZNZ, CONST|TMP|VAR|CV, ANY)
        if (OP1_TYPE == IS_TMP_VAR && EXPECTED(Z_TYPE_P(val) == IS_BOOL)) {
                retval = Z_LVAL_P(val);
        } else {
-               retval = i_zend_is_true(val);
+               retval = i_zend_is_true(val TSRMLS_CC);
                FREE_OP1();
                if (UNEXPECTED(EG(exception) != NULL)) {
                        HANDLE_EXCEPTION();
@@ -2195,7 +2195,7 @@ ZEND_VM_HANDLER(46, ZEND_JMPZ_EX, CONST|TMP|VAR|CV, ANY)
        if (OP1_TYPE == IS_TMP_VAR && EXPECTED(Z_TYPE_P(val) == IS_BOOL)) {
                retval = Z_LVAL_P(val);
        } else {
-               retval = i_zend_is_true(val);
+               retval = i_zend_is_true(val TSRMLS_CC);
                FREE_OP1();
                if (UNEXPECTED(EG(exception) != NULL)) {
                        HANDLE_EXCEPTION();
@@ -2226,7 +2226,7 @@ ZEND_VM_HANDLER(47, ZEND_JMPNZ_EX, CONST|TMP|VAR|CV, ANY)
        if (OP1_TYPE == IS_TMP_VAR && EXPECTED(Z_TYPE_P(val) == IS_BOOL)) {
                retval = Z_LVAL_P(val);
        } else {
-               retval = i_zend_is_true(val);
+               retval = i_zend_is_true(val TSRMLS_CC);
                FREE_OP1();
                if (UNEXPECTED(EG(exception) != NULL)) {
                        HANDLE_EXCEPTION();
@@ -3302,7 +3302,7 @@ ZEND_VM_HANDLER(52, ZEND_BOOL, CONST|TMP|VAR|CV, ANY)
 
        SAVE_OPLINE();
        /* PHP 3.0 returned "" for false and 1 for true, here we use 0 and 1 for now */
-       ZVAL_BOOL(retval, i_zend_is_true(GET_OP1_ZVAL_PTR(BP_VAR_R)));
+       ZVAL_BOOL(retval, i_zend_is_true(GET_OP1_ZVAL_PTR(BP_VAR_R) TSRMLS_CC));
        FREE_OP1();
 
        CHECK_EXCEPTION();
@@ -4464,7 +4464,7 @@ ZEND_VM_HANDLER(114, ZEND_ISSET_ISEMPTY_VAR, CONST|TMP|VAR|CV, UNUSED|CONST|VAR)
                        ZVAL_BOOL(&EX_T(opline->result.var).tmp_var, 0);
                }
        } else /* if (opline->extended_value & ZEND_ISEMPTY) */ {
-               if (!isset || !i_zend_is_true(*value)) {
+               if (!isset || !i_zend_is_true(*value TSRMLS_CC)) {
                        ZVAL_BOOL(&EX_T(opline->result.var).tmp_var, 1);
                } else {
                        ZVAL_BOOL(&EX_T(opline->result.var).tmp_var, 0);
@@ -4536,7 +4536,7 @@ ZEND_VM_C_LABEL(num_index_prop):
                                result = isset;
                        }
                } else /* if (opline->extended_value & ZEND_ISEMPTY) */ {
-                       if (!isset || !i_zend_is_true(*value)) {
+                       if (!isset || !i_zend_is_true(*value TSRMLS_CC)) {
                                result = 0;
                        } else {
                                result = 1;
@@ -4730,7 +4730,7 @@ ZEND_VM_HANDLER(152, ZEND_JMP_SET, CONST|TMP|VAR|CV, ANY)
        SAVE_OPLINE();
        value = GET_OP1_ZVAL_PTR(BP_VAR_R);
 
-       if (i_zend_is_true(value)) {
+       if (i_zend_is_true(value TSRMLS_CC)) {
                ZVAL_COPY_VALUE(&EX_T(opline->result.var).tmp_var, value);
                if (!IS_OP1_TMP_FREE()) {
                        zendi_zval_copy_ctor(EX_T(opline->result.var).tmp_var);
@@ -4756,7 +4756,7 @@ ZEND_VM_HANDLER(158, ZEND_JMP_SET_VAR, CONST|TMP|VAR|CV, ANY)
        SAVE_OPLINE();
        value = GET_OP1_ZVAL_PTR(BP_VAR_R);
 
-       if (i_zend_is_true(value)) {
+       if (i_zend_is_true(value TSRMLS_CC)) {
                if (OP1_TYPE == IS_VAR || OP1_TYPE == IS_CV) {
                        Z_ADDREF_P(value);
                        EX_T(opline->result.var).var.ptr = value;
index 02f8acb6beb154a6371cf6f639f5a71ac1223198..60ea3fd73336c7288c0d85220c7e71ae0ab6786f 100644 (file)
@@ -1108,7 +1108,7 @@ static int ZEND_FASTCALL  ZEND_HANDLE_EXCEPTION_SPEC_HANDLER(ZEND_OPCODE_HANDLER
        if (finally_op_num && (!catch_op_num || catch_op_num >= finally_op_num)) {
                if (EX(delayed_exception)) {
                        zend_exception_set_previous(EG(exception), EX(delayed_exception) TSRMLS_CC);
-               }
+               } 
                EX(delayed_exception) = EG(exception);
                EG(exception) = NULL;
                EX(fast_ret) = NULL;
@@ -1243,7 +1243,7 @@ static int ZEND_FASTCALL  ZEND_FETCH_CLASS_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLE
                CHECK_EXCEPTION();
                ZEND_VM_NEXT_OPCODE();
        } else {
-
+               
                zval *class_name = opline->op2.zv;
 
                if (IS_CONST == IS_CONST) {
@@ -1294,7 +1294,7 @@ static int ZEND_FASTCALL  ZEND_INIT_FCALL_BY_NAME_SPEC_CONST_HANDLER(ZEND_OPCODE
        } else {
                char *function_name_strval, *lcname;
                int function_name_strlen;
-
+               
 
                SAVE_OPLINE();
                function_name = opline->op2.zv;
@@ -1940,7 +1940,7 @@ static int ZEND_FASTCALL  ZEND_FETCH_CLASS_SPEC_UNUSED_HANDLER(ZEND_OPCODE_HANDL
                CHECK_EXCEPTION();
                ZEND_VM_NEXT_OPCODE();
        } else {
-
+               
                zval *class_name = NULL;
 
                if (IS_UNUSED == IS_CONST) {
@@ -1979,7 +1979,7 @@ static int ZEND_FASTCALL  ZEND_FETCH_CLASS_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_A
                CHECK_EXCEPTION();
                ZEND_VM_NEXT_OPCODE();
        } else {
-
+               
                zval *class_name = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op2.var TSRMLS_CC);
 
                if (IS_CV == IS_CONST) {
@@ -2030,7 +2030,7 @@ static int ZEND_FASTCALL  ZEND_INIT_FCALL_BY_NAME_SPEC_CV_HANDLER(ZEND_OPCODE_HA
        } else {
                char *function_name_strval, *lcname;
                int function_name_strlen;
-
+               
 
                SAVE_OPLINE();
                function_name = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op2.var TSRMLS_CC);
@@ -2155,7 +2155,7 @@ static int ZEND_FASTCALL  ZEND_INIT_FCALL_BY_NAME_SPEC_CV_HANDLER(ZEND_OPCODE_HA
 static int ZEND_FASTCALL  ZEND_BW_NOT_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
 
        SAVE_OPLINE();
        bitwise_not_function(&EX_T(opline->result.var).tmp_var,
@@ -2168,7 +2168,7 @@ static int ZEND_FASTCALL  ZEND_BW_NOT_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARG
 static int ZEND_FASTCALL  ZEND_BOOL_NOT_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
 
        SAVE_OPLINE();
        boolean_not_function(&EX_T(opline->result.var).tmp_var,
@@ -2181,7 +2181,7 @@ static int ZEND_FASTCALL  ZEND_BOOL_NOT_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_A
 static int ZEND_FASTCALL  ZEND_ECHO_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *z;
 
        SAVE_OPLINE();
@@ -2207,7 +2207,7 @@ static int ZEND_FASTCALL  ZEND_PRINT_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS
 static int ZEND_FASTCALL  ZEND_JMPZ_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *val;
        int ret;
 
@@ -2217,7 +2217,7 @@ static int ZEND_FASTCALL  ZEND_JMPZ_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        if (IS_CONST == IS_TMP_VAR && EXPECTED(Z_TYPE_P(val) == IS_BOOL)) {
                ret = Z_LVAL_P(val);
        } else {
-               ret = i_zend_is_true(val);
+               ret = i_zend_is_true(val TSRMLS_CC);
 
                if (UNEXPECTED(EG(exception) != NULL)) {
                        HANDLE_EXCEPTION();
@@ -2237,7 +2237,7 @@ static int ZEND_FASTCALL  ZEND_JMPZ_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_FASTCALL  ZEND_JMPNZ_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *val;
        int ret;
 
@@ -2247,7 +2247,7 @@ static int ZEND_FASTCALL  ZEND_JMPNZ_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS
        if (IS_CONST == IS_TMP_VAR && EXPECTED(Z_TYPE_P(val) == IS_BOOL)) {
                ret = Z_LVAL_P(val);
        } else {
-               ret = i_zend_is_true(val);
+               ret = i_zend_is_true(val TSRMLS_CC);
 
                if (UNEXPECTED(EG(exception) != NULL)) {
                        HANDLE_EXCEPTION();
@@ -2267,7 +2267,7 @@ static int ZEND_FASTCALL  ZEND_JMPNZ_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS
 static int ZEND_FASTCALL  ZEND_JMPZNZ_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *val;
        int retval;
 
@@ -2277,7 +2277,7 @@ static int ZEND_FASTCALL  ZEND_JMPZNZ_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARG
        if (IS_CONST == IS_TMP_VAR && EXPECTED(Z_TYPE_P(val) == IS_BOOL)) {
                retval = Z_LVAL_P(val);
        } else {
-               retval = i_zend_is_true(val);
+               retval = i_zend_is_true(val TSRMLS_CC);
 
                if (UNEXPECTED(EG(exception) != NULL)) {
                        HANDLE_EXCEPTION();
@@ -2301,7 +2301,7 @@ static int ZEND_FASTCALL  ZEND_JMPZNZ_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARG
 static int ZEND_FASTCALL  ZEND_JMPZ_EX_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *val;
        int retval;
 
@@ -2311,7 +2311,7 @@ static int ZEND_FASTCALL  ZEND_JMPZ_EX_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_AR
        if (IS_CONST == IS_TMP_VAR && EXPECTED(Z_TYPE_P(val) == IS_BOOL)) {
                retval = Z_LVAL_P(val);
        } else {
-               retval = i_zend_is_true(val);
+               retval = i_zend_is_true(val TSRMLS_CC);
 
                if (UNEXPECTED(EG(exception) != NULL)) {
                        HANDLE_EXCEPTION();
@@ -2332,7 +2332,7 @@ static int ZEND_FASTCALL  ZEND_JMPZ_EX_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_AR
 static int ZEND_FASTCALL  ZEND_JMPNZ_EX_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *val;
        int retval;
 
@@ -2342,7 +2342,7 @@ static int ZEND_FASTCALL  ZEND_JMPNZ_EX_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_A
        if (IS_CONST == IS_TMP_VAR && EXPECTED(Z_TYPE_P(val) == IS_BOOL)) {
                retval = Z_LVAL_P(val);
        } else {
-               retval = i_zend_is_true(val);
+               retval = i_zend_is_true(val TSRMLS_CC);
 
                if (UNEXPECTED(EG(exception) != NULL)) {
                        HANDLE_EXCEPTION();
@@ -2363,7 +2363,7 @@ static int ZEND_FASTCALL  ZEND_JMPNZ_EX_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_A
 static int ZEND_FASTCALL  ZEND_DO_FCALL_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *fname = opline->op1.zv;
        call_slot *call = EX(call_slots) + opline->op2.num;
 
@@ -2388,7 +2388,7 @@ static int ZEND_FASTCALL  ZEND_RETURN_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARG
 {
        USE_OPLINE
        zval *retval_ptr;
-
+       
 
        SAVE_OPLINE();
        retval_ptr = opline->op1.zv;
@@ -2432,12 +2432,12 @@ static int ZEND_FASTCALL  ZEND_RETURN_BY_REF_SPEC_CONST_HANDLER(ZEND_OPCODE_HAND
        USE_OPLINE
        zval *retval_ptr;
        zval **retval_ptr_ptr;
-
+       
 
        SAVE_OPLINE();
 
        do {
-               if (IS_CONST == IS_CONST || IS_CONST == IS_TMP_VAR ||
+               if (IS_CONST == IS_CONST || IS_CONST == IS_TMP_VAR || 
                    (IS_CONST == IS_VAR && opline->extended_value == ZEND_RETURNS_VALUE)) {
                        /* Not supposed to happen, but we'll allow it */
                        zend_error(E_NOTICE, "Only variable references should be returned by reference");
@@ -2503,7 +2503,7 @@ static int ZEND_FASTCALL  ZEND_THROW_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS
        USE_OPLINE
        zval *value;
        zval *exception;
-
+       
 
        SAVE_OPLINE();
        value = opline->op1.zv;
@@ -2541,7 +2541,7 @@ static int ZEND_FASTCALL  ZEND_SEND_VAL_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_A
        {
                zval *valptr;
                zval *value;
-
+               
 
                value = opline->op1.zv;
 
@@ -2560,12 +2560,12 @@ static int ZEND_FASTCALL  ZEND_SEND_VAL_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_A
 static int ZEND_FASTCALL  ZEND_BOOL_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *retval = &EX_T(opline->result.var).tmp_var;
 
        SAVE_OPLINE();
        /* PHP 3.0 returned "" for false and 1 for true, here we use 0 and 1 for now */
-       ZVAL_BOOL(retval, i_zend_is_true(opline->op1.zv));
+       ZVAL_BOOL(retval, i_zend_is_true(opline->op1.zv TSRMLS_CC));
 
        CHECK_EXCEPTION();
        ZEND_VM_NEXT_OPCODE();
@@ -2574,7 +2574,7 @@ static int ZEND_FASTCALL  ZEND_BOOL_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_FASTCALL  ZEND_CLONE_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *obj;
        zend_class_entry *ce;
        zend_function *clone;
@@ -2640,7 +2640,7 @@ static int ZEND_FASTCALL  ZEND_CLONE_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS
 static int ZEND_FASTCALL  ZEND_CAST_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *expr;
        zval *result = &EX_T(opline->result.var).tmp_var;
 
@@ -2700,7 +2700,7 @@ static int ZEND_FASTCALL  ZEND_INCLUDE_OR_EVAL_SPEC_CONST_HANDLER(ZEND_OPCODE_HA
 {
        USE_OPLINE
        zend_op_array *new_op_array=NULL;
-
+       
        zval *inc_filename;
        zval *tmp_inc_filename = NULL;
        zend_bool failure_retval=0;
@@ -2832,7 +2832,7 @@ static int ZEND_FASTCALL  ZEND_INCLUDE_OR_EVAL_SPEC_CONST_HANDLER(ZEND_OPCODE_HA
 static int ZEND_FASTCALL  ZEND_FE_RESET_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *array_ptr, **array_ptr_ptr;
        HashTable *fe_ht;
        zend_object_iterator *iter = NULL;
@@ -2891,7 +2891,7 @@ static int ZEND_FASTCALL  ZEND_FE_RESET_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_A
                                }
                        }
                } else if (IS_CONST == IS_CONST ||
-                          (IS_CONST == IS_CV &&
+                          (IS_CONST == IS_CV && 
                            !Z_ISREF_P(array_ptr) &&
                            Z_REFCOUNT_P(array_ptr) > 1) ||
                           (IS_CONST == IS_VAR &&
@@ -2998,7 +2998,7 @@ static int ZEND_FASTCALL  ZEND_EXIT_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 
        SAVE_OPLINE();
        if (IS_CONST != IS_UNUSED) {
-
+               
                zval *ptr = opline->op1.zv;
 
                if (Z_TYPE_P(ptr) == IS_LONG) {
@@ -3016,13 +3016,13 @@ static int ZEND_FASTCALL  ZEND_EXIT_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_FASTCALL  ZEND_JMP_SET_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *value;
 
        SAVE_OPLINE();
        value = opline->op1.zv;
 
-       if (i_zend_is_true(value)) {
+       if (i_zend_is_true(value TSRMLS_CC)) {
                ZVAL_COPY_VALUE(&EX_T(opline->result.var).tmp_var, value);
                if (!0) {
                        zendi_zval_copy_ctor(EX_T(opline->result.var).tmp_var);
@@ -3041,13 +3041,13 @@ static int ZEND_FASTCALL  ZEND_JMP_SET_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_AR
 static int ZEND_FASTCALL  ZEND_JMP_SET_VAR_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *value, *ret;
 
        SAVE_OPLINE();
        value = opline->op1.zv;
 
-       if (i_zend_is_true(value)) {
+       if (i_zend_is_true(value TSRMLS_CC)) {
                if (IS_CONST == IS_VAR || IS_CONST == IS_CV) {
                        Z_ADDREF_P(value);
                        EX_T(opline->result.var).var.ptr = value;
@@ -3075,7 +3075,7 @@ static int ZEND_FASTCALL  ZEND_JMP_SET_VAR_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLE
 static int ZEND_FASTCALL  ZEND_QM_ASSIGN_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *value;
 
        SAVE_OPLINE();
@@ -3093,7 +3093,7 @@ static int ZEND_FASTCALL  ZEND_QM_ASSIGN_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_
 static int ZEND_FASTCALL  ZEND_QM_ASSIGN_VAR_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *value, *ret;
 
        SAVE_OPLINE();
@@ -3120,7 +3120,7 @@ static int ZEND_FASTCALL  ZEND_QM_ASSIGN_VAR_SPEC_CONST_HANDLER(ZEND_OPCODE_HAND
 static int ZEND_FASTCALL  ZEND_ADD_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
 
        SAVE_OPLINE();
        fast_add_function(&EX_T(opline->result.var).tmp_var,
@@ -3135,7 +3135,7 @@ static int ZEND_FASTCALL  ZEND_ADD_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_
 static int ZEND_FASTCALL  ZEND_SUB_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
 
        SAVE_OPLINE();
        fast_sub_function(&EX_T(opline->result.var).tmp_var,
@@ -3150,7 +3150,7 @@ static int ZEND_FASTCALL  ZEND_SUB_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_
 static int ZEND_FASTCALL  ZEND_MUL_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
 
        SAVE_OPLINE();
        fast_mul_function(&EX_T(opline->result.var).tmp_var,
@@ -3165,7 +3165,7 @@ static int ZEND_FASTCALL  ZEND_MUL_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_
 static int ZEND_FASTCALL  ZEND_DIV_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
 
        SAVE_OPLINE();
        fast_div_function(&EX_T(opline->result.var).tmp_var,
@@ -3180,7 +3180,7 @@ static int ZEND_FASTCALL  ZEND_DIV_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_
 static int ZEND_FASTCALL  ZEND_MOD_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
 
        SAVE_OPLINE();
        fast_mod_function(&EX_T(opline->result.var).tmp_var,
@@ -3195,7 +3195,7 @@ static int ZEND_FASTCALL  ZEND_MOD_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_
 static int ZEND_FASTCALL  ZEND_SL_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
 
        SAVE_OPLINE();
        shift_left_function(&EX_T(opline->result.var).tmp_var,
@@ -3210,7 +3210,7 @@ static int ZEND_FASTCALL  ZEND_SL_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_A
 static int ZEND_FASTCALL  ZEND_SR_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
 
        SAVE_OPLINE();
        shift_right_function(&EX_T(opline->result.var).tmp_var,
@@ -3225,7 +3225,7 @@ static int ZEND_FASTCALL  ZEND_SR_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_A
 static int ZEND_FASTCALL  ZEND_CONCAT_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
 
        SAVE_OPLINE();
        concat_function(&EX_T(opline->result.var).tmp_var,
@@ -3240,7 +3240,7 @@ static int ZEND_FASTCALL  ZEND_CONCAT_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDL
 static int ZEND_FASTCALL  ZEND_IS_IDENTICAL_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
 
        SAVE_OPLINE();
        is_identical_function(&EX_T(opline->result.var).tmp_var,
@@ -3255,7 +3255,7 @@ static int ZEND_FASTCALL  ZEND_IS_IDENTICAL_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE
 static int ZEND_FASTCALL  ZEND_IS_NOT_IDENTICAL_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *result = &EX_T(opline->result.var).tmp_var;
 
        SAVE_OPLINE();
@@ -3272,7 +3272,7 @@ static int ZEND_FASTCALL  ZEND_IS_NOT_IDENTICAL_SPEC_CONST_CONST_HANDLER(ZEND_OP
 static int ZEND_FASTCALL  ZEND_IS_EQUAL_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *result = &EX_T(opline->result.var).tmp_var;
 
        SAVE_OPLINE();
@@ -3288,7 +3288,7 @@ static int ZEND_FASTCALL  ZEND_IS_EQUAL_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HAN
 static int ZEND_FASTCALL  ZEND_IS_NOT_EQUAL_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *result = &EX_T(opline->result.var).tmp_var;
 
        SAVE_OPLINE();
@@ -3304,7 +3304,7 @@ static int ZEND_FASTCALL  ZEND_IS_NOT_EQUAL_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE
 static int ZEND_FASTCALL  ZEND_IS_SMALLER_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *result = &EX_T(opline->result.var).tmp_var;
 
        SAVE_OPLINE();
@@ -3320,7 +3320,7 @@ static int ZEND_FASTCALL  ZEND_IS_SMALLER_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_H
 static int ZEND_FASTCALL  ZEND_IS_SMALLER_OR_EQUAL_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *result = &EX_T(opline->result.var).tmp_var;
 
        SAVE_OPLINE();
@@ -3336,7 +3336,7 @@ static int ZEND_FASTCALL  ZEND_IS_SMALLER_OR_EQUAL_SPEC_CONST_CONST_HANDLER(ZEND
 static int ZEND_FASTCALL  ZEND_BW_OR_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
 
        SAVE_OPLINE();
        bitwise_or_function(&EX_T(opline->result.var).tmp_var,
@@ -3351,7 +3351,7 @@ static int ZEND_FASTCALL  ZEND_BW_OR_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLE
 static int ZEND_FASTCALL  ZEND_BW_AND_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
 
        SAVE_OPLINE();
        bitwise_and_function(&EX_T(opline->result.var).tmp_var,
@@ -3366,7 +3366,7 @@ static int ZEND_FASTCALL  ZEND_BW_AND_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDL
 static int ZEND_FASTCALL  ZEND_BW_XOR_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
 
        SAVE_OPLINE();
        bitwise_xor_function(&EX_T(opline->result.var).tmp_var,
@@ -3381,7 +3381,7 @@ static int ZEND_FASTCALL  ZEND_BW_XOR_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDL
 static int ZEND_FASTCALL  ZEND_BOOL_XOR_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
 
        SAVE_OPLINE();
        boolean_xor_function(&EX_T(opline->result.var).tmp_var,
@@ -3449,7 +3449,7 @@ static int ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_CONST_CONST(int type
                if (IS_CONST == IS_CONST) {
                        hash_value = Z_HASH_P(varname);
                } else {
-                       hash_value = str_hash(Z_STRVAL_P(varname), Z_STRLEN_P(varname));
+                       hash_value = str_hash(Z_STRVAL_P(varname), Z_STRLEN_P(varname));        
                }
 
                if (zend_hash_quick_find(target_symbol_table, Z_STRVAL_P(varname), Z_STRLEN_P(varname)+1, hash_value, (void **) &retval) == FAILURE) {
@@ -3558,7 +3558,7 @@ static int ZEND_FASTCALL  ZEND_FETCH_IS_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HAN
 static int ZEND_FASTCALL  ZEND_FETCH_DIM_R_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *container;
 
        SAVE_OPLINE();
@@ -3575,7 +3575,7 @@ static int ZEND_FASTCALL  ZEND_FETCH_DIM_R_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_
 static int ZEND_FASTCALL  ZEND_FETCH_DIM_TMP_VAR_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *container;
 
        SAVE_OPLINE();
@@ -3585,7 +3585,7 @@ static int ZEND_FASTCALL  ZEND_FETCH_DIM_TMP_VAR_SPEC_CONST_CONST_HANDLER(ZEND_O
                PZVAL_LOCK(&EG(uninitialized_zval));
                EX_T(opline->result.var).var.ptr = &EG(uninitialized_zval);
        } else {
-
+               
                zval *value = *zend_fetch_dimension_address_inner(Z_ARRVAL_P(container), opline->op2.zv, IS_CONST, BP_VAR_R TSRMLS_CC);
 
                PZVAL_LOCK(value);
@@ -3641,7 +3641,7 @@ static int ZEND_FASTCALL  ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_CONST_HANDLER(
        } else if (IS_CONST != IS_UNUSED) {
                char *function_name_strval = NULL;
                int function_name_strlen = 0;
-
+               
 
                if (IS_CONST == IS_CONST) {
                        function_name_strval = Z_STRVAL_P(opline->op2.zv);
@@ -3722,7 +3722,7 @@ static int ZEND_FASTCALL  ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_CONST_HANDLER(
 static int ZEND_FASTCALL  ZEND_CASE_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
 
        SAVE_OPLINE();
        is_equal_function(&EX_T(opline->result.var).tmp_var,
@@ -3832,7 +3832,7 @@ static int ZEND_FASTCALL  ZEND_FETCH_CONSTANT_SPEC_CONST_CONST_HANDLER(ZEND_OPCO
 static int ZEND_FASTCALL  ZEND_ADD_ARRAY_ELEMENT_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *expr_ptr;
 
        SAVE_OPLINE();
@@ -3867,7 +3867,7 @@ static int ZEND_FASTCALL  ZEND_ADD_ARRAY_ELEMENT_SPEC_CONST_CONST_HANDLER(ZEND_O
        }
 
        if (IS_CONST != IS_UNUSED) {
-
+               
                zval *offset = opline->op2.zv;
                ulong hval;
 
@@ -3929,7 +3929,7 @@ static int ZEND_FASTCALL  ZEND_UNSET_VAR_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HA
        USE_OPLINE
        zval tmp, *varname;
        HashTable *target_symbol_table;
-
+       
 
        SAVE_OPLINE();
        if (IS_CONST == IS_CV &&
@@ -4025,7 +4025,7 @@ static int ZEND_FASTCALL  ZEND_ISSET_ISEMPTY_VAR_SPEC_CONST_CONST_HANDLER(ZEND_O
                }
        } else {
                HashTable *target_symbol_table;
-
+               
                zval tmp, *varname = opline->op1.zv;
 
                if (IS_CONST != IS_CONST && Z_TYPE_P(varname) != IS_STRING) {
@@ -4076,7 +4076,7 @@ static int ZEND_FASTCALL  ZEND_ISSET_ISEMPTY_VAR_SPEC_CONST_CONST_HANDLER(ZEND_O
                        ZVAL_BOOL(&EX_T(opline->result.var).tmp_var, 0);
                }
        } else /* if (opline->extended_value & ZEND_ISEMPTY) */ {
-               if (!isset || !i_zend_is_true(*value)) {
+               if (!isset || !i_zend_is_true(*value TSRMLS_CC)) {
                        ZVAL_BOOL(&EX_T(opline->result.var).tmp_var, 1);
                } else {
                        ZVAL_BOOL(&EX_T(opline->result.var).tmp_var, 0);
@@ -4090,7 +4090,7 @@ static int ZEND_FASTCALL  ZEND_ISSET_ISEMPTY_VAR_SPEC_CONST_CONST_HANDLER(ZEND_O
 static int ZEND_FASTCALL  ZEND_DECLARE_CONST_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *name;
        zval *val;
        zend_constant c;
@@ -4150,7 +4150,7 @@ static int ZEND_FASTCALL  ZEND_YIELD_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLE
 
        /* Set the new yielded value */
        if (IS_CONST != IS_UNUSED) {
-
+               
 
                if (EX(op_array)->fn_flags & ZEND_ACC_RETURN_REFERENCE) {
                        /* Constants and temporary variables aren't yieldable by reference,
@@ -4228,7 +4228,7 @@ static int ZEND_FASTCALL  ZEND_YIELD_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLE
 
        /* Set the new yielded key */
        if (IS_CONST != IS_UNUSED) {
-
+               
                zval *key = opline->op2.zv;
 
                /* Consts, temporary variables and references need copying */
@@ -4720,7 +4720,7 @@ static int ZEND_FASTCALL  ZEND_CASE_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_A
 static int ZEND_FASTCALL  ZEND_ADD_ARRAY_ELEMENT_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *expr_ptr;
 
        SAVE_OPLINE();
@@ -4835,7 +4835,7 @@ static int ZEND_FASTCALL  ZEND_YIELD_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_
 
        /* Set the new yielded value */
        if (IS_CONST != IS_UNUSED) {
-
+               
 
                if (EX(op_array)->fn_flags & ZEND_ACC_RETURN_REFERENCE) {
                        /* Constants and temporary variables aren't yieldable by reference,
@@ -5303,7 +5303,7 @@ static int ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_CONST_VAR(int type,
                if (IS_CONST == IS_CONST) {
                        hash_value = Z_HASH_P(varname);
                } else {
-                       hash_value = str_hash(Z_STRVAL_P(varname), Z_STRLEN_P(varname));
+                       hash_value = str_hash(Z_STRVAL_P(varname), Z_STRLEN_P(varname));        
                }
 
                if (zend_hash_quick_find(target_symbol_table, Z_STRVAL_P(varname), Z_STRLEN_P(varname)+1, hash_value, (void **) &retval) == FAILURE) {
@@ -5567,7 +5567,7 @@ static int ZEND_FASTCALL  ZEND_CASE_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_A
 static int ZEND_FASTCALL  ZEND_ADD_ARRAY_ELEMENT_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *expr_ptr;
 
        SAVE_OPLINE();
@@ -5664,7 +5664,7 @@ static int ZEND_FASTCALL  ZEND_UNSET_VAR_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HAND
        USE_OPLINE
        zval tmp, *varname;
        HashTable *target_symbol_table;
-
+       
 
        SAVE_OPLINE();
        if (IS_CONST == IS_CV &&
@@ -5760,7 +5760,7 @@ static int ZEND_FASTCALL  ZEND_ISSET_ISEMPTY_VAR_SPEC_CONST_VAR_HANDLER(ZEND_OPC
                }
        } else {
                HashTable *target_symbol_table;
-
+               
                zval tmp, *varname = opline->op1.zv;
 
                if (IS_CONST != IS_CONST && Z_TYPE_P(varname) != IS_STRING) {
@@ -5811,7 +5811,7 @@ static int ZEND_FASTCALL  ZEND_ISSET_ISEMPTY_VAR_SPEC_CONST_VAR_HANDLER(ZEND_OPC
                        ZVAL_BOOL(&EX_T(opline->result.var).tmp_var, 0);
                }
        } else /* if (opline->extended_value & ZEND_ISEMPTY) */ {
-               if (!isset || !i_zend_is_true(*value)) {
+               if (!isset || !i_zend_is_true(*value TSRMLS_CC)) {
                        ZVAL_BOOL(&EX_T(opline->result.var).tmp_var, 1);
                } else {
                        ZVAL_BOOL(&EX_T(opline->result.var).tmp_var, 0);
@@ -5845,7 +5845,7 @@ static int ZEND_FASTCALL  ZEND_YIELD_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_
 
        /* Set the new yielded value */
        if (IS_CONST != IS_UNUSED) {
-
+               
 
                if (EX(op_array)->fn_flags & ZEND_ACC_RETURN_REFERENCE) {
                        /* Constants and temporary variables aren't yieldable by reference,
@@ -6038,7 +6038,7 @@ static int ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_CONST_UNUSED(int typ
                if (IS_CONST == IS_CONST) {
                        hash_value = Z_HASH_P(varname);
                } else {
-                       hash_value = str_hash(Z_STRVAL_P(varname), Z_STRLEN_P(varname));
+                       hash_value = str_hash(Z_STRVAL_P(varname), Z_STRLEN_P(varname));        
                }
 
                if (zend_hash_quick_find(target_symbol_table, Z_STRVAL_P(varname), Z_STRLEN_P(varname)+1, hash_value, (void **) &retval) == FAILURE) {
@@ -6189,7 +6189,7 @@ static int ZEND_FASTCALL  ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_UNUSED_HANDLER
        } else if (IS_UNUSED != IS_UNUSED) {
                char *function_name_strval = NULL;
                int function_name_strlen = 0;
-
+               
 
                if (IS_UNUSED == IS_CONST) {
                        function_name_strval = Z_STRVAL_P(opline->op2.zv);
@@ -6270,7 +6270,7 @@ static int ZEND_FASTCALL  ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_UNUSED_HANDLER
 static int ZEND_FASTCALL  ZEND_ADD_ARRAY_ELEMENT_SPEC_CONST_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *expr_ptr;
 
        SAVE_OPLINE();
@@ -6305,7 +6305,7 @@ static int ZEND_FASTCALL  ZEND_ADD_ARRAY_ELEMENT_SPEC_CONST_UNUSED_HANDLER(ZEND_
        }
 
        if (IS_UNUSED != IS_UNUSED) {
-
+               
                zval *offset = NULL;
                ulong hval;
 
@@ -6367,7 +6367,7 @@ static int ZEND_FASTCALL  ZEND_UNSET_VAR_SPEC_CONST_UNUSED_HANDLER(ZEND_OPCODE_H
        USE_OPLINE
        zval tmp, *varname;
        HashTable *target_symbol_table;
-
+       
 
        SAVE_OPLINE();
        if (IS_CONST == IS_CV &&
@@ -6463,7 +6463,7 @@ static int ZEND_FASTCALL  ZEND_ISSET_ISEMPTY_VAR_SPEC_CONST_UNUSED_HANDLER(ZEND_
                }
        } else {
                HashTable *target_symbol_table;
-
+               
                zval tmp, *varname = opline->op1.zv;
 
                if (IS_CONST != IS_CONST && Z_TYPE_P(varname) != IS_STRING) {
@@ -6514,7 +6514,7 @@ static int ZEND_FASTCALL  ZEND_ISSET_ISEMPTY_VAR_SPEC_CONST_UNUSED_HANDLER(ZEND_
                        ZVAL_BOOL(&EX_T(opline->result.var).tmp_var, 0);
                }
        } else /* if (opline->extended_value & ZEND_ISEMPTY) */ {
-               if (!isset || !i_zend_is_true(*value)) {
+               if (!isset || !i_zend_is_true(*value TSRMLS_CC)) {
                        ZVAL_BOOL(&EX_T(opline->result.var).tmp_var, 1);
                } else {
                        ZVAL_BOOL(&EX_T(opline->result.var).tmp_var, 0);
@@ -6566,7 +6566,7 @@ static int ZEND_FASTCALL  ZEND_YIELD_SPEC_CONST_UNUSED_HANDLER(ZEND_OPCODE_HANDL
 
        /* Set the new yielded value */
        if (IS_CONST != IS_UNUSED) {
-
+               
 
                if (EX(op_array)->fn_flags & ZEND_ACC_RETURN_REFERENCE) {
                        /* Constants and temporary variables aren't yieldable by reference,
@@ -6644,7 +6644,7 @@ static int ZEND_FASTCALL  ZEND_YIELD_SPEC_CONST_UNUSED_HANDLER(ZEND_OPCODE_HANDL
 
        /* Set the new yielded key */
        if (IS_UNUSED != IS_UNUSED) {
-
+               
                zval *key = NULL;
 
                /* Consts, temporary variables and references need copying */
@@ -6705,7 +6705,7 @@ static int ZEND_FASTCALL  ZEND_YIELD_SPEC_CONST_UNUSED_HANDLER(ZEND_OPCODE_HANDL
 static int ZEND_FASTCALL  ZEND_ADD_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
 
        SAVE_OPLINE();
        fast_add_function(&EX_T(opline->result.var).tmp_var,
@@ -6720,7 +6720,7 @@ static int ZEND_FASTCALL  ZEND_ADD_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARG
 static int ZEND_FASTCALL  ZEND_SUB_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
 
        SAVE_OPLINE();
        fast_sub_function(&EX_T(opline->result.var).tmp_var,
@@ -6735,7 +6735,7 @@ static int ZEND_FASTCALL  ZEND_SUB_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARG
 static int ZEND_FASTCALL  ZEND_MUL_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
 
        SAVE_OPLINE();
        fast_mul_function(&EX_T(opline->result.var).tmp_var,
@@ -6750,7 +6750,7 @@ static int ZEND_FASTCALL  ZEND_MUL_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARG
 static int ZEND_FASTCALL  ZEND_DIV_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
 
        SAVE_OPLINE();
        fast_div_function(&EX_T(opline->result.var).tmp_var,
@@ -6765,7 +6765,7 @@ static int ZEND_FASTCALL  ZEND_DIV_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARG
 static int ZEND_FASTCALL  ZEND_MOD_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
 
        SAVE_OPLINE();
        fast_mod_function(&EX_T(opline->result.var).tmp_var,
@@ -6780,7 +6780,7 @@ static int ZEND_FASTCALL  ZEND_MOD_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARG
 static int ZEND_FASTCALL  ZEND_SL_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
 
        SAVE_OPLINE();
        shift_left_function(&EX_T(opline->result.var).tmp_var,
@@ -6795,7 +6795,7 @@ static int ZEND_FASTCALL  ZEND_SL_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS
 static int ZEND_FASTCALL  ZEND_SR_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
 
        SAVE_OPLINE();
        shift_right_function(&EX_T(opline->result.var).tmp_var,
@@ -6810,7 +6810,7 @@ static int ZEND_FASTCALL  ZEND_SR_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS
 static int ZEND_FASTCALL  ZEND_CONCAT_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
 
        SAVE_OPLINE();
        concat_function(&EX_T(opline->result.var).tmp_var,
@@ -6825,7 +6825,7 @@ static int ZEND_FASTCALL  ZEND_CONCAT_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_
 static int ZEND_FASTCALL  ZEND_IS_IDENTICAL_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
 
        SAVE_OPLINE();
        is_identical_function(&EX_T(opline->result.var).tmp_var,
@@ -6840,7 +6840,7 @@ static int ZEND_FASTCALL  ZEND_IS_IDENTICAL_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HA
 static int ZEND_FASTCALL  ZEND_IS_NOT_IDENTICAL_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *result = &EX_T(opline->result.var).tmp_var;
 
        SAVE_OPLINE();
@@ -6857,7 +6857,7 @@ static int ZEND_FASTCALL  ZEND_IS_NOT_IDENTICAL_SPEC_CONST_CV_HANDLER(ZEND_OPCOD
 static int ZEND_FASTCALL  ZEND_IS_EQUAL_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *result = &EX_T(opline->result.var).tmp_var;
 
        SAVE_OPLINE();
@@ -6873,7 +6873,7 @@ static int ZEND_FASTCALL  ZEND_IS_EQUAL_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLE
 static int ZEND_FASTCALL  ZEND_IS_NOT_EQUAL_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *result = &EX_T(opline->result.var).tmp_var;
 
        SAVE_OPLINE();
@@ -6889,7 +6889,7 @@ static int ZEND_FASTCALL  ZEND_IS_NOT_EQUAL_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HA
 static int ZEND_FASTCALL  ZEND_IS_SMALLER_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *result = &EX_T(opline->result.var).tmp_var;
 
        SAVE_OPLINE();
@@ -6905,7 +6905,7 @@ static int ZEND_FASTCALL  ZEND_IS_SMALLER_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HAND
 static int ZEND_FASTCALL  ZEND_IS_SMALLER_OR_EQUAL_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *result = &EX_T(opline->result.var).tmp_var;
 
        SAVE_OPLINE();
@@ -6921,7 +6921,7 @@ static int ZEND_FASTCALL  ZEND_IS_SMALLER_OR_EQUAL_SPEC_CONST_CV_HANDLER(ZEND_OP
 static int ZEND_FASTCALL  ZEND_BW_OR_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
 
        SAVE_OPLINE();
        bitwise_or_function(&EX_T(opline->result.var).tmp_var,
@@ -6936,7 +6936,7 @@ static int ZEND_FASTCALL  ZEND_BW_OR_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_A
 static int ZEND_FASTCALL  ZEND_BW_AND_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
 
        SAVE_OPLINE();
        bitwise_and_function(&EX_T(opline->result.var).tmp_var,
@@ -6951,7 +6951,7 @@ static int ZEND_FASTCALL  ZEND_BW_AND_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_
 static int ZEND_FASTCALL  ZEND_BW_XOR_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
 
        SAVE_OPLINE();
        bitwise_xor_function(&EX_T(opline->result.var).tmp_var,
@@ -6966,7 +6966,7 @@ static int ZEND_FASTCALL  ZEND_BW_XOR_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_
 static int ZEND_FASTCALL  ZEND_BOOL_XOR_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
 
        SAVE_OPLINE();
        boolean_xor_function(&EX_T(opline->result.var).tmp_var,
@@ -6981,7 +6981,7 @@ static int ZEND_FASTCALL  ZEND_BOOL_XOR_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLE
 static int ZEND_FASTCALL  ZEND_FETCH_DIM_R_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *container;
 
        SAVE_OPLINE();
@@ -7040,7 +7040,7 @@ static int ZEND_FASTCALL  ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_CV_HANDLER(ZEN
        } else if (IS_CV != IS_UNUSED) {
                char *function_name_strval = NULL;
                int function_name_strlen = 0;
-
+               
 
                if (IS_CV == IS_CONST) {
                        function_name_strval = Z_STRVAL_P(opline->op2.zv);
@@ -7181,7 +7181,7 @@ static int ZEND_FASTCALL  ZEND_CATCH_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_A
 static int ZEND_FASTCALL  ZEND_CASE_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
 
        SAVE_OPLINE();
        is_equal_function(&EX_T(opline->result.var).tmp_var,
@@ -7195,7 +7195,7 @@ static int ZEND_FASTCALL  ZEND_CASE_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_AR
 static int ZEND_FASTCALL  ZEND_ADD_ARRAY_ELEMENT_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *expr_ptr;
 
        SAVE_OPLINE();
@@ -7230,7 +7230,7 @@ static int ZEND_FASTCALL  ZEND_ADD_ARRAY_ELEMENT_SPEC_CONST_CV_HANDLER(ZEND_OPCO
        }
 
        if (IS_CV != IS_UNUSED) {
-
+               
                zval *offset = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op2.var TSRMLS_CC);
                ulong hval;
 
@@ -7310,7 +7310,7 @@ static int ZEND_FASTCALL  ZEND_YIELD_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_A
 
        /* Set the new yielded value */
        if (IS_CONST != IS_UNUSED) {
-
+               
 
                if (EX(op_array)->fn_flags & ZEND_ACC_RETURN_REFERENCE) {
                        /* Constants and temporary variables aren't yieldable by reference,
@@ -7388,7 +7388,7 @@ static int ZEND_FASTCALL  ZEND_YIELD_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_A
 
        /* Set the new yielded key */
        if (IS_CV != IS_UNUSED) {
-
+               
                zval *key = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op2.var TSRMLS_CC);
 
                /* Consts, temporary variables and references need copying */
@@ -7512,7 +7512,7 @@ static int ZEND_FASTCALL  ZEND_JMPZ_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        if (IS_TMP_VAR == IS_TMP_VAR && EXPECTED(Z_TYPE_P(val) == IS_BOOL)) {
                ret = Z_LVAL_P(val);
        } else {
-               ret = i_zend_is_true(val);
+               ret = i_zend_is_true(val TSRMLS_CC);
                zval_dtor(free_op1.var);
                if (UNEXPECTED(EG(exception) != NULL)) {
                        HANDLE_EXCEPTION();
@@ -7542,7 +7542,7 @@ static int ZEND_FASTCALL  ZEND_JMPNZ_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        if (IS_TMP_VAR == IS_TMP_VAR && EXPECTED(Z_TYPE_P(val) == IS_BOOL)) {
                ret = Z_LVAL_P(val);
        } else {
-               ret = i_zend_is_true(val);
+               ret = i_zend_is_true(val TSRMLS_CC);
                zval_dtor(free_op1.var);
                if (UNEXPECTED(EG(exception) != NULL)) {
                        HANDLE_EXCEPTION();
@@ -7572,7 +7572,7 @@ static int ZEND_FASTCALL  ZEND_JMPZNZ_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        if (IS_TMP_VAR == IS_TMP_VAR && EXPECTED(Z_TYPE_P(val) == IS_BOOL)) {
                retval = Z_LVAL_P(val);
        } else {
-               retval = i_zend_is_true(val);
+               retval = i_zend_is_true(val TSRMLS_CC);
                zval_dtor(free_op1.var);
                if (UNEXPECTED(EG(exception) != NULL)) {
                        HANDLE_EXCEPTION();
@@ -7606,7 +7606,7 @@ static int ZEND_FASTCALL  ZEND_JMPZ_EX_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS
        if (IS_TMP_VAR == IS_TMP_VAR && EXPECTED(Z_TYPE_P(val) == IS_BOOL)) {
                retval = Z_LVAL_P(val);
        } else {
-               retval = i_zend_is_true(val);
+               retval = i_zend_is_true(val TSRMLS_CC);
                zval_dtor(free_op1.var);
                if (UNEXPECTED(EG(exception) != NULL)) {
                        HANDLE_EXCEPTION();
@@ -7637,7 +7637,7 @@ static int ZEND_FASTCALL  ZEND_JMPNZ_EX_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARG
        if (IS_TMP_VAR == IS_TMP_VAR && EXPECTED(Z_TYPE_P(val) == IS_BOOL)) {
                retval = Z_LVAL_P(val);
        } else {
-               retval = i_zend_is_true(val);
+               retval = i_zend_is_true(val TSRMLS_CC);
                zval_dtor(free_op1.var);
                if (UNEXPECTED(EG(exception) != NULL)) {
                        HANDLE_EXCEPTION();
@@ -7722,7 +7722,7 @@ static int ZEND_FASTCALL  ZEND_RETURN_BY_REF_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLE
        SAVE_OPLINE();
 
        do {
-               if (IS_TMP_VAR == IS_CONST || IS_TMP_VAR == IS_TMP_VAR ||
+               if (IS_TMP_VAR == IS_CONST || IS_TMP_VAR == IS_TMP_VAR || 
                    (IS_TMP_VAR == IS_VAR && opline->extended_value == ZEND_RETURNS_VALUE)) {
                        /* Not supposed to happen, but we'll allow it */
                        zend_error(E_NOTICE, "Only variable references should be returned by reference");
@@ -7850,7 +7850,7 @@ static int ZEND_FASTCALL  ZEND_BOOL_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 
        SAVE_OPLINE();
        /* PHP 3.0 returned "" for false and 1 for true, here we use 0 and 1 for now */
-       ZVAL_BOOL(retval, i_zend_is_true(_get_zval_ptr_tmp(opline->op1.var, execute_data, &free_op1 TSRMLS_CC)));
+       ZVAL_BOOL(retval, i_zend_is_true(_get_zval_ptr_tmp(opline->op1.var, execute_data, &free_op1 TSRMLS_CC) TSRMLS_CC));
        zval_dtor(free_op1.var);
 
        CHECK_EXCEPTION();
@@ -8177,7 +8177,7 @@ static int ZEND_FASTCALL  ZEND_FE_RESET_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARG
                                }
                        }
                } else if (IS_TMP_VAR == IS_CONST ||
-                          (IS_TMP_VAR == IS_CV &&
+                          (IS_TMP_VAR == IS_CV && 
                            !Z_ISREF_P(array_ptr) &&
                            Z_REFCOUNT_P(array_ptr) > 1) ||
                           (IS_TMP_VAR == IS_VAR &&
@@ -8337,7 +8337,7 @@ static int ZEND_FASTCALL  ZEND_JMP_SET_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS
        SAVE_OPLINE();
        value = _get_zval_ptr_tmp(opline->op1.var, execute_data, &free_op1 TSRMLS_CC);
 
-       if (i_zend_is_true(value)) {
+       if (i_zend_is_true(value TSRMLS_CC)) {
                ZVAL_COPY_VALUE(&EX_T(opline->result.var).tmp_var, value);
                if (!1) {
                        zendi_zval_copy_ctor(EX_T(opline->result.var).tmp_var);
@@ -8363,7 +8363,7 @@ static int ZEND_FASTCALL  ZEND_JMP_SET_VAR_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_
        SAVE_OPLINE();
        value = _get_zval_ptr_tmp(opline->op1.var, execute_data, &free_op1 TSRMLS_CC);
 
-       if (i_zend_is_true(value)) {
+       if (i_zend_is_true(value TSRMLS_CC)) {
                if (IS_TMP_VAR == IS_VAR || IS_TMP_VAR == IS_CV) {
                        Z_ADDREF_P(value);
                        EX_T(opline->result.var).var.ptr = value;
@@ -8787,7 +8787,7 @@ static int ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_TMP_CONST(int type,
                if (IS_TMP_VAR == IS_CONST) {
                        hash_value = Z_HASH_P(varname);
                } else {
-                       hash_value = str_hash(Z_STRVAL_P(varname), Z_STRLEN_P(varname));
+                       hash_value = str_hash(Z_STRVAL_P(varname), Z_STRLEN_P(varname));        
                }
 
                if (zend_hash_quick_find(target_symbol_table, Z_STRVAL_P(varname), Z_STRLEN_P(varname)+1, hash_value, (void **) &retval) == FAILURE) {
@@ -8923,7 +8923,7 @@ static int ZEND_FASTCALL  ZEND_FETCH_DIM_TMP_VAR_SPEC_TMP_CONST_HANDLER(ZEND_OPC
                PZVAL_LOCK(&EG(uninitialized_zval));
                EX_T(opline->result.var).var.ptr = &EG(uninitialized_zval);
        } else {
-
+               
                zval *value = *zend_fetch_dimension_address_inner(Z_ARRVAL_P(container), opline->op2.zv, IS_CONST, BP_VAR_R TSRMLS_CC);
 
                PZVAL_LOCK(value);
@@ -9111,7 +9111,7 @@ static int ZEND_FASTCALL  ZEND_ADD_ARRAY_ELEMENT_SPEC_TMP_CONST_HANDLER(ZEND_OPC
        }
 
        if (IS_CONST != IS_UNUSED) {
-
+               
                zval *offset = opline->op2.zv;
                ulong hval;
 
@@ -9320,7 +9320,7 @@ static int ZEND_FASTCALL  ZEND_ISSET_ISEMPTY_VAR_SPEC_TMP_CONST_HANDLER(ZEND_OPC
                        ZVAL_BOOL(&EX_T(opline->result.var).tmp_var, 0);
                }
        } else /* if (opline->extended_value & ZEND_ISEMPTY) */ {
-               if (!isset || !i_zend_is_true(*value)) {
+               if (!isset || !i_zend_is_true(*value TSRMLS_CC)) {
                        ZVAL_BOOL(&EX_T(opline->result.var).tmp_var, 1);
                } else {
                        ZVAL_BOOL(&EX_T(opline->result.var).tmp_var, 0);
@@ -9432,7 +9432,7 @@ static int ZEND_FASTCALL  ZEND_YIELD_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_
 
        /* Set the new yielded key */
        if (IS_CONST != IS_UNUSED) {
-
+               
                zval *key = opline->op2.zv;
 
                /* Consts, temporary variables and references need copying */
@@ -10509,7 +10509,7 @@ static int ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_TMP_VAR(int type, ZE
                if (IS_TMP_VAR == IS_CONST) {
                        hash_value = Z_HASH_P(varname);
                } else {
-                       hash_value = str_hash(Z_STRVAL_P(varname), Z_STRLEN_P(varname));
+                       hash_value = str_hash(Z_STRVAL_P(varname), Z_STRLEN_P(varname));        
                }
 
                if (zend_hash_quick_find(target_symbol_table, Z_STRVAL_P(varname), Z_STRLEN_P(varname)+1, hash_value, (void **) &retval) == FAILURE) {
@@ -11019,7 +11019,7 @@ static int ZEND_FASTCALL  ZEND_ISSET_ISEMPTY_VAR_SPEC_TMP_VAR_HANDLER(ZEND_OPCOD
                        ZVAL_BOOL(&EX_T(opline->result.var).tmp_var, 0);
                }
        } else /* if (opline->extended_value & ZEND_ISEMPTY) */ {
-               if (!isset || !i_zend_is_true(*value)) {
+               if (!isset || !i_zend_is_true(*value TSRMLS_CC)) {
                        ZVAL_BOOL(&EX_T(opline->result.var).tmp_var, 1);
                } else {
                        ZVAL_BOOL(&EX_T(opline->result.var).tmp_var, 0);
@@ -11246,7 +11246,7 @@ static int ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_TMP_UNUSED(int type,
                if (IS_TMP_VAR == IS_CONST) {
                        hash_value = Z_HASH_P(varname);
                } else {
-                       hash_value = str_hash(Z_STRVAL_P(varname), Z_STRLEN_P(varname));
+                       hash_value = str_hash(Z_STRVAL_P(varname), Z_STRLEN_P(varname));        
                }
 
                if (zend_hash_quick_find(target_symbol_table, Z_STRVAL_P(varname), Z_STRLEN_P(varname)+1, hash_value, (void **) &retval) == FAILURE) {
@@ -11390,7 +11390,7 @@ static int ZEND_FASTCALL  ZEND_ADD_ARRAY_ELEMENT_SPEC_TMP_UNUSED_HANDLER(ZEND_OP
        }
 
        if (IS_UNUSED != IS_UNUSED) {
-
+               
                zval *offset = NULL;
                ulong hval;
 
@@ -11599,7 +11599,7 @@ static int ZEND_FASTCALL  ZEND_ISSET_ISEMPTY_VAR_SPEC_TMP_UNUSED_HANDLER(ZEND_OP
                        ZVAL_BOOL(&EX_T(opline->result.var).tmp_var, 0);
                }
        } else /* if (opline->extended_value & ZEND_ISEMPTY) */ {
-               if (!isset || !i_zend_is_true(*value)) {
+               if (!isset || !i_zend_is_true(*value TSRMLS_CC)) {
                        ZVAL_BOOL(&EX_T(opline->result.var).tmp_var, 1);
                } else {
                        ZVAL_BOOL(&EX_T(opline->result.var).tmp_var, 0);
@@ -11711,7 +11711,7 @@ static int ZEND_FASTCALL  ZEND_YIELD_SPEC_TMP_UNUSED_HANDLER(ZEND_OPCODE_HANDLER
 
        /* Set the new yielded key */
        if (IS_UNUSED != IS_UNUSED) {
-
+               
                zval *key = NULL;
 
                /* Consts, temporary variables and references need copying */
@@ -12065,7 +12065,7 @@ static int ZEND_FASTCALL  ZEND_FETCH_DIM_R_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDL
 static int ZEND_FASTCALL  ZEND_ADD_VAR_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *str = &EX_T(opline->result.var).tmp_var;
        zval *var;
        zval var_copy;
@@ -12237,7 +12237,7 @@ static int ZEND_FASTCALL  ZEND_ADD_ARRAY_ELEMENT_SPEC_TMP_CV_HANDLER(ZEND_OPCODE
        }
 
        if (IS_CV != IS_UNUSED) {
-
+               
                zval *offset = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op2.var TSRMLS_CC);
                ulong hval;
 
@@ -12395,7 +12395,7 @@ static int ZEND_FASTCALL  ZEND_YIELD_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARG
 
        /* Set the new yielded key */
        if (IS_CV != IS_UNUSED) {
-
+               
                zval *key = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op2.var TSRMLS_CC);
 
                /* Consts, temporary variables and references need copying */
@@ -12699,7 +12699,7 @@ static int ZEND_FASTCALL  ZEND_JMPZ_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        if (IS_VAR == IS_TMP_VAR && EXPECTED(Z_TYPE_P(val) == IS_BOOL)) {
                ret = Z_LVAL_P(val);
        } else {
-               ret = i_zend_is_true(val);
+               ret = i_zend_is_true(val TSRMLS_CC);
                zval_ptr_dtor_nogc(&free_op1.var);
                if (UNEXPECTED(EG(exception) != NULL)) {
                        HANDLE_EXCEPTION();
@@ -12729,7 +12729,7 @@ static int ZEND_FASTCALL  ZEND_JMPNZ_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        if (IS_VAR == IS_TMP_VAR && EXPECTED(Z_TYPE_P(val) == IS_BOOL)) {
                ret = Z_LVAL_P(val);
        } else {
-               ret = i_zend_is_true(val);
+               ret = i_zend_is_true(val TSRMLS_CC);
                zval_ptr_dtor_nogc(&free_op1.var);
                if (UNEXPECTED(EG(exception) != NULL)) {
                        HANDLE_EXCEPTION();
@@ -12759,7 +12759,7 @@ static int ZEND_FASTCALL  ZEND_JMPZNZ_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        if (IS_VAR == IS_TMP_VAR && EXPECTED(Z_TYPE_P(val) == IS_BOOL)) {
                retval = Z_LVAL_P(val);
        } else {
-               retval = i_zend_is_true(val);
+               retval = i_zend_is_true(val TSRMLS_CC);
                zval_ptr_dtor_nogc(&free_op1.var);
                if (UNEXPECTED(EG(exception) != NULL)) {
                        HANDLE_EXCEPTION();
@@ -12793,7 +12793,7 @@ static int ZEND_FASTCALL  ZEND_JMPZ_EX_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS
        if (IS_VAR == IS_TMP_VAR && EXPECTED(Z_TYPE_P(val) == IS_BOOL)) {
                retval = Z_LVAL_P(val);
        } else {
-               retval = i_zend_is_true(val);
+               retval = i_zend_is_true(val TSRMLS_CC);
                zval_ptr_dtor_nogc(&free_op1.var);
                if (UNEXPECTED(EG(exception) != NULL)) {
                        HANDLE_EXCEPTION();
@@ -12824,7 +12824,7 @@ static int ZEND_FASTCALL  ZEND_JMPNZ_EX_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARG
        if (IS_VAR == IS_TMP_VAR && EXPECTED(Z_TYPE_P(val) == IS_BOOL)) {
                retval = Z_LVAL_P(val);
        } else {
-               retval = i_zend_is_true(val);
+               retval = i_zend_is_true(val TSRMLS_CC);
                zval_ptr_dtor_nogc(&free_op1.var);
                if (UNEXPECTED(EG(exception) != NULL)) {
                        HANDLE_EXCEPTION();
@@ -12909,7 +12909,7 @@ static int ZEND_FASTCALL  ZEND_RETURN_BY_REF_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLE
        SAVE_OPLINE();
 
        do {
-               if (IS_VAR == IS_CONST || IS_VAR == IS_TMP_VAR ||
+               if (IS_VAR == IS_CONST || IS_VAR == IS_TMP_VAR || 
                    (IS_VAR == IS_VAR && opline->extended_value == ZEND_RETURNS_VALUE)) {
                        /* Not supposed to happen, but we'll allow it */
                        zend_error(E_NOTICE, "Only variable references should be returned by reference");
@@ -13137,7 +13137,7 @@ static int ZEND_FASTCALL  ZEND_BOOL_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 
        SAVE_OPLINE();
        /* PHP 3.0 returned "" for false and 1 for true, here we use 0 and 1 for now */
-       ZVAL_BOOL(retval, i_zend_is_true(_get_zval_ptr_var(opline->op1.var, execute_data, &free_op1 TSRMLS_CC)));
+       ZVAL_BOOL(retval, i_zend_is_true(_get_zval_ptr_var(opline->op1.var, execute_data, &free_op1 TSRMLS_CC) TSRMLS_CC));
        zval_ptr_dtor_nogc(&free_op1.var);
 
        CHECK_EXCEPTION();
@@ -13474,7 +13474,7 @@ static int ZEND_FASTCALL  ZEND_FE_RESET_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARG
                                }
                        }
                } else if (IS_VAR == IS_CONST ||
-                          (IS_VAR == IS_CV &&
+                          (IS_VAR == IS_CV && 
                            !Z_ISREF_P(array_ptr) &&
                            Z_REFCOUNT_P(array_ptr) > 1) ||
                           (IS_VAR == IS_VAR &&
@@ -13577,7 +13577,7 @@ static int ZEND_FASTCALL  ZEND_FE_RESET_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARG
 static int ZEND_FASTCALL  ZEND_FE_FETCH_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *array = EX_T(opline->op1.var).fe.ptr;
        zval **value;
        HashTable *fe_ht;
@@ -13736,7 +13736,7 @@ static int ZEND_FASTCALL  ZEND_JMP_SET_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS
        SAVE_OPLINE();
        value = _get_zval_ptr_var(opline->op1.var, execute_data, &free_op1 TSRMLS_CC);
 
-       if (i_zend_is_true(value)) {
+       if (i_zend_is_true(value TSRMLS_CC)) {
                ZVAL_COPY_VALUE(&EX_T(opline->result.var).tmp_var, value);
                if (!0) {
                        zendi_zval_copy_ctor(EX_T(opline->result.var).tmp_var);
@@ -13762,7 +13762,7 @@ static int ZEND_FASTCALL  ZEND_JMP_SET_VAR_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_
        SAVE_OPLINE();
        value = _get_zval_ptr_var(opline->op1.var, execute_data, &free_op1 TSRMLS_CC);
 
-       if (i_zend_is_true(value)) {
+       if (i_zend_is_true(value TSRMLS_CC)) {
                if (IS_VAR == IS_VAR || IS_VAR == IS_CV) {
                        Z_ADDREF_P(value);
                        EX_T(opline->result.var).var.ptr = value;
@@ -14645,7 +14645,7 @@ static int ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_VAR_CONST(int type,
                if (IS_VAR == IS_CONST) {
                        hash_value = Z_HASH_P(varname);
                } else {
-                       hash_value = str_hash(Z_STRVAL_P(varname), Z_STRLEN_P(varname));
+                       hash_value = str_hash(Z_STRVAL_P(varname), Z_STRLEN_P(varname));        
                }
 
                if (zend_hash_quick_find(target_symbol_table, Z_STRVAL_P(varname), Z_STRLEN_P(varname)+1, hash_value, (void **) &retval) == FAILURE) {
@@ -14919,7 +14919,7 @@ static int ZEND_FASTCALL zend_fetch_property_address_read_helper_SPEC_VAR_CONST(
        USE_OPLINE
        zend_free_op free_op1;
        zval *container;
-
+       
        zval *offset;
 
        SAVE_OPLINE();
@@ -15042,7 +15042,7 @@ static int ZEND_FASTCALL  ZEND_FETCH_OBJ_IS_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_H
        USE_OPLINE
        zend_free_op free_op1;
        zval *container;
-
+       
        zval *offset;
 
        SAVE_OPLINE();
@@ -15202,7 +15202,7 @@ static int ZEND_FASTCALL  ZEND_ASSIGN_DIM_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HAN
                zend_error_noreturn(E_ERROR, "Cannot use string offset as an array");
        }
        if (Z_TYPE_PP(object_ptr) == IS_OBJECT) {
-
+               
                zval *property_name = opline->op2.zv;
 
                if (0) {
@@ -15449,7 +15449,7 @@ static int ZEND_FASTCALL  ZEND_INIT_STATIC_METHOD_CALL_SPEC_VAR_CONST_HANDLER(ZE
        } else if (IS_CONST != IS_UNUSED) {
                char *function_name_strval = NULL;
                int function_name_strlen = 0;
-
+               
 
                if (IS_CONST == IS_CONST) {
                        function_name_strval = Z_STRVAL_P(opline->op2.zv);
@@ -15675,7 +15675,7 @@ static int ZEND_FASTCALL  ZEND_ADD_ARRAY_ELEMENT_SPEC_VAR_CONST_HANDLER(ZEND_OPC
        }
 
        if (IS_CONST != IS_UNUSED) {
-
+               
                zval *offset = opline->op2.zv;
                ulong hval;
 
@@ -16021,7 +16021,7 @@ static int ZEND_FASTCALL  ZEND_ISSET_ISEMPTY_VAR_SPEC_VAR_CONST_HANDLER(ZEND_OPC
                        ZVAL_BOOL(&EX_T(opline->result.var).tmp_var, 0);
                }
        } else /* if (opline->extended_value & ZEND_ISEMPTY) */ {
-               if (!isset || !i_zend_is_true(*value)) {
+               if (!isset || !i_zend_is_true(*value TSRMLS_CC)) {
                        ZVAL_BOOL(&EX_T(opline->result.var).tmp_var, 1);
                } else {
                        ZVAL_BOOL(&EX_T(opline->result.var).tmp_var, 0);
@@ -16093,7 +16093,7 @@ num_index_prop:
                                result = isset;
                        }
                } else /* if (opline->extended_value & ZEND_ISEMPTY) */ {
-                       if (!isset || !i_zend_is_true(*value)) {
+                       if (!isset || !i_zend_is_true(*value TSRMLS_CC)) {
                                result = 0;
                        } else {
                                result = 1;
@@ -16281,7 +16281,7 @@ static int ZEND_FASTCALL  ZEND_YIELD_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_
 
        /* Set the new yielded key */
        if (IS_CONST != IS_UNUSED) {
-
+               
                zval *key = opline->op2.zv;
 
                /* Consts, temporary variables and references need copying */
@@ -18160,7 +18160,7 @@ num_index_prop:
                                result = isset;
                        }
                } else /* if (opline->extended_value & ZEND_ISEMPTY) */ {
-                       if (!isset || !i_zend_is_true(*value)) {
+                       if (!isset || !i_zend_is_true(*value TSRMLS_CC)) {
                                result = 0;
                        } else {
                                result = 1;
@@ -19197,7 +19197,7 @@ static int ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_VAR_VAR(int type, ZE
                if (IS_VAR == IS_CONST) {
                        hash_value = Z_HASH_P(varname);
                } else {
-                       hash_value = str_hash(Z_STRVAL_P(varname), Z_STRLEN_P(varname));
+                       hash_value = str_hash(Z_STRVAL_P(varname), Z_STRLEN_P(varname));        
                }
 
                if (zend_hash_quick_find(target_symbol_table, Z_STRVAL_P(varname), Z_STRLEN_P(varname)+1, hash_value, (void **) &retval) == FAILURE) {
@@ -20535,7 +20535,7 @@ static int ZEND_FASTCALL  ZEND_ISSET_ISEMPTY_VAR_SPEC_VAR_VAR_HANDLER(ZEND_OPCOD
                        ZVAL_BOOL(&EX_T(opline->result.var).tmp_var, 0);
                }
        } else /* if (opline->extended_value & ZEND_ISEMPTY) */ {
-               if (!isset || !i_zend_is_true(*value)) {
+               if (!isset || !i_zend_is_true(*value TSRMLS_CC)) {
                        ZVAL_BOOL(&EX_T(opline->result.var).tmp_var, 1);
                } else {
                        ZVAL_BOOL(&EX_T(opline->result.var).tmp_var, 0);
@@ -20607,7 +20607,7 @@ num_index_prop:
                                result = isset;
                        }
                } else /* if (opline->extended_value & ZEND_ISEMPTY) */ {
-                       if (!isset || !i_zend_is_true(*value)) {
+                       if (!isset || !i_zend_is_true(*value TSRMLS_CC)) {
                                result = 0;
                        } else {
                                result = 1;
@@ -21162,7 +21162,7 @@ static int ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_VAR_UNUSED(int type,
                if (IS_VAR == IS_CONST) {
                        hash_value = Z_HASH_P(varname);
                } else {
-                       hash_value = str_hash(Z_STRVAL_P(varname), Z_STRLEN_P(varname));
+                       hash_value = str_hash(Z_STRVAL_P(varname), Z_STRLEN_P(varname));        
                }
 
                if (zend_hash_quick_find(target_symbol_table, Z_STRVAL_P(varname), Z_STRLEN_P(varname)+1, hash_value, (void **) &retval) == FAILURE) {
@@ -21371,7 +21371,7 @@ static int ZEND_FASTCALL  ZEND_ASSIGN_DIM_SPEC_VAR_UNUSED_HANDLER(ZEND_OPCODE_HA
                zend_error_noreturn(E_ERROR, "Cannot use string offset as an array");
        }
        if (Z_TYPE_PP(object_ptr) == IS_OBJECT) {
-
+               
                zval *property_name = NULL;
 
                if (0) {
@@ -21483,7 +21483,7 @@ static int ZEND_FASTCALL  ZEND_INIT_STATIC_METHOD_CALL_SPEC_VAR_UNUSED_HANDLER(Z
        } else if (IS_UNUSED != IS_UNUSED) {
                char *function_name_strval = NULL;
                int function_name_strlen = 0;
-
+               
 
                if (IS_UNUSED == IS_CONST) {
                        function_name_strval = Z_STRVAL_P(opline->op2.zv);
@@ -21599,7 +21599,7 @@ static int ZEND_FASTCALL  ZEND_ADD_ARRAY_ELEMENT_SPEC_VAR_UNUSED_HANDLER(ZEND_OP
        }
 
        if (IS_UNUSED != IS_UNUSED) {
-
+               
                zval *offset = NULL;
                ulong hval;
 
@@ -21808,7 +21808,7 @@ static int ZEND_FASTCALL  ZEND_ISSET_ISEMPTY_VAR_SPEC_VAR_UNUSED_HANDLER(ZEND_OP
                        ZVAL_BOOL(&EX_T(opline->result.var).tmp_var, 0);
                }
        } else /* if (opline->extended_value & ZEND_ISEMPTY) */ {
-               if (!isset || !i_zend_is_true(*value)) {
+               if (!isset || !i_zend_is_true(*value TSRMLS_CC)) {
                        ZVAL_BOOL(&EX_T(opline->result.var).tmp_var, 1);
                } else {
                        ZVAL_BOOL(&EX_T(opline->result.var).tmp_var, 0);
@@ -21942,7 +21942,7 @@ static int ZEND_FASTCALL  ZEND_YIELD_SPEC_VAR_UNUSED_HANDLER(ZEND_OPCODE_HANDLER
 
        /* Set the new yielded key */
        if (IS_UNUSED != IS_UNUSED) {
-
+               
                zval *key = NULL;
 
                /* Consts, temporary variables and references need copying */
@@ -22902,7 +22902,7 @@ static int ZEND_FASTCALL zend_fetch_property_address_read_helper_SPEC_VAR_CV(ZEN
        USE_OPLINE
        zend_free_op free_op1;
        zval *container;
-
+       
        zval *offset;
 
        SAVE_OPLINE();
@@ -23025,7 +23025,7 @@ static int ZEND_FASTCALL  ZEND_FETCH_OBJ_IS_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HAND
        USE_OPLINE
        zend_free_op free_op1;
        zval *container;
-
+       
        zval *offset;
 
        SAVE_OPLINE();
@@ -23185,7 +23185,7 @@ static int ZEND_FASTCALL  ZEND_ASSIGN_DIM_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLE
                zend_error_noreturn(E_ERROR, "Cannot use string offset as an array");
        }
        if (Z_TYPE_PP(object_ptr) == IS_OBJECT) {
-
+               
                zval *property_name = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op2.var TSRMLS_CC);
 
                if (0) {
@@ -23485,7 +23485,7 @@ static int ZEND_FASTCALL  ZEND_INIT_STATIC_METHOD_CALL_SPEC_VAR_CV_HANDLER(ZEND_
        } else if (IS_CV != IS_UNUSED) {
                char *function_name_strval = NULL;
                int function_name_strlen = 0;
-
+               
 
                if (IS_CV == IS_CONST) {
                        function_name_strval = Z_STRVAL_P(opline->op2.zv);
@@ -23615,7 +23615,7 @@ static int ZEND_FASTCALL  ZEND_ADD_ARRAY_ELEMENT_SPEC_VAR_CV_HANDLER(ZEND_OPCODE
        }
 
        if (IS_CV != IS_UNUSED) {
-
+               
                zval *offset = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op2.var TSRMLS_CC);
                ulong hval;
 
@@ -23870,7 +23870,7 @@ num_index_prop:
                                result = isset;
                        }
                } else /* if (opline->extended_value & ZEND_ISEMPTY) */ {
-                       if (!isset || !i_zend_is_true(*value)) {
+                       if (!isset || !i_zend_is_true(*value TSRMLS_CC)) {
                                result = 0;
                        } else {
                                result = 1;
@@ -24058,7 +24058,7 @@ static int ZEND_FASTCALL  ZEND_YIELD_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARG
 
        /* Set the new yielded key */
        if (IS_CV != IS_UNUSED) {
-
+               
                zval *key = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op2.var TSRMLS_CC);
 
                /* Consts, temporary variables and references need copying */
@@ -24119,7 +24119,7 @@ static int ZEND_FASTCALL  ZEND_YIELD_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARG
 static int ZEND_FASTCALL  ZEND_CLONE_SPEC_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *obj;
        zend_class_entry *ce;
        zend_function *clone;
@@ -24189,7 +24189,7 @@ static int ZEND_FASTCALL  ZEND_EXIT_SPEC_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS
 
        SAVE_OPLINE();
        if (IS_UNUSED != IS_UNUSED) {
-
+               
                zval *ptr = NULL;
 
                if (Z_TYPE_P(ptr) == IS_LONG) {
@@ -24458,7 +24458,7 @@ static int ZEND_FASTCALL  ZEND_ASSIGN_BW_XOR_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCO
 static int ZEND_FASTCALL zend_pre_incdec_property_helper_SPEC_UNUSED_CONST(incdec_t incdec_op, ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval **object_ptr;
        zval *object;
        zval *property;
@@ -24562,7 +24562,7 @@ static int ZEND_FASTCALL  ZEND_PRE_DEC_OBJ_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE
 static int ZEND_FASTCALL zend_post_incdec_property_helper_SPEC_UNUSED_CONST(incdec_t incdec_op, ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval **object_ptr;
        zval *object;
        zval *property;
@@ -24664,9 +24664,9 @@ static int ZEND_FASTCALL  ZEND_POST_DEC_OBJ_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCOD
 static int ZEND_FASTCALL zend_fetch_property_address_read_helper_SPEC_UNUSED_CONST(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *container;
-
+       
        zval *offset;
 
        SAVE_OPLINE();
@@ -24785,9 +24785,9 @@ static int ZEND_FASTCALL  ZEND_FETCH_OBJ_RW_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCOD
 static int ZEND_FASTCALL  ZEND_FETCH_OBJ_IS_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *container;
-
+       
        zval *offset;
 
        SAVE_OPLINE();
@@ -24905,7 +24905,7 @@ static int ZEND_FASTCALL  ZEND_FETCH_OBJ_UNSET_SPEC_UNUSED_CONST_HANDLER(ZEND_OP
 static int ZEND_FASTCALL  ZEND_ASSIGN_OBJ_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval **object_ptr;
        zval *property_name;
 
@@ -24984,7 +24984,7 @@ static int ZEND_FASTCALL  ZEND_INIT_METHOD_CALL_SPEC_UNUSED_CONST_HANDLER(ZEND_O
        zval *function_name;
        char *function_name_strval;
        int function_name_strlen;
-
+       
        call_slot *call = EX(call_slots) + opline->result.num;
 
        SAVE_OPLINE();
@@ -25170,7 +25170,7 @@ static int ZEND_FASTCALL  ZEND_INIT_ARRAY_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_
 static int ZEND_FASTCALL  ZEND_UNSET_DIM_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval **container;
        zval *offset;
        ulong hval;
@@ -25265,7 +25265,7 @@ num_index_dim:
 static int ZEND_FASTCALL  ZEND_UNSET_OBJ_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval **container;
        zval *offset;
 
@@ -25305,7 +25305,7 @@ static int ZEND_FASTCALL  ZEND_UNSET_OBJ_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_H
 static int ZEND_FASTCALL zend_isset_isempty_dim_prop_obj_handler_SPEC_UNUSED_CONST(int prop_dim, ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *container;
        zval **value = NULL;
        int result = 0;
@@ -25363,7 +25363,7 @@ num_index_prop:
                                result = isset;
                        }
                } else /* if (opline->extended_value & ZEND_ISEMPTY) */ {
-                       if (!isset || !i_zend_is_true(*value)) {
+                       if (!isset || !i_zend_is_true(*value TSRMLS_CC)) {
                                result = 0;
                        } else {
                                result = 1;
@@ -25470,7 +25470,7 @@ static int ZEND_FASTCALL  ZEND_YIELD_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDL
 
        /* Set the new yielded value */
        if (IS_UNUSED != IS_UNUSED) {
-
+               
 
                if (EX(op_array)->fn_flags & ZEND_ACC_RETURN_REFERENCE) {
                        /* Constants and temporary variables aren't yieldable by reference,
@@ -25548,7 +25548,7 @@ static int ZEND_FASTCALL  ZEND_YIELD_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDL
 
        /* Set the new yielded key */
        if (IS_CONST != IS_UNUSED) {
-
+               
                zval *key = opline->op2.zv;
 
                /* Consts, temporary variables and references need copying */
@@ -26067,7 +26067,7 @@ static int ZEND_FASTCALL  ZEND_POST_DEC_OBJ_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_
 static int ZEND_FASTCALL zend_fetch_property_address_read_helper_SPEC_UNUSED_TMP(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *container;
        zend_free_op free_op2;
        zval *offset;
@@ -26188,7 +26188,7 @@ static int ZEND_FASTCALL  ZEND_FETCH_OBJ_RW_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_
 static int ZEND_FASTCALL  ZEND_FETCH_OBJ_IS_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *container;
        zend_free_op free_op2;
        zval *offset;
@@ -26670,7 +26670,7 @@ num_index_prop:
                                result = isset;
                        }
                } else /* if (opline->extended_value & ZEND_ISEMPTY) */ {
-                       if (!isset || !i_zend_is_true(*value)) {
+                       if (!isset || !i_zend_is_true(*value TSRMLS_CC)) {
                                result = 0;
                        } else {
                                result = 1;
@@ -26777,7 +26777,7 @@ static int ZEND_FASTCALL  ZEND_YIELD_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HANDLER
 
        /* Set the new yielded value */
        if (IS_UNUSED != IS_UNUSED) {
-
+               
 
                if (EX(op_array)->fn_flags & ZEND_ACC_RETURN_REFERENCE) {
                        /* Constants and temporary variables aren't yieldable by reference,
@@ -27374,7 +27374,7 @@ static int ZEND_FASTCALL  ZEND_POST_DEC_OBJ_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_
 static int ZEND_FASTCALL zend_fetch_property_address_read_helper_SPEC_UNUSED_VAR(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *container;
        zend_free_op free_op2;
        zval *offset;
@@ -27495,7 +27495,7 @@ static int ZEND_FASTCALL  ZEND_FETCH_OBJ_RW_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_
 static int ZEND_FASTCALL  ZEND_FETCH_OBJ_IS_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *container;
        zend_free_op free_op2;
        zval *offset;
@@ -27977,7 +27977,7 @@ num_index_prop:
                                result = isset;
                        }
                } else /* if (opline->extended_value & ZEND_ISEMPTY) */ {
-                       if (!isset || !i_zend_is_true(*value)) {
+                       if (!isset || !i_zend_is_true(*value TSRMLS_CC)) {
                                result = 0;
                        } else {
                                result = 1;
@@ -28084,7 +28084,7 @@ static int ZEND_FASTCALL  ZEND_YIELD_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_HANDLER
 
        /* Set the new yielded value */
        if (IS_UNUSED != IS_UNUSED) {
-
+               
 
                if (EX(op_array)->fn_flags & ZEND_ACC_RETURN_REFERENCE) {
                        /* Constants and temporary variables aren't yieldable by reference,
@@ -28509,7 +28509,7 @@ static int ZEND_FASTCALL  ZEND_YIELD_SPEC_UNUSED_UNUSED_HANDLER(ZEND_OPCODE_HAND
 
        /* Set the new yielded value */
        if (IS_UNUSED != IS_UNUSED) {
-
+               
 
                if (EX(op_array)->fn_flags & ZEND_ACC_RETURN_REFERENCE) {
                        /* Constants and temporary variables aren't yieldable by reference,
@@ -28587,7 +28587,7 @@ static int ZEND_FASTCALL  ZEND_YIELD_SPEC_UNUSED_UNUSED_HANDLER(ZEND_OPCODE_HAND
 
        /* Set the new yielded key */
        if (IS_UNUSED != IS_UNUSED) {
-
+               
                zval *key = NULL;
 
                /* Consts, temporary variables and references need copying */
@@ -28899,7 +28899,7 @@ static int ZEND_FASTCALL  ZEND_ASSIGN_BW_XOR_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_
 static int ZEND_FASTCALL zend_pre_incdec_property_helper_SPEC_UNUSED_CV(incdec_t incdec_op, ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval **object_ptr;
        zval *object;
        zval *property;
@@ -29003,7 +29003,7 @@ static int ZEND_FASTCALL  ZEND_PRE_DEC_OBJ_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HA
 static int ZEND_FASTCALL zend_post_incdec_property_helper_SPEC_UNUSED_CV(incdec_t incdec_op, ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval **object_ptr;
        zval *object;
        zval *property;
@@ -29105,9 +29105,9 @@ static int ZEND_FASTCALL  ZEND_POST_DEC_OBJ_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_H
 static int ZEND_FASTCALL zend_fetch_property_address_read_helper_SPEC_UNUSED_CV(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *container;
-
+       
        zval *offset;
 
        SAVE_OPLINE();
@@ -29226,9 +29226,9 @@ static int ZEND_FASTCALL  ZEND_FETCH_OBJ_RW_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_H
 static int ZEND_FASTCALL  ZEND_FETCH_OBJ_IS_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *container;
-
+       
        zval *offset;
 
        SAVE_OPLINE();
@@ -29346,7 +29346,7 @@ static int ZEND_FASTCALL  ZEND_FETCH_OBJ_UNSET_SPEC_UNUSED_CV_HANDLER(ZEND_OPCOD
 static int ZEND_FASTCALL  ZEND_ASSIGN_OBJ_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval **object_ptr;
        zval *property_name;
 
@@ -29376,7 +29376,7 @@ static int ZEND_FASTCALL  ZEND_ASSIGN_OBJ_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HAN
 static int ZEND_FASTCALL  ZEND_ADD_VAR_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *str = &EX_T(opline->result.var).tmp_var;
        zval *var;
        zval var_copy;
@@ -29423,7 +29423,7 @@ static int ZEND_FASTCALL  ZEND_INIT_METHOD_CALL_SPEC_UNUSED_CV_HANDLER(ZEND_OPCO
        zval *function_name;
        char *function_name_strval;
        int function_name_strlen;
-
+       
        call_slot *call = EX(call_slots) + opline->result.num;
 
        SAVE_OPLINE();
@@ -29513,7 +29513,7 @@ static int ZEND_FASTCALL  ZEND_INIT_ARRAY_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HAN
 static int ZEND_FASTCALL  ZEND_UNSET_DIM_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval **container;
        zval *offset;
        ulong hval;
@@ -29608,7 +29608,7 @@ num_index_dim:
 static int ZEND_FASTCALL  ZEND_UNSET_OBJ_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval **container;
        zval *offset;
 
@@ -29648,7 +29648,7 @@ static int ZEND_FASTCALL  ZEND_UNSET_OBJ_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HAND
 static int ZEND_FASTCALL zend_isset_isempty_dim_prop_obj_handler_SPEC_UNUSED_CV(int prop_dim, ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *container;
        zval **value = NULL;
        int result = 0;
@@ -29706,7 +29706,7 @@ num_index_prop:
                                result = isset;
                        }
                } else /* if (opline->extended_value & ZEND_ISEMPTY) */ {
-                       if (!isset || !i_zend_is_true(*value)) {
+                       if (!isset || !i_zend_is_true(*value TSRMLS_CC)) {
                                result = 0;
                        } else {
                                result = 1;
@@ -29813,7 +29813,7 @@ static int ZEND_FASTCALL  ZEND_YIELD_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_
 
        /* Set the new yielded value */
        if (IS_UNUSED != IS_UNUSED) {
-
+               
 
                if (EX(op_array)->fn_flags & ZEND_ACC_RETURN_REFERENCE) {
                        /* Constants and temporary variables aren't yieldable by reference,
@@ -29891,7 +29891,7 @@ static int ZEND_FASTCALL  ZEND_YIELD_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_
 
        /* Set the new yielded key */
        if (IS_CV != IS_UNUSED) {
-
+               
                zval *key = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op2.var TSRMLS_CC);
 
                /* Consts, temporary variables and references need copying */
@@ -29952,7 +29952,7 @@ static int ZEND_FASTCALL  ZEND_YIELD_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_
 static int ZEND_FASTCALL  ZEND_BW_NOT_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
 
        SAVE_OPLINE();
        bitwise_not_function(&EX_T(opline->result.var).tmp_var,
@@ -29965,7 +29965,7 @@ static int ZEND_FASTCALL  ZEND_BW_NOT_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_FASTCALL  ZEND_BOOL_NOT_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
 
        SAVE_OPLINE();
        boolean_not_function(&EX_T(opline->result.var).tmp_var,
@@ -29978,7 +29978,7 @@ static int ZEND_FASTCALL  ZEND_BOOL_NOT_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS
 static int ZEND_FASTCALL  ZEND_PRE_INC_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval **var_ptr;
 
        SAVE_OPLINE();
@@ -30024,7 +30024,7 @@ static int ZEND_FASTCALL  ZEND_PRE_INC_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_FASTCALL  ZEND_PRE_DEC_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval **var_ptr;
 
        SAVE_OPLINE();
@@ -30070,7 +30070,7 @@ static int ZEND_FASTCALL  ZEND_PRE_DEC_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_FASTCALL  ZEND_POST_INC_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval **var_ptr, *retval;
 
        SAVE_OPLINE();
@@ -30112,7 +30112,7 @@ static int ZEND_FASTCALL  ZEND_POST_INC_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS
 static int ZEND_FASTCALL  ZEND_POST_DEC_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval **var_ptr, *retval;
 
        SAVE_OPLINE();
@@ -30154,7 +30154,7 @@ static int ZEND_FASTCALL  ZEND_POST_DEC_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS
 static int ZEND_FASTCALL  ZEND_ECHO_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *z;
 
        SAVE_OPLINE();
@@ -30180,7 +30180,7 @@ static int ZEND_FASTCALL  ZEND_PRINT_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_FASTCALL  ZEND_JMPZ_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *val;
        int ret;
 
@@ -30190,7 +30190,7 @@ static int ZEND_FASTCALL  ZEND_JMPZ_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        if (IS_CV == IS_TMP_VAR && EXPECTED(Z_TYPE_P(val) == IS_BOOL)) {
                ret = Z_LVAL_P(val);
        } else {
-               ret = i_zend_is_true(val);
+               ret = i_zend_is_true(val TSRMLS_CC);
 
                if (UNEXPECTED(EG(exception) != NULL)) {
                        HANDLE_EXCEPTION();
@@ -30210,7 +30210,7 @@ static int ZEND_FASTCALL  ZEND_JMPZ_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_FASTCALL  ZEND_JMPNZ_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *val;
        int ret;
 
@@ -30220,7 +30220,7 @@ static int ZEND_FASTCALL  ZEND_JMPNZ_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        if (IS_CV == IS_TMP_VAR && EXPECTED(Z_TYPE_P(val) == IS_BOOL)) {
                ret = Z_LVAL_P(val);
        } else {
-               ret = i_zend_is_true(val);
+               ret = i_zend_is_true(val TSRMLS_CC);
 
                if (UNEXPECTED(EG(exception) != NULL)) {
                        HANDLE_EXCEPTION();
@@ -30240,7 +30240,7 @@ static int ZEND_FASTCALL  ZEND_JMPNZ_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_FASTCALL  ZEND_JMPZNZ_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *val;
        int retval;
 
@@ -30250,7 +30250,7 @@ static int ZEND_FASTCALL  ZEND_JMPZNZ_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        if (IS_CV == IS_TMP_VAR && EXPECTED(Z_TYPE_P(val) == IS_BOOL)) {
                retval = Z_LVAL_P(val);
        } else {
-               retval = i_zend_is_true(val);
+               retval = i_zend_is_true(val TSRMLS_CC);
 
                if (UNEXPECTED(EG(exception) != NULL)) {
                        HANDLE_EXCEPTION();
@@ -30274,7 +30274,7 @@ static int ZEND_FASTCALL  ZEND_JMPZNZ_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_FASTCALL  ZEND_JMPZ_EX_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *val;
        int retval;
 
@@ -30284,7 +30284,7 @@ static int ZEND_FASTCALL  ZEND_JMPZ_EX_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        if (IS_CV == IS_TMP_VAR && EXPECTED(Z_TYPE_P(val) == IS_BOOL)) {
                retval = Z_LVAL_P(val);
        } else {
-               retval = i_zend_is_true(val);
+               retval = i_zend_is_true(val TSRMLS_CC);
 
                if (UNEXPECTED(EG(exception) != NULL)) {
                        HANDLE_EXCEPTION();
@@ -30305,7 +30305,7 @@ static int ZEND_FASTCALL  ZEND_JMPZ_EX_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_FASTCALL  ZEND_JMPNZ_EX_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *val;
        int retval;
 
@@ -30315,7 +30315,7 @@ static int ZEND_FASTCALL  ZEND_JMPNZ_EX_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS
        if (IS_CV == IS_TMP_VAR && EXPECTED(Z_TYPE_P(val) == IS_BOOL)) {
                retval = Z_LVAL_P(val);
        } else {
-               retval = i_zend_is_true(val);
+               retval = i_zend_is_true(val TSRMLS_CC);
 
                if (UNEXPECTED(EG(exception) != NULL)) {
                        HANDLE_EXCEPTION();
@@ -30337,7 +30337,7 @@ static int ZEND_FASTCALL  ZEND_RETURN_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
        zval *retval_ptr;
-
+       
 
        SAVE_OPLINE();
        retval_ptr = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op1.var TSRMLS_CC);
@@ -30381,12 +30381,12 @@ static int ZEND_FASTCALL  ZEND_RETURN_BY_REF_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER
        USE_OPLINE
        zval *retval_ptr;
        zval **retval_ptr_ptr;
-
+       
 
        SAVE_OPLINE();
 
        do {
-               if (IS_CV == IS_CONST || IS_CV == IS_TMP_VAR ||
+               if (IS_CV == IS_CONST || IS_CV == IS_TMP_VAR || 
                    (IS_CV == IS_VAR && opline->extended_value == ZEND_RETURNS_VALUE)) {
                        /* Not supposed to happen, but we'll allow it */
                        zend_error(E_NOTICE, "Only variable references should be returned by reference");
@@ -30452,7 +30452,7 @@ static int ZEND_FASTCALL  ZEND_THROW_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        USE_OPLINE
        zval *value;
        zval *exception;
-
+       
 
        SAVE_OPLINE();
        value = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op1.var TSRMLS_CC);
@@ -30482,7 +30482,7 @@ static int ZEND_FASTCALL zend_send_by_var_helper_SPEC_CV(ZEND_OPCODE_HANDLER_ARG
 {
        USE_OPLINE
        zval *varptr;
-
+       
        varptr = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op1.var TSRMLS_CC);
 
        if (varptr == &EG(uninitialized_zval)) {
@@ -30514,7 +30514,7 @@ static int ZEND_FASTCALL zend_send_by_var_helper_SPEC_CV(ZEND_OPCODE_HANDLER_ARG
 static int ZEND_FASTCALL  ZEND_SEND_VAR_NO_REF_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *varptr;
 
        SAVE_OPLINE();
@@ -30559,7 +30559,7 @@ static int ZEND_FASTCALL  ZEND_SEND_VAR_NO_REF_SPEC_CV_HANDLER(ZEND_OPCODE_HANDL
 static int ZEND_FASTCALL  ZEND_SEND_REF_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval **varptr_ptr;
        zval *varptr;
 
@@ -30607,12 +30607,12 @@ static int ZEND_FASTCALL  ZEND_SEND_VAR_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS
 static int ZEND_FASTCALL  ZEND_BOOL_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *retval = &EX_T(opline->result.var).tmp_var;
 
        SAVE_OPLINE();
        /* PHP 3.0 returned "" for false and 1 for true, here we use 0 and 1 for now */
-       ZVAL_BOOL(retval, i_zend_is_true(_get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op1.var TSRMLS_CC)));
+       ZVAL_BOOL(retval, i_zend_is_true(_get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op1.var TSRMLS_CC) TSRMLS_CC));
 
        CHECK_EXCEPTION();
        ZEND_VM_NEXT_OPCODE();
@@ -30621,7 +30621,7 @@ static int ZEND_FASTCALL  ZEND_BOOL_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_FASTCALL  ZEND_CLONE_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *obj;
        zend_class_entry *ce;
        zend_function *clone;
@@ -30687,7 +30687,7 @@ static int ZEND_FASTCALL  ZEND_CLONE_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_FASTCALL  ZEND_CAST_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *expr;
        zval *result = &EX_T(opline->result.var).tmp_var;
 
@@ -30747,7 +30747,7 @@ static int ZEND_FASTCALL  ZEND_INCLUDE_OR_EVAL_SPEC_CV_HANDLER(ZEND_OPCODE_HANDL
 {
        USE_OPLINE
        zend_op_array *new_op_array=NULL;
-
+       
        zval *inc_filename;
        zval *tmp_inc_filename = NULL;
        zend_bool failure_retval=0;
@@ -30879,7 +30879,7 @@ static int ZEND_FASTCALL  ZEND_INCLUDE_OR_EVAL_SPEC_CV_HANDLER(ZEND_OPCODE_HANDL
 static int ZEND_FASTCALL  ZEND_FE_RESET_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *array_ptr, **array_ptr_ptr;
        HashTable *fe_ht;
        zend_object_iterator *iter = NULL;
@@ -30938,7 +30938,7 @@ static int ZEND_FASTCALL  ZEND_FE_RESET_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS
                                }
                        }
                } else if (IS_CV == IS_CONST ||
-                          (IS_CV == IS_CV &&
+                          (IS_CV == IS_CV && 
                            !Z_ISREF_P(array_ptr) &&
                            Z_REFCOUNT_P(array_ptr) > 1) ||
                           (IS_CV == IS_VAR &&
@@ -31045,7 +31045,7 @@ static int ZEND_FASTCALL  ZEND_EXIT_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 
        SAVE_OPLINE();
        if (IS_CV != IS_UNUSED) {
-
+               
                zval *ptr = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op1.var TSRMLS_CC);
 
                if (Z_TYPE_P(ptr) == IS_LONG) {
@@ -31063,13 +31063,13 @@ static int ZEND_FASTCALL  ZEND_EXIT_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_FASTCALL  ZEND_JMP_SET_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *value;
 
        SAVE_OPLINE();
        value = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op1.var TSRMLS_CC);
 
-       if (i_zend_is_true(value)) {
+       if (i_zend_is_true(value TSRMLS_CC)) {
                ZVAL_COPY_VALUE(&EX_T(opline->result.var).tmp_var, value);
                if (!0) {
                        zendi_zval_copy_ctor(EX_T(opline->result.var).tmp_var);
@@ -31088,13 +31088,13 @@ static int ZEND_FASTCALL  ZEND_JMP_SET_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_FASTCALL  ZEND_JMP_SET_VAR_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *value, *ret;
 
        SAVE_OPLINE();
        value = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op1.var TSRMLS_CC);
 
-       if (i_zend_is_true(value)) {
+       if (i_zend_is_true(value TSRMLS_CC)) {
                if (IS_CV == IS_VAR || IS_CV == IS_CV) {
                        Z_ADDREF_P(value);
                        EX_T(opline->result.var).var.ptr = value;
@@ -31122,7 +31122,7 @@ static int ZEND_FASTCALL  ZEND_JMP_SET_VAR_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_A
 static int ZEND_FASTCALL  ZEND_QM_ASSIGN_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *value;
 
        SAVE_OPLINE();
@@ -31140,7 +31140,7 @@ static int ZEND_FASTCALL  ZEND_QM_ASSIGN_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARG
 static int ZEND_FASTCALL  ZEND_QM_ASSIGN_VAR_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *value, *ret;
 
        SAVE_OPLINE();
@@ -31167,7 +31167,7 @@ static int ZEND_FASTCALL  ZEND_QM_ASSIGN_VAR_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER
 static int ZEND_FASTCALL  ZEND_INSTANCEOF_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *expr;
        zend_bool result;
 
@@ -31188,7 +31188,7 @@ static int ZEND_FASTCALL  ZEND_INSTANCEOF_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_AR
 static int ZEND_FASTCALL  ZEND_ADD_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
 
        SAVE_OPLINE();
        fast_add_function(&EX_T(opline->result.var).tmp_var,
@@ -31203,7 +31203,7 @@ static int ZEND_FASTCALL  ZEND_ADD_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARG
 static int ZEND_FASTCALL  ZEND_SUB_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
 
        SAVE_OPLINE();
        fast_sub_function(&EX_T(opline->result.var).tmp_var,
@@ -31218,7 +31218,7 @@ static int ZEND_FASTCALL  ZEND_SUB_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARG
 static int ZEND_FASTCALL  ZEND_MUL_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
 
        SAVE_OPLINE();
        fast_mul_function(&EX_T(opline->result.var).tmp_var,
@@ -31233,7 +31233,7 @@ static int ZEND_FASTCALL  ZEND_MUL_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARG
 static int ZEND_FASTCALL  ZEND_DIV_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
 
        SAVE_OPLINE();
        fast_div_function(&EX_T(opline->result.var).tmp_var,
@@ -31248,7 +31248,7 @@ static int ZEND_FASTCALL  ZEND_DIV_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARG
 static int ZEND_FASTCALL  ZEND_MOD_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
 
        SAVE_OPLINE();
        fast_mod_function(&EX_T(opline->result.var).tmp_var,
@@ -31263,7 +31263,7 @@ static int ZEND_FASTCALL  ZEND_MOD_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARG
 static int ZEND_FASTCALL  ZEND_SL_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
 
        SAVE_OPLINE();
        shift_left_function(&EX_T(opline->result.var).tmp_var,
@@ -31278,7 +31278,7 @@ static int ZEND_FASTCALL  ZEND_SL_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS
 static int ZEND_FASTCALL  ZEND_SR_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
 
        SAVE_OPLINE();
        shift_right_function(&EX_T(opline->result.var).tmp_var,
@@ -31293,7 +31293,7 @@ static int ZEND_FASTCALL  ZEND_SR_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS
 static int ZEND_FASTCALL  ZEND_CONCAT_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
 
        SAVE_OPLINE();
        concat_function(&EX_T(opline->result.var).tmp_var,
@@ -31308,7 +31308,7 @@ static int ZEND_FASTCALL  ZEND_CONCAT_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_
 static int ZEND_FASTCALL  ZEND_IS_IDENTICAL_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
 
        SAVE_OPLINE();
        is_identical_function(&EX_T(opline->result.var).tmp_var,
@@ -31323,7 +31323,7 @@ static int ZEND_FASTCALL  ZEND_IS_IDENTICAL_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HA
 static int ZEND_FASTCALL  ZEND_IS_NOT_IDENTICAL_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *result = &EX_T(opline->result.var).tmp_var;
 
        SAVE_OPLINE();
@@ -31340,7 +31340,7 @@ static int ZEND_FASTCALL  ZEND_IS_NOT_IDENTICAL_SPEC_CV_CONST_HANDLER(ZEND_OPCOD
 static int ZEND_FASTCALL  ZEND_IS_EQUAL_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *result = &EX_T(opline->result.var).tmp_var;
 
        SAVE_OPLINE();
@@ -31356,7 +31356,7 @@ static int ZEND_FASTCALL  ZEND_IS_EQUAL_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLE
 static int ZEND_FASTCALL  ZEND_IS_NOT_EQUAL_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *result = &EX_T(opline->result.var).tmp_var;
 
        SAVE_OPLINE();
@@ -31372,7 +31372,7 @@ static int ZEND_FASTCALL  ZEND_IS_NOT_EQUAL_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HA
 static int ZEND_FASTCALL  ZEND_IS_SMALLER_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *result = &EX_T(opline->result.var).tmp_var;
 
        SAVE_OPLINE();
@@ -31388,7 +31388,7 @@ static int ZEND_FASTCALL  ZEND_IS_SMALLER_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HAND
 static int ZEND_FASTCALL  ZEND_IS_SMALLER_OR_EQUAL_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *result = &EX_T(opline->result.var).tmp_var;
 
        SAVE_OPLINE();
@@ -31404,7 +31404,7 @@ static int ZEND_FASTCALL  ZEND_IS_SMALLER_OR_EQUAL_SPEC_CV_CONST_HANDLER(ZEND_OP
 static int ZEND_FASTCALL  ZEND_BW_OR_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
 
        SAVE_OPLINE();
        bitwise_or_function(&EX_T(opline->result.var).tmp_var,
@@ -31419,7 +31419,7 @@ static int ZEND_FASTCALL  ZEND_BW_OR_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_A
 static int ZEND_FASTCALL  ZEND_BW_AND_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
 
        SAVE_OPLINE();
        bitwise_and_function(&EX_T(opline->result.var).tmp_var,
@@ -31434,7 +31434,7 @@ static int ZEND_FASTCALL  ZEND_BW_AND_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_
 static int ZEND_FASTCALL  ZEND_BW_XOR_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
 
        SAVE_OPLINE();
        bitwise_xor_function(&EX_T(opline->result.var).tmp_var,
@@ -31449,7 +31449,7 @@ static int ZEND_FASTCALL  ZEND_BW_XOR_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_
 static int ZEND_FASTCALL  ZEND_BOOL_XOR_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
 
        SAVE_OPLINE();
        boolean_xor_function(&EX_T(opline->result.var).tmp_var,
@@ -31715,7 +31715,7 @@ static int ZEND_FASTCALL  ZEND_ASSIGN_BW_XOR_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_H
 static int ZEND_FASTCALL zend_pre_incdec_property_helper_SPEC_CV_CONST(incdec_t incdec_op, ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval **object_ptr;
        zval *object;
        zval *property;
@@ -31819,7 +31819,7 @@ static int ZEND_FASTCALL  ZEND_PRE_DEC_OBJ_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HAN
 static int ZEND_FASTCALL zend_post_incdec_property_helper_SPEC_CV_CONST(incdec_t incdec_op, ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval **object_ptr;
        zval *object;
        zval *property;
@@ -31974,7 +31974,7 @@ static int ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_CV_CONST(int type, Z
                if (IS_CV == IS_CONST) {
                        hash_value = Z_HASH_P(varname);
                } else {
-                       hash_value = str_hash(Z_STRVAL_P(varname), Z_STRLEN_P(varname));
+                       hash_value = str_hash(Z_STRVAL_P(varname), Z_STRLEN_P(varname));        
                }
 
                if (zend_hash_quick_find(target_symbol_table, Z_STRVAL_P(varname), Z_STRLEN_P(varname)+1, hash_value, (void **) &retval) == FAILURE) {
@@ -32083,7 +32083,7 @@ static int ZEND_FASTCALL  ZEND_FETCH_IS_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLE
 static int ZEND_FASTCALL  ZEND_FETCH_DIM_R_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *container;
 
        SAVE_OPLINE();
@@ -32155,7 +32155,7 @@ static int ZEND_FASTCALL  ZEND_FETCH_DIM_RW_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HA
 static int ZEND_FASTCALL  ZEND_FETCH_DIM_IS_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *container;
 
        SAVE_OPLINE();
@@ -32245,9 +32245,9 @@ static int ZEND_FASTCALL  ZEND_FETCH_DIM_UNSET_SPEC_CV_CONST_HANDLER(ZEND_OPCODE
 static int ZEND_FASTCALL zend_fetch_property_address_read_helper_SPEC_CV_CONST(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *container;
-
+       
        zval *offset;
 
        SAVE_OPLINE();
@@ -32366,9 +32366,9 @@ static int ZEND_FASTCALL  ZEND_FETCH_OBJ_RW_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HA
 static int ZEND_FASTCALL  ZEND_FETCH_OBJ_IS_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *container;
-
+       
        zval *offset;
 
        SAVE_OPLINE();
@@ -32486,7 +32486,7 @@ static int ZEND_FASTCALL  ZEND_FETCH_OBJ_UNSET_SPEC_CV_CONST_HANDLER(ZEND_OPCODE
 static int ZEND_FASTCALL  ZEND_ASSIGN_OBJ_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval **object_ptr;
        zval *property_name;
 
@@ -32516,7 +32516,7 @@ static int ZEND_FASTCALL  ZEND_ASSIGN_OBJ_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HAND
 static int ZEND_FASTCALL  ZEND_ASSIGN_DIM_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval **object_ptr;
 
        SAVE_OPLINE();
@@ -32526,7 +32526,7 @@ static int ZEND_FASTCALL  ZEND_ASSIGN_DIM_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HAND
                zend_error_noreturn(E_ERROR, "Cannot use string offset as an array");
        }
        if (Z_TYPE_PP(object_ptr) == IS_OBJECT) {
-
+               
                zval *property_name = opline->op2.zv;
 
                if (0) {
@@ -32596,7 +32596,7 @@ static int ZEND_FASTCALL  ZEND_ASSIGN_DIM_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HAND
 static int ZEND_FASTCALL  ZEND_ASSIGN_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *value;
        zval **variable_ptr_ptr;
 
@@ -32652,7 +32652,7 @@ static int ZEND_FASTCALL  ZEND_INIT_METHOD_CALL_SPEC_CV_CONST_HANDLER(ZEND_OPCOD
        zval *function_name;
        char *function_name_strval;
        int function_name_strlen;
-
+       
        call_slot *call = EX(call_slots) + opline->result.num;
 
        SAVE_OPLINE();
@@ -32728,7 +32728,7 @@ static int ZEND_FASTCALL  ZEND_INIT_METHOD_CALL_SPEC_CV_CONST_HANDLER(ZEND_OPCOD
 static int ZEND_FASTCALL  ZEND_CASE_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
 
        SAVE_OPLINE();
        is_equal_function(&EX_T(opline->result.var).tmp_var,
@@ -32742,7 +32742,7 @@ static int ZEND_FASTCALL  ZEND_CASE_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_AR
 static int ZEND_FASTCALL  ZEND_ADD_ARRAY_ELEMENT_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *expr_ptr;
 
        SAVE_OPLINE();
@@ -32777,7 +32777,7 @@ static int ZEND_FASTCALL  ZEND_ADD_ARRAY_ELEMENT_SPEC_CV_CONST_HANDLER(ZEND_OPCO
        }
 
        if (IS_CONST != IS_UNUSED) {
-
+               
                zval *offset = opline->op2.zv;
                ulong hval;
 
@@ -32839,7 +32839,7 @@ static int ZEND_FASTCALL  ZEND_UNSET_VAR_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDL
        USE_OPLINE
        zval tmp, *varname;
        HashTable *target_symbol_table;
-
+       
 
        SAVE_OPLINE();
        if (IS_CV == IS_CV &&
@@ -32915,7 +32915,7 @@ static int ZEND_FASTCALL  ZEND_UNSET_VAR_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDL
 static int ZEND_FASTCALL  ZEND_UNSET_DIM_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval **container;
        zval *offset;
        ulong hval;
@@ -33010,7 +33010,7 @@ num_index_dim:
 static int ZEND_FASTCALL  ZEND_UNSET_OBJ_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval **container;
        zval *offset;
 
@@ -33070,7 +33070,7 @@ static int ZEND_FASTCALL  ZEND_ISSET_ISEMPTY_VAR_SPEC_CV_CONST_HANDLER(ZEND_OPCO
                }
        } else {
                HashTable *target_symbol_table;
-
+               
                zval tmp, *varname = _get_zval_ptr_cv_BP_VAR_IS(execute_data, opline->op1.var TSRMLS_CC);
 
                if (IS_CV != IS_CONST && Z_TYPE_P(varname) != IS_STRING) {
@@ -33121,7 +33121,7 @@ static int ZEND_FASTCALL  ZEND_ISSET_ISEMPTY_VAR_SPEC_CV_CONST_HANDLER(ZEND_OPCO
                        ZVAL_BOOL(&EX_T(opline->result.var).tmp_var, 0);
                }
        } else /* if (opline->extended_value & ZEND_ISEMPTY) */ {
-               if (!isset || !i_zend_is_true(*value)) {
+               if (!isset || !i_zend_is_true(*value TSRMLS_CC)) {
                        ZVAL_BOOL(&EX_T(opline->result.var).tmp_var, 1);
                } else {
                        ZVAL_BOOL(&EX_T(opline->result.var).tmp_var, 0);
@@ -33135,7 +33135,7 @@ static int ZEND_FASTCALL  ZEND_ISSET_ISEMPTY_VAR_SPEC_CV_CONST_HANDLER(ZEND_OPCO
 static int ZEND_FASTCALL zend_isset_isempty_dim_prop_obj_handler_SPEC_CV_CONST(int prop_dim, ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *container;
        zval **value = NULL;
        int result = 0;
@@ -33193,7 +33193,7 @@ num_index_prop:
                                result = isset;
                        }
                } else /* if (opline->extended_value & ZEND_ISEMPTY) */ {
-                       if (!isset || !i_zend_is_true(*value)) {
+                       if (!isset || !i_zend_is_true(*value TSRMLS_CC)) {
                                result = 0;
                        } else {
                                result = 1;
@@ -33300,7 +33300,7 @@ static int ZEND_FASTCALL  ZEND_YIELD_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_A
 
        /* Set the new yielded value */
        if (IS_CV != IS_UNUSED) {
-
+               
 
                if (EX(op_array)->fn_flags & ZEND_ACC_RETURN_REFERENCE) {
                        /* Constants and temporary variables aren't yieldable by reference,
@@ -33378,7 +33378,7 @@ static int ZEND_FASTCALL  ZEND_YIELD_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_A
 
        /* Set the new yielded key */
        if (IS_CONST != IS_UNUSED) {
-
+               
                zval *key = opline->op2.zv;
 
                /* Consts, temporary variables and references need copying */
@@ -34335,7 +34335,7 @@ static int ZEND_FASTCALL  ZEND_FETCH_DIM_UNSET_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_H
 static int ZEND_FASTCALL zend_fetch_property_address_read_helper_SPEC_CV_TMP(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *container;
        zend_free_op free_op2;
        zval *offset;
@@ -34456,7 +34456,7 @@ static int ZEND_FASTCALL  ZEND_FETCH_OBJ_RW_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HAND
 static int ZEND_FASTCALL  ZEND_FETCH_OBJ_IS_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *container;
        zend_free_op free_op2;
        zval *offset;
@@ -34606,7 +34606,7 @@ static int ZEND_FASTCALL  ZEND_ASSIGN_OBJ_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLE
 static int ZEND_FASTCALL  ZEND_ASSIGN_DIM_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval **object_ptr;
 
        SAVE_OPLINE();
@@ -34835,7 +34835,7 @@ static int ZEND_FASTCALL  ZEND_CASE_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS
 static int ZEND_FASTCALL  ZEND_ADD_ARRAY_ELEMENT_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *expr_ptr;
 
        SAVE_OPLINE();
@@ -35123,7 +35123,7 @@ num_index_prop:
                                result = isset;
                        }
                } else /* if (opline->extended_value & ZEND_ISEMPTY) */ {
-                       if (!isset || !i_zend_is_true(*value)) {
+                       if (!isset || !i_zend_is_true(*value TSRMLS_CC)) {
                                result = 0;
                        } else {
                                result = 1;
@@ -35230,7 +35230,7 @@ static int ZEND_FASTCALL  ZEND_YIELD_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARG
 
        /* Set the new yielded value */
        if (IS_CV != IS_UNUSED) {
-
+               
 
                if (EX(op_array)->fn_flags & ZEND_ACC_RETURN_REFERENCE) {
                        /* Constants and temporary variables aren't yieldable by reference,
@@ -36156,7 +36156,7 @@ static int ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_CV_VAR(int type, ZEN
                if (IS_CV == IS_CONST) {
                        hash_value = Z_HASH_P(varname);
                } else {
-                       hash_value = str_hash(Z_STRVAL_P(varname), Z_STRLEN_P(varname));
+                       hash_value = str_hash(Z_STRVAL_P(varname), Z_STRLEN_P(varname));        
                }
 
                if (zend_hash_quick_find(target_symbol_table, Z_STRVAL_P(varname), Z_STRLEN_P(varname)+1, hash_value, (void **) &retval) == FAILURE) {
@@ -36427,7 +36427,7 @@ static int ZEND_FASTCALL  ZEND_FETCH_DIM_UNSET_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_H
 static int ZEND_FASTCALL zend_fetch_property_address_read_helper_SPEC_CV_VAR(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *container;
        zend_free_op free_op2;
        zval *offset;
@@ -36548,7 +36548,7 @@ static int ZEND_FASTCALL  ZEND_FETCH_OBJ_RW_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HAND
 static int ZEND_FASTCALL  ZEND_FETCH_OBJ_IS_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *container;
        zend_free_op free_op2;
        zval *offset;
@@ -36698,7 +36698,7 @@ static int ZEND_FASTCALL  ZEND_ASSIGN_OBJ_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLE
 static int ZEND_FASTCALL  ZEND_ASSIGN_DIM_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval **object_ptr;
 
        SAVE_OPLINE();
@@ -36981,7 +36981,7 @@ static int ZEND_FASTCALL  ZEND_CASE_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS
 static int ZEND_FASTCALL  ZEND_ADD_ARRAY_ELEMENT_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *expr_ptr;
 
        SAVE_OPLINE();
@@ -37078,7 +37078,7 @@ static int ZEND_FASTCALL  ZEND_UNSET_VAR_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER
        USE_OPLINE
        zval tmp, *varname;
        HashTable *target_symbol_table;
-
+       
 
        SAVE_OPLINE();
        if (IS_CV == IS_CV &&
@@ -37309,7 +37309,7 @@ static int ZEND_FASTCALL  ZEND_ISSET_ISEMPTY_VAR_SPEC_CV_VAR_HANDLER(ZEND_OPCODE
                }
        } else {
                HashTable *target_symbol_table;
-
+               
                zval tmp, *varname = _get_zval_ptr_cv_BP_VAR_IS(execute_data, opline->op1.var TSRMLS_CC);
 
                if (IS_CV != IS_CONST && Z_TYPE_P(varname) != IS_STRING) {
@@ -37360,7 +37360,7 @@ static int ZEND_FASTCALL  ZEND_ISSET_ISEMPTY_VAR_SPEC_CV_VAR_HANDLER(ZEND_OPCODE
                        ZVAL_BOOL(&EX_T(opline->result.var).tmp_var, 0);
                }
        } else /* if (opline->extended_value & ZEND_ISEMPTY) */ {
-               if (!isset || !i_zend_is_true(*value)) {
+               if (!isset || !i_zend_is_true(*value TSRMLS_CC)) {
                        ZVAL_BOOL(&EX_T(opline->result.var).tmp_var, 1);
                } else {
                        ZVAL_BOOL(&EX_T(opline->result.var).tmp_var, 0);
@@ -37432,7 +37432,7 @@ num_index_prop:
                                result = isset;
                        }
                } else /* if (opline->extended_value & ZEND_ISEMPTY) */ {
-                       if (!isset || !i_zend_is_true(*value)) {
+                       if (!isset || !i_zend_is_true(*value TSRMLS_CC)) {
                                result = 0;
                        } else {
                                result = 1;
@@ -37539,7 +37539,7 @@ static int ZEND_FASTCALL  ZEND_YIELD_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARG
 
        /* Set the new yielded value */
        if (IS_CV != IS_UNUSED) {
-
+               
 
                if (EX(op_array)->fn_flags & ZEND_ACC_RETURN_REFERENCE) {
                        /* Constants and temporary variables aren't yieldable by reference,
@@ -37983,7 +37983,7 @@ static int ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_CV_UNUSED(int type,
                if (IS_CV == IS_CONST) {
                        hash_value = Z_HASH_P(varname);
                } else {
-                       hash_value = str_hash(Z_STRVAL_P(varname), Z_STRLEN_P(varname));
+                       hash_value = str_hash(Z_STRVAL_P(varname), Z_STRLEN_P(varname));        
                }
 
                if (zend_hash_quick_find(target_symbol_table, Z_STRVAL_P(varname), Z_STRLEN_P(varname)+1, hash_value, (void **) &retval) == FAILURE) {
@@ -38181,7 +38181,7 @@ static int ZEND_FASTCALL  ZEND_FETCH_DIM_FUNC_ARG_SPEC_CV_UNUSED_HANDLER(ZEND_OP
 static int ZEND_FASTCALL  ZEND_ASSIGN_DIM_SPEC_CV_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval **object_ptr;
 
        SAVE_OPLINE();
@@ -38191,7 +38191,7 @@ static int ZEND_FASTCALL  ZEND_ASSIGN_DIM_SPEC_CV_UNUSED_HANDLER(ZEND_OPCODE_HAN
                zend_error_noreturn(E_ERROR, "Cannot use string offset as an array");
        }
        if (Z_TYPE_PP(object_ptr) == IS_OBJECT) {
-
+               
                zval *property_name = NULL;
 
                if (0) {
@@ -38261,7 +38261,7 @@ static int ZEND_FASTCALL  ZEND_ASSIGN_DIM_SPEC_CV_UNUSED_HANDLER(ZEND_OPCODE_HAN
 static int ZEND_FASTCALL  ZEND_ADD_ARRAY_ELEMENT_SPEC_CV_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *expr_ptr;
 
        SAVE_OPLINE();
@@ -38296,7 +38296,7 @@ static int ZEND_FASTCALL  ZEND_ADD_ARRAY_ELEMENT_SPEC_CV_UNUSED_HANDLER(ZEND_OPC
        }
 
        if (IS_UNUSED != IS_UNUSED) {
-
+               
                zval *offset = NULL;
                ulong hval;
 
@@ -38358,7 +38358,7 @@ static int ZEND_FASTCALL  ZEND_UNSET_VAR_SPEC_CV_UNUSED_HANDLER(ZEND_OPCODE_HAND
        USE_OPLINE
        zval tmp, *varname;
        HashTable *target_symbol_table;
-
+       
 
        SAVE_OPLINE();
        if (IS_CV == IS_CV &&
@@ -38454,7 +38454,7 @@ static int ZEND_FASTCALL  ZEND_ISSET_ISEMPTY_VAR_SPEC_CV_UNUSED_HANDLER(ZEND_OPC
                }
        } else {
                HashTable *target_symbol_table;
-
+               
                zval tmp, *varname = _get_zval_ptr_cv_BP_VAR_IS(execute_data, opline->op1.var TSRMLS_CC);
 
                if (IS_CV != IS_CONST && Z_TYPE_P(varname) != IS_STRING) {
@@ -38505,7 +38505,7 @@ static int ZEND_FASTCALL  ZEND_ISSET_ISEMPTY_VAR_SPEC_CV_UNUSED_HANDLER(ZEND_OPC
                        ZVAL_BOOL(&EX_T(opline->result.var).tmp_var, 0);
                }
        } else /* if (opline->extended_value & ZEND_ISEMPTY) */ {
-               if (!isset || !i_zend_is_true(*value)) {
+               if (!isset || !i_zend_is_true(*value TSRMLS_CC)) {
                        ZVAL_BOOL(&EX_T(opline->result.var).tmp_var, 1);
                } else {
                        ZVAL_BOOL(&EX_T(opline->result.var).tmp_var, 0);
@@ -38539,7 +38539,7 @@ static int ZEND_FASTCALL  ZEND_YIELD_SPEC_CV_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_
 
        /* Set the new yielded value */
        if (IS_CV != IS_UNUSED) {
-
+               
 
                if (EX(op_array)->fn_flags & ZEND_ACC_RETURN_REFERENCE) {
                        /* Constants and temporary variables aren't yieldable by reference,
@@ -38617,7 +38617,7 @@ static int ZEND_FASTCALL  ZEND_YIELD_SPEC_CV_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_
 
        /* Set the new yielded key */
        if (IS_UNUSED != IS_UNUSED) {
-
+               
                zval *key = NULL;
 
                /* Consts, temporary variables and references need copying */
@@ -38678,7 +38678,7 @@ static int ZEND_FASTCALL  ZEND_YIELD_SPEC_CV_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_
 static int ZEND_FASTCALL  ZEND_ADD_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
 
        SAVE_OPLINE();
        fast_add_function(&EX_T(opline->result.var).tmp_var,
@@ -38693,7 +38693,7 @@ static int ZEND_FASTCALL  ZEND_ADD_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_FASTCALL  ZEND_SUB_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
 
        SAVE_OPLINE();
        fast_sub_function(&EX_T(opline->result.var).tmp_var,
@@ -38708,7 +38708,7 @@ static int ZEND_FASTCALL  ZEND_SUB_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_FASTCALL  ZEND_MUL_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
 
        SAVE_OPLINE();
        fast_mul_function(&EX_T(opline->result.var).tmp_var,
@@ -38723,7 +38723,7 @@ static int ZEND_FASTCALL  ZEND_MUL_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_FASTCALL  ZEND_DIV_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
 
        SAVE_OPLINE();
        fast_div_function(&EX_T(opline->result.var).tmp_var,
@@ -38738,7 +38738,7 @@ static int ZEND_FASTCALL  ZEND_DIV_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_FASTCALL  ZEND_MOD_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
 
        SAVE_OPLINE();
        fast_mod_function(&EX_T(opline->result.var).tmp_var,
@@ -38753,7 +38753,7 @@ static int ZEND_FASTCALL  ZEND_MOD_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_FASTCALL  ZEND_SL_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
 
        SAVE_OPLINE();
        shift_left_function(&EX_T(opline->result.var).tmp_var,
@@ -38768,7 +38768,7 @@ static int ZEND_FASTCALL  ZEND_SL_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_FASTCALL  ZEND_SR_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
 
        SAVE_OPLINE();
        shift_right_function(&EX_T(opline->result.var).tmp_var,
@@ -38783,7 +38783,7 @@ static int ZEND_FASTCALL  ZEND_SR_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_FASTCALL  ZEND_CONCAT_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
 
        SAVE_OPLINE();
        concat_function(&EX_T(opline->result.var).tmp_var,
@@ -38798,7 +38798,7 @@ static int ZEND_FASTCALL  ZEND_CONCAT_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARG
 static int ZEND_FASTCALL  ZEND_IS_IDENTICAL_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
 
        SAVE_OPLINE();
        is_identical_function(&EX_T(opline->result.var).tmp_var,
@@ -38813,7 +38813,7 @@ static int ZEND_FASTCALL  ZEND_IS_IDENTICAL_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDL
 static int ZEND_FASTCALL  ZEND_IS_NOT_IDENTICAL_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *result = &EX_T(opline->result.var).tmp_var;
 
        SAVE_OPLINE();
@@ -38830,7 +38830,7 @@ static int ZEND_FASTCALL  ZEND_IS_NOT_IDENTICAL_SPEC_CV_CV_HANDLER(ZEND_OPCODE_H
 static int ZEND_FASTCALL  ZEND_IS_EQUAL_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *result = &EX_T(opline->result.var).tmp_var;
 
        SAVE_OPLINE();
@@ -38846,7 +38846,7 @@ static int ZEND_FASTCALL  ZEND_IS_EQUAL_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_A
 static int ZEND_FASTCALL  ZEND_IS_NOT_EQUAL_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *result = &EX_T(opline->result.var).tmp_var;
 
        SAVE_OPLINE();
@@ -38862,7 +38862,7 @@ static int ZEND_FASTCALL  ZEND_IS_NOT_EQUAL_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDL
 static int ZEND_FASTCALL  ZEND_IS_SMALLER_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *result = &EX_T(opline->result.var).tmp_var;
 
        SAVE_OPLINE();
@@ -38878,7 +38878,7 @@ static int ZEND_FASTCALL  ZEND_IS_SMALLER_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER
 static int ZEND_FASTCALL  ZEND_IS_SMALLER_OR_EQUAL_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *result = &EX_T(opline->result.var).tmp_var;
 
        SAVE_OPLINE();
@@ -38894,7 +38894,7 @@ static int ZEND_FASTCALL  ZEND_IS_SMALLER_OR_EQUAL_SPEC_CV_CV_HANDLER(ZEND_OPCOD
 static int ZEND_FASTCALL  ZEND_BW_OR_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
 
        SAVE_OPLINE();
        bitwise_or_function(&EX_T(opline->result.var).tmp_var,
@@ -38909,7 +38909,7 @@ static int ZEND_FASTCALL  ZEND_BW_OR_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS
 static int ZEND_FASTCALL  ZEND_BW_AND_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
 
        SAVE_OPLINE();
        bitwise_and_function(&EX_T(opline->result.var).tmp_var,
@@ -38924,7 +38924,7 @@ static int ZEND_FASTCALL  ZEND_BW_AND_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARG
 static int ZEND_FASTCALL  ZEND_BW_XOR_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
 
        SAVE_OPLINE();
        bitwise_xor_function(&EX_T(opline->result.var).tmp_var,
@@ -38939,7 +38939,7 @@ static int ZEND_FASTCALL  ZEND_BW_XOR_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARG
 static int ZEND_FASTCALL  ZEND_BOOL_XOR_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
 
        SAVE_OPLINE();
        boolean_xor_function(&EX_T(opline->result.var).tmp_var,
@@ -39205,7 +39205,7 @@ static int ZEND_FASTCALL  ZEND_ASSIGN_BW_XOR_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HAND
 static int ZEND_FASTCALL zend_pre_incdec_property_helper_SPEC_CV_CV(incdec_t incdec_op, ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval **object_ptr;
        zval *object;
        zval *property;
@@ -39309,7 +39309,7 @@ static int ZEND_FASTCALL  ZEND_PRE_DEC_OBJ_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLE
 static int ZEND_FASTCALL zend_post_incdec_property_helper_SPEC_CV_CV(incdec_t incdec_op, ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval **object_ptr;
        zval *object;
        zval *property;
@@ -39411,7 +39411,7 @@ static int ZEND_FASTCALL  ZEND_POST_DEC_OBJ_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDL
 static int ZEND_FASTCALL  ZEND_FETCH_DIM_R_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *container;
 
        SAVE_OPLINE();
@@ -39483,7 +39483,7 @@ static int ZEND_FASTCALL  ZEND_FETCH_DIM_RW_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDL
 static int ZEND_FASTCALL  ZEND_FETCH_DIM_IS_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *container;
 
        SAVE_OPLINE();
@@ -39573,9 +39573,9 @@ static int ZEND_FASTCALL  ZEND_FETCH_DIM_UNSET_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HA
 static int ZEND_FASTCALL zend_fetch_property_address_read_helper_SPEC_CV_CV(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *container;
-
+       
        zval *offset;
 
        SAVE_OPLINE();
@@ -39694,9 +39694,9 @@ static int ZEND_FASTCALL  ZEND_FETCH_OBJ_RW_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDL
 static int ZEND_FASTCALL  ZEND_FETCH_OBJ_IS_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *container;
-
+       
        zval *offset;
 
        SAVE_OPLINE();
@@ -39814,7 +39814,7 @@ static int ZEND_FASTCALL  ZEND_FETCH_OBJ_UNSET_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HA
 static int ZEND_FASTCALL  ZEND_ASSIGN_OBJ_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval **object_ptr;
        zval *property_name;
 
@@ -39844,7 +39844,7 @@ static int ZEND_FASTCALL  ZEND_ASSIGN_OBJ_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER
 static int ZEND_FASTCALL  ZEND_ASSIGN_DIM_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval **object_ptr;
 
        SAVE_OPLINE();
@@ -39854,7 +39854,7 @@ static int ZEND_FASTCALL  ZEND_ASSIGN_DIM_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER
                zend_error_noreturn(E_ERROR, "Cannot use string offset as an array");
        }
        if (Z_TYPE_PP(object_ptr) == IS_OBJECT) {
-
+               
                zval *property_name = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op2.var TSRMLS_CC);
 
                if (0) {
@@ -39924,7 +39924,7 @@ static int ZEND_FASTCALL  ZEND_ASSIGN_DIM_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER
 static int ZEND_FASTCALL  ZEND_ASSIGN_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *value;
        zval **variable_ptr_ptr;
 
@@ -40032,7 +40032,7 @@ static int ZEND_FASTCALL  ZEND_INIT_METHOD_CALL_SPEC_CV_CV_HANDLER(ZEND_OPCODE_H
        zval *function_name;
        char *function_name_strval;
        int function_name_strlen;
-
+       
        call_slot *call = EX(call_slots) + opline->result.num;
 
        SAVE_OPLINE();
@@ -40108,7 +40108,7 @@ static int ZEND_FASTCALL  ZEND_INIT_METHOD_CALL_SPEC_CV_CV_HANDLER(ZEND_OPCODE_H
 static int ZEND_FASTCALL  ZEND_CASE_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
 
        SAVE_OPLINE();
        is_equal_function(&EX_T(opline->result.var).tmp_var,
@@ -40122,7 +40122,7 @@ static int ZEND_FASTCALL  ZEND_CASE_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_FASTCALL  ZEND_ADD_ARRAY_ELEMENT_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *expr_ptr;
 
        SAVE_OPLINE();
@@ -40157,7 +40157,7 @@ static int ZEND_FASTCALL  ZEND_ADD_ARRAY_ELEMENT_SPEC_CV_CV_HANDLER(ZEND_OPCODE_
        }
 
        if (IS_CV != IS_UNUSED) {
-
+               
                zval *offset = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op2.var TSRMLS_CC);
                ulong hval;
 
@@ -40217,7 +40217,7 @@ static int ZEND_FASTCALL  ZEND_INIT_ARRAY_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER
 static int ZEND_FASTCALL  ZEND_UNSET_DIM_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval **container;
        zval *offset;
        ulong hval;
@@ -40312,7 +40312,7 @@ num_index_dim:
 static int ZEND_FASTCALL  ZEND_UNSET_OBJ_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval **container;
        zval *offset;
 
@@ -40352,7 +40352,7 @@ static int ZEND_FASTCALL  ZEND_UNSET_OBJ_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_
 static int ZEND_FASTCALL zend_isset_isempty_dim_prop_obj_handler_SPEC_CV_CV(int prop_dim, ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
+       
        zval *container;
        zval **value = NULL;
        int result = 0;
@@ -40410,7 +40410,7 @@ num_index_prop:
                                result = isset;
                        }
                } else /* if (opline->extended_value & ZEND_ISEMPTY) */ {
-                       if (!isset || !i_zend_is_true(*value)) {
+                       if (!isset || !i_zend_is_true(*value TSRMLS_CC)) {
                                result = 0;
                        } else {
                                result = 1;
@@ -40517,7 +40517,7 @@ static int ZEND_FASTCALL  ZEND_YIELD_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS
 
        /* Set the new yielded value */
        if (IS_CV != IS_UNUSED) {
-
+               
 
                if (EX(op_array)->fn_flags & ZEND_ACC_RETURN_REFERENCE) {
                        /* Constants and temporary variables aren't yieldable by reference,
@@ -40595,7 +40595,7 @@ static int ZEND_FASTCALL  ZEND_YIELD_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS
 
        /* Set the new yielded key */
        if (IS_CV != IS_UNUSED) {
-
+               
                zval *key = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op2.var TSRMLS_CC);
 
                /* Consts, temporary variables and references need copying */
index db8ec83a44391ebb571e2d7b301e7a60f8fa728c..529fe8dfa26d59ccc8e4312250f1e280fe965fe1 100644 (file)
@@ -448,7 +448,7 @@ static int dom_property_exists(zval *object, zval *member, int check_empty, cons
                        Z_SET_REFCOUNT_P(tmp, 1);
                        Z_UNSET_ISREF_P(tmp);
                        if (check_empty == 1) {
-                               retval = zend_is_true(tmp);
+                               retval = zend_is_true(tmp TSRMLS_CC);
                        } else if (check_empty == 0) {
                                retval = (Z_TYPE_P(tmp) != IS_NULL);
                        }
index 0a7b1ded0f1bee560ad3c6fe2de3103ef9738c72..919f4a9ab13270a96e12be59a67b01e3eefc60f3 100644 (file)
@@ -1465,7 +1465,12 @@ static void zend_jmp_optimization(zend_code_block *block, zend_op_array *op_arra
                case ZEND_JMPNZ:
                        /* constant conditional JMPs */
                        if (ZEND_OP1_TYPE(last_op) == IS_CONST) {
+#if PHP_API_VERSION > PHP_5_6_X_API_NO
+                               int should_jmp = zend_is_true(&ZEND_OP1_LITERAL(last_op) TSRMLS_CC);
+#else
                                int should_jmp = zend_is_true(&ZEND_OP1_LITERAL(last_op));
+#endif
+
                                if (last_op->opcode == ZEND_JMPZ) {
                                        should_jmp = !should_jmp;
                                }
@@ -1608,7 +1613,12 @@ next_target:
                case ZEND_JMPZ_EX:
                        /* constant conditional JMPs */
                        if (ZEND_OP1_TYPE(last_op) == IS_CONST) {
+#if PHP_API_VERSION > PHP_5_6_X_API_NO
+                               int should_jmp = zend_is_true(&ZEND_OP1_LITERAL(last_op) TSRMLS_CC);
+#else
                                int should_jmp = zend_is_true(&ZEND_OP1_LITERAL(last_op));
+#endif
+
                                if (last_op->opcode == ZEND_JMPZ_EX) {
                                        should_jmp = !should_jmp;
                                }
@@ -1729,7 +1739,11 @@ next_target_ex:
                        }
 
                        if (ZEND_OP1_TYPE(last_op) == IS_CONST) {
+#if PHP_API_VERSION > PHP_5_6_X_API_NO
+                               if (!zend_is_true(&ZEND_OP1_LITERAL(last_op) TSRMLS_CC)) {
+#else
                                if (!zend_is_true(&ZEND_OP1_LITERAL(last_op))) {
+#endif
                                        /* JMPZNZ(false,L1,L2) -> JMP(L1) */
                                        zend_code_block *todel;
 
index 30708a0935baa6493ad30da1a85fbfa161fa1cea..0f747aaabaf3ddc51d18bcf9edcb75811d340102 100644 (file)
@@ -89,7 +89,11 @@ if (ZEND_OPTIMIZER_PASS_2 & OPTIMIZATION_LEVEL) {
                                /* convert Ti = JMPZ_EX(C, L) => Ti = QM_ASSIGN(C)
                                   in case we know it wouldn't jump */
                                } else if (ZEND_OP1_TYPE(opline) == IS_CONST) {
+#if PHP_API_VERSION > PHP_5_6_X_API_NO
+                                       int should_jmp = zend_is_true(&ZEND_OP1_LITERAL(opline) TSRMLS_CC);
+#else
                                        int should_jmp = zend_is_true(&ZEND_OP1_LITERAL(opline));
+#endif
                                        if (opline->opcode == ZEND_JMPZ_EX) {
                                                should_jmp = !should_jmp;
                                        }
@@ -103,7 +107,11 @@ if (ZEND_OPTIMIZER_PASS_2 & OPTIMIZATION_LEVEL) {
                        case ZEND_JMPZ:
                        case ZEND_JMPNZ:
                                if (ZEND_OP1_TYPE(opline) == IS_CONST) {
+#if PHP_API_VERSION > PHP_5_6_X_API_NO
+                                       int should_jmp = zend_is_true(&ZEND_OP1_LITERAL(opline) TSRMLS_CC);
+#else
                                        int should_jmp = zend_is_true(&ZEND_OP1_LITERAL(opline));
+#endif
 
                                        if (opline->opcode == ZEND_JMPZ) {
                                                should_jmp = !should_jmp;
@@ -139,8 +147,11 @@ if (ZEND_OPTIMIZER_PASS_2 & OPTIMIZATION_LEVEL) {
                        case ZEND_JMPZNZ:
                                if (ZEND_OP1_TYPE(opline) == IS_CONST) {
                                        int opline_num;
-
+#if PHP_API_VERSION > PHP_5_6_X_API_NO
+                                       if (zend_is_true(&ZEND_OP1_LITERAL(opline) TSRMLS_CC)) {
+#else
                                        if (zend_is_true(&ZEND_OP1_LITERAL(opline))) {
+#endif
                                                opline_num = opline->extended_value; /* JMPNZ */
                                        } else {
                                                opline_num = ZEND_OP2(opline).opline_num; /* JMPZ */
index 9c9f2a359208a8f6f4c31010355f8ead45b78dcd..919b0089635e1dee0d31dd8bd8c77714dfe16512 100644 (file)
@@ -926,7 +926,7 @@ static char * get_sni(php_stream_context *ctx, const char *resourcename, size_t
        if (ctx) {
                zval **val = NULL;
 
-               if (php_stream_context_get_option(ctx, "ssl", "SNI_enabled", &val) == SUCCESS && !zend_is_true(*val)) {
+               if (php_stream_context_get_option(ctx, "ssl", "SNI_enabled", &val) == SUCCESS && !zend_is_true(*val TSRMLS_CC)) {
                        return NULL;
                }
                if (php_stream_context_get_option(ctx, "ssl", "SNI_server_name", &val) == SUCCESS) {
index 5cec3e558eb13e83e0de5f9e73b2af9e57907a56..748093a3efc0d990c122694a82a808622c9a0a2b 100644 (file)
@@ -1189,7 +1189,7 @@ static xmlNodePtr to_xml_bool(encodeTypePtr type, zval *data, int style, xmlNode
        xmlAddChild(parent, ret);
        FIND_ZVAL_NULL(data, ret, style);
 
-       if (zend_is_true(data)) {
+       if (zend_is_true(data TSRMLS_CC)) {
                xmlNodeSetContent(ret, BAD_CAST("true"));
        } else {
                xmlNodeSetContent(ret, BAD_CAST("false"));
index ca8076a95713ce1c63f362d35d6684cc4990bd73..3afa2b3ea844c37da46cc3ee60d4bf81724a69a6 100644 (file)
@@ -599,7 +599,7 @@ static int spl_array_has_dimension_ex(int check_inherited, zval *object, zval *o
                SEPARATE_ARG_IF_REF(offset);
                zend_call_method_with_1_params(&object, Z_OBJCE_P(object), &intern->fptr_offset_has, "offsetExists", &rv, offset);
                zval_ptr_dtor(&offset);
-               if (rv && zend_is_true(rv)) {
+               if (rv && zend_is_true(rv TSRMLS_CC)) {
                        zval_ptr_dtor(&rv);
                        return 1;
                }
@@ -620,7 +620,7 @@ static int spl_array_has_dimension_ex(int check_inherited, zval *object, zval *o
                                                case 2:
                                                        return 1;
                                                default:
-                                                       return zend_is_true(*tmp);
+                                                       return zend_is_true(*tmp TSRMLS_CC);
                                        }
                                }
                        }
@@ -643,7 +643,7 @@ static int spl_array_has_dimension_ex(int check_inherited, zval *object, zval *o
                                                case 2:
                                                        return 1;
                                                default:
-                                                       return zend_is_true(*tmp);
+                                                       return zend_is_true(*tmp TSRMLS_CC);
                                        }
                                }
                                return 0;
index f73e8ee9f0db4c7130d7e88b497188790143be4a..902161953ab1dc1aa46f2b0fffb6f27877274b13 100644 (file)
@@ -836,7 +836,7 @@ SPL_METHOD(DirectoryIterator, seek)
                int valid = 0;
                zend_call_method_with_0_params(&this_ptr, Z_OBJCE_P(getThis()), &intern->u.dir.func_valid, "valid", &retval);
                if (retval) {
-                       valid = zend_is_true(retval);
+                       valid = zend_is_true(retval TSRMLS_CC);
                        zval_ptr_dtor(&retval);
                }
                if (!valid) {
@@ -1497,7 +1497,7 @@ SPL_METHOD(RecursiveDirectoryIterator, hasChildren)
                spl_filesystem_object_get_file_name(intern TSRMLS_CC);
                if (!allow_links && !(intern->flags & SPL_FILE_DIR_FOLLOW_SYMLINKS)) {
                        php_stat(intern->file_name, intern->file_name_len, FS_IS_LINK, return_value TSRMLS_CC);
-                       if (zend_is_true(return_value)) {
+                       if (zend_is_true(return_value TSRMLS_CC)) {
                                RETURN_FALSE;
                        }
                }
index 8624b35a4b616b11cbd6589968ada6750fdb894d..ce9efb567d3f78f35a5bbe2ca427982df6dc737f 100644 (file)
@@ -511,7 +511,7 @@ static inline int spl_fixedarray_object_has_dimension_helper(spl_fixedarray_obje
                if (!intern->array->elements[index]) {
                        retval = 0;
                } else if (check_empty) {
-                       if (zend_is_true(intern->array->elements[index])) {
+                       if (zend_is_true(intern->array->elements[index] TSRMLS_CC)) {
                                retval = 1;
                        } else {
                                retval = 0;
@@ -540,7 +540,7 @@ static int spl_fixedarray_object_has_dimension(zval *object, zval *offset, int c
                        zval_ptr_dtor(&intern->retval);
                        MAKE_STD_ZVAL(intern->retval);
                        ZVAL_ZVAL(intern->retval, rv, 1, 1);
-                       return zend_is_true(intern->retval);
+                       return zend_is_true(intern->retval TSRMLS_CC);
                }
                return 0;
        }
index 30532756cb6d614bba6d079004eb7683ed3cddb2..11a2ba71cd1ae1718c3ec0dba7c08787beb5baa4 100644 (file)
@@ -249,7 +249,7 @@ next_step:
                                        }
                                }
                                if (retval) {
-                                       has_children = zend_is_true(retval);
+                                       has_children = zend_is_true(retval TSRMLS_CC);
                                        zval_ptr_dtor(&retval);
                                        if (has_children) {
                                                if (object->max_depth == -1 || object->max_depth > object->level) {
@@ -1774,7 +1774,7 @@ static inline void spl_filter_it_fetch(zval *zthis, spl_dual_it_object *intern T
        while (spl_dual_it_fetch(intern, 1 TSRMLS_CC) == SUCCESS) {
                zend_call_method_with_0_params(&zthis, intern->std.ce, NULL, "accept", &retval);
                if (retval) {
-                       if (zend_is_true(retval)) {
+                       if (zend_is_true(retval TSRMLS_CC)) {
                                zval_ptr_dtor(&retval);
                                return;
                        }
@@ -2598,7 +2598,7 @@ static inline void spl_caching_it_next(spl_dual_it_object *intern TSRMLS_DC)
                                        return;
                                }
                        } else {
-                               if (zend_is_true(retval)) {
+                               if (zend_is_true(retval TSRMLS_CC)) {
                                        zend_call_method_with_0_params(&intern->inner.zobject, intern->inner.ce, NULL, "getchildren", &zchildren);
                                        if (EG(exception)) {
                                                if (zchildren) {
@@ -3573,7 +3573,7 @@ static int spl_iterator_func_apply(zend_object_iterator *iter, void *puser TSRML
        apply_info->count++;
        zend_fcall_info_call(&apply_info->fci, &apply_info->fcc, &retval, NULL TSRMLS_CC);
        if (retval) {
-               result = zend_is_true(retval) ? ZEND_HASH_APPLY_KEEP : ZEND_HASH_APPLY_STOP;
+               result = zend_is_true(retval TSRMLS_CC) ? ZEND_HASH_APPLY_KEEP : ZEND_HASH_APPLY_STOP;
                zval_ptr_dtor(&retval);
        } else {
                result = ZEND_HASH_APPLY_STOP;
index d21badc87c0d74d237077eca01ab7461c2d15a51..47f21745778dc8cd33b855dd3cfcb9f35f4f7080 100644 (file)
@@ -4277,7 +4277,7 @@ PHP_FUNCTION(array_filter)
                        fci.params = args;
 
                        if (zend_call_function(&fci, &fci_cache TSRMLS_CC) == SUCCESS && retval) {
-                               int retval_true = zend_is_true(retval);
+                               int retval_true = zend_is_true(retval TSRMLS_CC);
 
                                zval_ptr_dtor(&retval);
                                if (use_type) {
@@ -4290,7 +4290,7 @@ PHP_FUNCTION(array_filter)
                                php_error_docref(NULL TSRMLS_CC, E_WARNING, "An error occurred while invoking the filter callback");
                                return;
                        }
-               } else if (!zend_is_true(*operand)) {
+               } else if (!zend_is_true(*operand TSRMLS_CC)) {
                        continue;
                }
 
index f5184ceec601907cc5aa040361c1795f8c96b796..9ac87cdca58dacfead5a86c1561023e8fde2e419 100644 (file)
@@ -682,7 +682,7 @@ finish:
                                response_code = 0;
                        }
                        if (context && SUCCESS==php_stream_context_get_option(context, "http", "ignore_errors", &tmpzval)) {
-                               ignore_errors = zend_is_true(*tmpzval);
+                               ignore_errors = zend_is_true(*tmpzval TSRMLS_CC);
                        }
                        /* when we request only the header, don't fail even on error codes */
                        if ((options & STREAM_ONLY_GET_HEADERS) || ignore_errors) {
index 5d93f66f5b725e8442673d5e7ecf511b598bcbf6..ec6630d9ed4ce2ef1d167dcdd843a1ff3b631ec9 100644 (file)
@@ -186,7 +186,7 @@ PHP_FUNCTION(boolval)
                return;
        }
 
-       RETURN_BOOL(zend_is_true(*val));
+       RETURN_BOOL(zend_is_true(*val TSRMLS_CC));
 }
 /* }}} */
 
index cd1d7cd425f74fe31b42b17c706a603fa2c91fae..7aaa48d2509eedd49be283850340a9c42404c9cf 100644 (file)
@@ -1010,7 +1010,11 @@ static int php_zip_has_property(zval *object, zval *member, int type KEY_ARG_DC
                        Z_SET_REFCOUNT_P(tmp, 1);
                        Z_UNSET_ISREF_P(tmp);
                        if (type == 1) {
+#if PHP_VERSION_ID >= 50699
+                               retval = zend_is_true(tmp TSRMLS_CC);
+#else
                                retval = zend_is_true(tmp);
+#endif
                        } else if (type == 0) {
                                retval = (Z_TYPE_P(tmp) != IS_NULL);
                        }
index 1e626e4b4c779e7bd1d3fe4e6d6b490de7b152c2..d73140f8342b7b3419f7b050c1294d884ad8dc2a 100644 (file)
@@ -1121,7 +1121,7 @@ static int php_userstreamop_set_option(php_stream *stream, int option, int value
                        php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s::" USERSTREAM_SET_OPTION " is not implemented!",
                                        us->wrapper->classname);
                        ret = PHP_STREAM_OPTION_RETURN_ERR;
-               } else if (retval && zend_is_true(retval)) {
+               } else if (retval && zend_is_true(retval TSRMLS_CC)) {
                        ret = PHP_STREAM_OPTION_RETURN_OK;
                } else {
                        ret = PHP_STREAM_OPTION_RETURN_ERR;
@@ -1629,7 +1629,7 @@ static int php_userstreamop_cast(php_stream *stream, int castas, void **retptr T
                                        us->wrapper->classname);
                        break;
                }
-               if (retval == NULL || !zend_is_true(retval)) {
+               if (retval == NULL || !zend_is_true(retval TSRMLS_CC)) {
                        break;
                }
                php_stream_from_zval_no_verify(intstream, &retval);