com php-src: Revert unrelated changes and add missing cases into cleanup_unfinished_calls(): Zend/zend_compile.c Zend/zend_execute.c
Zend/zend_execute.h Zend/zen d_generators.c Zend/zend_vm_def.h Zend/zend_vm _execute.h

From: Date: Thu, 26 Nov 2015 12:04:44 +0000
Subject: com php-src: Revert unrelated changes and add missing cases into cleanup_unfinished_calls(): Zend/zend_compile.c Zend/zend_execute.c
Zend/zend_execute.h Zend/zen d_generators.c Zend/zend_vm_def.h Zend/zend_vm _execute.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-90037@lists.php.net to get a copy of this message
Commit: c7a4dbf9fd6931c229b8e12e644b8e0f5238eec0 Author: Dmitry Stogov <dmitry@zend.com> Thu, 26 Nov 2015 15:04:44 +0300 Parents: 95ff46c8b910302b98bc9da5510247d2232200ef Branches: separate_arg_value_and_passing Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c7a4dbf9fd6931c229b8e12e644b8e0f5238eec0 Log: Revert unrelated changes and add missing cases into cleanup_unfinished_calls() Changed paths: M Zend/zend_compile.c M Zend/zend_execute.c M Zend/zend_execute.h M Zend/zend_generators.c M Zend/zend_vm_def.h M Zend/zend_vm_execute.h

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 3435b83..b27bc6f 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -1892,7 +1892,6 @@ static void zend_find_live_range(zend_op *opline, zend_uchar type, uint32_t var) while (def != CG(active_op_array)->opcodes) { def--; if (def->result_type == type && def->result.var == var) { - uint32_t var = def->result.var; if (def->opcode == ZEND_ADD_ARRAY_ELEMENT || def->opcode == ZEND_ROPE_ADD) { /* not a real definition */ @@ -1925,7 +1924,7 @@ static void zend_find_live_range(zend_op *opline, zend_uchar type, uint32_t var) zend_start_live_range(CG(active_op_array), def + 1 - CG(active_op_array)->opcodes), opline - CG(active_op_array)->opcodes, - ZEND_LIVE_TMPVAR, var); + ZEND_LIVE_TMPVAR, def->result.var); break; } } diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index 32b8b43..164efa2 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -2444,66 +2444,88 @@ static zend_always_inline zend_generator *zend_get_running_generator(zend_execut } /* }}} */ -/* If the exception was thrown during a function call there might be arguments pushed to the stack that have to be dtor'ed. */ -/* Assuming no nested call frames; to be called only from ZEND_SEND_* ops */ -static void cleanup_call_frame(zend_execute_data *execute_data, const zend_op *last_op) /* {{{ */ -{ - zend_execute_data *call = EX(call); - EX(call) = NULL; /* guarantee that only one EX(call) is alive at most; because possible destructors ... */ - - switch (last_op->opcode) { - case ZEND_FETCH_FUNC_ARG: - case ZEND_FETCH_DIM_FUNC_ARG: - case ZEND_FETCH_OBJ_FUNC_ARG: - case ZEND_FETCH_STATIC_PROP_FUNC_ARG: - ZEND_CALL_NUM_ARGS(call) = (last_op->extended_value & ZEND_FETCH_ARG_MASK) - 1; - break; +static void cleanup_unfinished_calls(zend_execute_data *execute_data, uint32_t op_num) /* {{{ */ +{ + if (EX(call)) { + zend_execute_data *call = EX(call); + zend_op *opline = EX(func)->op_array.opcodes + op_num; + + /* If the exception was thrown during a function call there might be + * arguments pushed to the stack that have to be dtor'ed. + * Assuming no nested call frames; to be called only from ZEND_SEND_* ops */ + switch (opline->opcode) { + case ZEND_FETCH_FUNC_ARG: + case ZEND_FETCH_DIM_FUNC_ARG: + case ZEND_FETCH_OBJ_FUNC_ARG: + case ZEND_FETCH_STATIC_PROP_FUNC_ARG: + EX_NUM_ARGS() = (opline->extended_value & ZEND_FETCH_ARG_MASK) - 1; + break; - case ZEND_INIT_FCALL_BY_NAME: - case ZEND_INIT_FCALL: - case ZEND_INIT_NS_FCALL_BY_NAME: - case ZEND_INIT_METHOD_CALL: - case ZEND_INIT_STATIC_METHOD_CALL: - case ZEND_INIT_USER_CALL: - case ZEND_INIT_DYNAMIC_CALL: - ZEND_CALL_NUM_ARGS(call) = 0; - break; + case ZEND_DO_FCALL: + case ZEND_DO_ICALL: + case ZEND_DO_UCALL: + case ZEND_DO_FCALL_BY_NAME: + break; - case ZEND_SEND_VAL: - case ZEND_SEND_VAR_EX: - case ZEND_SEND_REF: - case ZEND_SEND_VAR_NO_REF: - case ZEND_SEND_VAL_EX: - case ZEND_SEND_VAR: - ZEND_CALL_NUM_ARGS(call) = last_op->op2.num; - break; - } + case ZEND_INIT_FCALL_BY_NAME: + case ZEND_INIT_FCALL: + case ZEND_INIT_NS_FCALL_BY_NAME: + case ZEND_INIT_METHOD_CALL: + case ZEND_INIT_STATIC_METHOD_CALL: + case ZEND_INIT_USER_CALL: + case ZEND_INIT_DYNAMIC_CALL: + case ZEND_NEW: + EX_NUM_ARGS() = 0; + break; + + case ZEND_SEND_VAL: + case ZEND_SEND_VAL_EX: + case ZEND_SEND_VAR: + case ZEND_SEND_VAR_EX: + case ZEND_SEND_REF: + case ZEND_SEND_VAR_NO_REF: + case ZEND_SEND_USER: + EX_NUM_ARGS() = opline->op2.num; + break; + + case ZEND_SEND_ARRAY: + case ZEND_SEND_UNPACK: + break; + + default: + ZEND_ASSERT(0); + } + + EX(call) = NULL; /* guarantee that only one EX(call) is alive at most; because possible destructors ... */ - zend_vm_stack_free_args(call); + do { + zend_vm_stack_free_args(call); - if (ZEND_CALL_INFO(call) & ZEND_CALL_RELEASE_THIS) { - if (ZEND_CALL_INFO(call) & ZEND_CALL_CTOR) { - if (!(ZEND_CALL_INFO(call) & ZEND_CALL_CTOR_RESULT_UNUSED)) { - GC_REFCOUNT(Z_OBJ(call->This))--; + if (ZEND_CALL_INFO(call) & ZEND_CALL_RELEASE_THIS) { + if (ZEND_CALL_INFO(call) & ZEND_CALL_CTOR) { + if (!(ZEND_CALL_INFO(call) & ZEND_CALL_CTOR_RESULT_UNUSED)) { + GC_REFCOUNT(Z_OBJ(call->This))--; + } + if (GC_REFCOUNT(Z_OBJ(call->This)) == 1) { + zend_object_store_ctor_failed(Z_OBJ(call->This)); + } + } + OBJ_RELEASE(Z_OBJ(call->This)); } - if (GC_REFCOUNT(Z_OBJ(call->This)) == 1) { - zend_object_store_ctor_failed(Z_OBJ(call->This)); + if (call->func->common.fn_flags & ZEND_ACC_CLOSURE) { + zend_object_release((zend_object *) call->func->common.prototype); + } else if (call->func->common.fn_flags & ZEND_ACC_CALL_VIA_TRAMPOLINE) { + zend_string_release(call->func->common.function_name); + zend_free_trampoline(call->func); } - } - OBJ_RELEASE(Z_OBJ(call->This)); - } - if (call->func->common.fn_flags & ZEND_ACC_CLOSURE) { - zend_object_release((zend_object *) call->func->common.prototype); - } else if (call->func->common.fn_flags & ZEND_ACC_CALL_VIA_TRAMPOLINE) { - zend_string_release(call->func->common.function_name); - zend_free_trampoline(call->func); - } - zend_vm_stack_free_call_frame(call); + zend_vm_stack_free_call_frame(call); + } while (0); + } } /* }}} */ -void zend_cleanup_live_vars(zend_execute_data *execute_data, uint32_t op_num, uint32_t catch_op_num) /* {{{ */ +static void cleanup_live_vars(zend_execute_data *execute_data, uint32_t op_num, uint32_t catch_op_num) /* {{{ */ { int i; @@ -2553,6 +2575,11 @@ void zend_cleanup_live_vars(zend_execute_data *execute_data, uint32_t op_num, ui } /* }}} */ +void zend_cleanup_unfinished_execution(zend_execute_data *execute_data, uint32_t op_num, uint32_t catch_op_num) { + cleanup_unfinished_calls(execute_data, op_num); + cleanup_live_vars(execute_data, op_num, catch_op_num); +} + #ifdef HAVE_GCC_GLOBAL_REGS # if defined(__GNUC__) && ZEND_GCC_VERSION >= 4008 && defined(i386) # define ZEND_VM_FP_GLOBAL_REG "%esi" diff --git a/Zend/zend_execute.h b/Zend/zend_execute.h index 40ee642..50b2af1 100644 --- a/Zend/zend_execute.h +++ b/Zend/zend_execute.h @@ -317,7 +317,7 @@ ZEND_API zval *zend_get_zval_ptr(int op_type, const znode_op *node, const zend_e ZEND_API void zend_clean_and_cache_symbol_table(zend_array *symbol_table); void zend_free_compiled_variables(zend_execute_data *execute_data); -void zend_cleanup_live_vars(zend_execute_data *execute_data, uint32_t op_num, uint32_t catch_op_num); +void zend_cleanup_unfinished_execution(zend_execute_data *execute_data, uint32_t op_num, uint32_t catch_op_num); #define CACHE_ADDR(num) \ ((void**)((char*)EX_RUN_TIME_CACHE() + (num))) diff --git a/Zend/zend_generators.c b/Zend/zend_generators.c index fb1fad8..eb7d40e 100644 --- a/Zend/zend_generators.c +++ b/Zend/zend_generators.c @@ -52,7 +52,7 @@ static void zend_generator_cleanup_unfinished_execution(zend_generator *generato EG(vm_stack_end) = generator->stack->end; EG(vm_stack) = generator->stack; - zend_cleanup_live_vars(execute_data, op_num, 0); + zend_cleanup_unfinished_execution(execute_data, op_num, 0); generator->stack = EG(vm_stack); generator->stack->top = EG(vm_stack_top); diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index 5211238..10e61e5 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -1815,12 +1815,12 @@ ZEND_VM_HANDLER(93, ZEND_FETCH_DIM_FUNC_ARG, CONST|TMP|VAR|CV, CONST|TMPVAR|UNUS SAVE_OPLINE(); if (zend_is_by_ref_func_arg_fetch(opline, EX(call))) { - if (OP1_TYPE == IS_CONST || OP1_TYPE == IS_TMP_VAR) { - zend_throw_error(NULL, "Cannot use temporary expression in write context"); + if (OP1_TYPE == IS_CONST || OP1_TYPE == IS_TMP_VAR) { + zend_throw_error(NULL, "Cannot use temporary expression in write context"); FREE_UNFETCHED_OP2(); FREE_UNFETCHED_OP1(); HANDLE_EXCEPTION(); - } + } container = GET_OP1_ZVAL_PTR_PTR_UNDEF(BP_VAR_W); if (OP1_TYPE == IS_VAR && UNEXPECTED(container == NULL)) { zend_throw_error(NULL, "Cannot use string offset as an array"); @@ -2976,6 +2976,7 @@ ZEND_VM_HANDLER(112, ZEND_INIT_METHOD_CALL, CONST|TMPVAR|UNUSED|CV, CONST|TMPVAR zend_function *fbc; zend_class_entry *called_scope; zend_object *obj; + zend_execute_data *call; uint32_t call_info; SAVE_OPLINE(); @@ -3076,11 +3077,13 @@ ZEND_VM_HANDLER(112, ZEND_INIT_METHOD_CALL, CONST|TMPVAR|UNUSED|CV, CONST|TMPVAR GC_REFCOUNT(obj)++; /* For $this pointer */ } - EX(call) = zend_vm_stack_push_call_frame(call_info, + call = zend_vm_stack_push_call_frame(call_info, fbc, opline->extended_value, called_scope, obj); + EX(call) = call; FREE_OP2(); FREE_OP1(); + ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); } @@ -3091,6 +3094,7 @@ ZEND_VM_HANDLER(113, ZEND_INIT_STATIC_METHOD_CALL, UNUSED|CONST|VAR, CONST|TMPVA zend_class_entry *ce; zend_object *object; zend_function *fbc; + zend_execute_data *call; SAVE_OPLINE(); @@ -3215,8 +3219,9 @@ ZEND_VM_HANDLER(113, ZEND_INIT_STATIC_METHOD_CALL, UNUSED|CONST|VAR, CONST|TMPVA } } - EX(call) = zend_vm_stack_push_call_frame(ZEND_CALL_NESTED_FUNCTION, + call = zend_vm_stack_push_call_frame(ZEND_CALL_NESTED_FUNCTION, fbc, opline->extended_value, ce, object); + EX(call) = call; ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); } @@ -3226,6 +3231,7 @@ ZEND_VM_HANDLER(59, ZEND_INIT_FCALL_BY_NAME, ANY, CONST, NUM) USE_OPLINE zend_function *fbc; zval *function_name, *func; + zend_execute_data *call; fbc = CACHED_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op2))); if (UNEXPECTED(fbc == NULL)) { @@ -3239,8 +3245,9 @@ ZEND_VM_HANDLER(59, ZEND_INIT_FCALL_BY_NAME, ANY, CONST, NUM) fbc = Z_FUNC_P(func); CACHE_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op2)), fbc); } - EX(call) = zend_vm_stack_push_call_frame(ZEND_CALL_NESTED_FUNCTION, + call = zend_vm_stack_push_call_frame(ZEND_CALL_NESTED_FUNCTION, fbc, opline->extended_value, NULL, NULL); + EX(call) = call; ZEND_VM_NEXT_OPCODE(); } @@ -3254,6 +3261,7 @@ ZEND_VM_HANDLER(128, ZEND_INIT_DYNAMIC_CALL, ANY, CONST|TMPVAR|CV, NUM) zend_free_op free_op2; zend_class_entry *called_scope; zend_object *object; + zend_execute_data *call; uint32_t call_info = ZEND_CALL_NESTED_FUNCTION; SAVE_OPLINE(); @@ -3277,8 +3285,7 @@ ZEND_VM_C_LABEL(try_function_name): called_scope = zend_fetch_class_by_name(lcname, NULL, ZEND_FETCH_CLASS_DEFAULT | ZEND_FETCH_CLASS_EXCEPTION); if (UNEXPECTED(called_scope == NULL)) { zend_string_release(lcname); - FREE_OP2(); - HANDLE_EXCEPTION(); + ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); } mname = zend_string_init(Z_STRVAL_P(function_name) + (cname_length + sizeof("::") - 1), mname_length, 0); @@ -3337,6 +3344,7 @@ ZEND_VM_C_LABEL(try_function_name): called_scope = NULL; object = NULL; } + FREE_OP2(); } else if (OP2_TYPE != IS_CONST && EXPECTED(Z_TYPE_P(function_name) == IS_OBJECT) && Z_OBJ_HANDLER_P(function_name, get_closure) && @@ -3350,6 +3358,7 @@ ZEND_VM_C_LABEL(try_function_name): call_info |= ZEND_CALL_RELEASE_THIS; GC_REFCOUNT(object)++; /* For $this pointer */ } + FREE_OP2(); } else if (EXPECTED(Z_TYPE_P(function_name) == IS_ARRAY) && zend_hash_num_elements(Z_ARRVAL_P(function_name)) == 2) { zval *obj; @@ -3433,6 +3442,7 @@ ZEND_VM_C_LABEL(try_function_name): GC_REFCOUNT(object)++; /* For $this pointer */ } } + FREE_OP2(); } else if ((OP2_TYPE & (IS_VAR|IS_CV)) && Z_TYPE_P(function_name) == IS_REFERENCE) { function_name = Z_REFVAL_P(function_name); ZEND_VM_C_GOTO(try_function_name); @@ -3447,11 +3457,10 @@ ZEND_VM_C_LABEL(try_function_name): FREE_OP2(); HANDLE_EXCEPTION(); } - - EX(call) = zend_vm_stack_push_call_frame(call_info, + call = zend_vm_stack_push_call_frame(call_info, fbc, opline->extended_value, called_scope, object); + EX(call) = call; - FREE_OP2(); ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); } @@ -3465,25 +3474,13 @@ ZEND_VM_HANDLER(118, ZEND_INIT_USER_CALL, CONST, CONST|TMPVAR|CV, NUM) zend_function *func; zend_class_entry *called_scope; zend_object *object; + zend_execute_data *call; uint32_t call_info = ZEND_CALL_NESTED_FUNCTION; SAVE_OPLINE(); function_name = GET_OP2_ZVAL_PTR(BP_VAR_R); if (zend_is_callable_ex(function_name, NULL, 0, NULL, &fcc, &error)) { func = fcc.function_handler; - - if (error) { - efree(error); - /* This is the only soft error is_callable() can generate */ - zend_error(E_DEPRECATED, - "Non-static method %s::%s() should not be called statically", - ZSTR_VAL(func->common.scope->name), ZSTR_VAL(func->common.function_name)); - if (UNEXPECTED(EG(exception) != NULL)) { - FREE_OP2(); - HANDLE_EXCEPTION(); - } - } - if (func->common.fn_flags & ZEND_ACC_CLOSURE) { /* Delay closure destruction until its invocation */ if (OP2_TYPE & (IS_VAR|IS_CV)) { @@ -3499,16 +3496,27 @@ ZEND_VM_HANDLER(118, ZEND_INIT_USER_CALL, CONST, CONST|TMPVAR|CV, NUM) call_info |= ZEND_CALL_RELEASE_THIS; GC_REFCOUNT(object)++; /* For $this pointer */ } + if (error) { + efree(error); + /* This is the only soft error is_callable() can generate */ + zend_error(E_DEPRECATED, + "Non-static method %s::%s() should not be called statically", + ZSTR_VAL(func->common.scope->name), ZSTR_VAL(func->common.function_name)); + if (UNEXPECTED(EG(exception) != NULL)) { + HANDLE_EXCEPTION(); + } + } } else { zend_internal_type_error(EX_USES_STRICT_TYPES(), "%s() expects parameter 1 to be a valid callback, %s", Z_STRVAL_P(EX_CONSTANT(opline->op1)), error); efree(error); - func = (zend_function *) &zend_pass_function; + func = (zend_function*)&zend_pass_function; called_scope = NULL; object = NULL; } - EX(call) = zend_vm_stack_push_call_frame(call_info, + call = zend_vm_stack_push_call_frame(call_info, func, opline->extended_value, called_scope, object); + EX(call) = call; FREE_OP2(); ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); @@ -3553,6 +3561,7 @@ ZEND_VM_HANDLER(61, ZEND_INIT_FCALL, ANY, CONST, NUM) zval *fname = GET_OP2_ZVAL_PTR(BP_VAR_R); zval *func; zend_function *fbc; + zend_execute_data *call; fbc = CACHED_PTR(Z_CACHE_SLOT_P(fname)); if (UNEXPECTED(fbc == NULL)) { @@ -3566,9 +3575,10 @@ ZEND_VM_HANDLER(61, ZEND_INIT_FCALL, ANY, CONST, NUM) CACHE_PTR(Z_CACHE_SLOT_P(fname), fbc); } - EX(call) = zend_vm_stack_push_call_frame_ex( + call = zend_vm_stack_push_call_frame_ex( opline->op1.num, ZEND_CALL_NESTED_FUNCTION, fbc, opline->extended_value, NULL, NULL); + EX(call) = call; ZEND_VM_NEXT_OPCODE(); } @@ -3628,6 +3638,7 @@ ZEND_VM_HANDLER(130, ZEND_DO_UCALL, ANY, ANY) SAVE_OPLINE(); EX(call) = NULL; + EG(scope) = NULL; ret = NULL; call->symbol_table = NULL; @@ -3651,9 +3662,9 @@ ZEND_VM_HANDLER(131, ZEND_DO_FCALL_BY_NAME, ANY, ANY) zval *ret; SAVE_OPLINE(); + EX(call) = NULL; if (EXPECTED(fbc->type == ZEND_USER_FUNCTION)) { - EX(call) = NULL; EG(scope) = NULL; if (UNEXPECTED((fbc->common.fn_flags & ZEND_ACC_GENERATOR) != 0)) { if (EXPECTED(RETURN_VALUE_USED(opline))) { @@ -3695,7 +3706,6 @@ ZEND_VM_HANDLER(131, ZEND_DO_FCALL_BY_NAME, ANY, ANY) call->prev_execute_data = execute_data; EG(current_execute_data) = call; - EX(call) = NULL; if (fbc->common.fn_flags & ZEND_ACC_HAS_TYPE_HINTS) { uint32_t i; @@ -3756,6 +3766,7 @@ ZEND_VM_HANDLER(60, ZEND_DO_FCALL, ANY, ANY) zval *ret; SAVE_OPLINE(); + EX(call) = NULL; if (UNEXPECTED((fbc->common.fn_flags & (ZEND_ACC_ABSTRACT|ZEND_ACC_DEPRECATED)) != 0)) { if (UNEXPECTED((fbc->common.fn_flags & ZEND_ACC_ABSTRACT) != 0)) { zend_throw_error(NULL, "Cannot call abstract method %s::%s()", ZSTR_VAL(fbc->common.scope->name), ZSTR_VAL(fbc->common.function_name)); @@ -3771,7 +3782,6 @@ ZEND_VM_HANDLER(60, ZEND_DO_FCALL, ANY, ANY) } } } - EX(call) = NULL; LOAD_OPLINE(); @@ -4400,7 +4410,7 @@ ZEND_VM_HANDLER(67, ZEND_SEND_REF, VAR|CV, NUM) } FREE_OP1_VAR_PTR(); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } ZEND_VM_HANDLER(66, ZEND_SEND_VAR_EX, VAR|CV, NUM) @@ -5000,13 +5010,14 @@ ZEND_VM_HANDLER(68, ZEND_NEW, UNUSED|CONST|VAR, JMP_ADDR, NUM) ZEND_VM_JMP(OP_JMP_ADDR(opline, opline->op2)); } else { /* We are not handling overloaded classes right now */ - EX(call) = zend_vm_stack_push_call_frame( - ZEND_CALL_FUNCTION | ZEND_CALL_RELEASE_THIS | ZEND_CALL_CTOR | - (EXPECTED(RETURN_VALUE_USED(opline)) ? 0 : ZEND_CALL_CTOR_RESULT_UNUSED), + zend_execute_data *call = zend_vm_stack_push_call_frame( + ZEND_CALL_FUNCTION | ZEND_CALL_RELEASE_THIS | ZEND_CALL_CTOR | + (EXPECTED(RETURN_VALUE_USED(opline)) ? 0 : ZEND_CALL_CTOR_RESULT_UNUSED), constructor, opline->extended_value, ce, Z_OBJ(object_zval)); + EX(call) = call; if (EXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), &object_zval); @@ -5558,7 +5569,7 @@ ZEND_VM_HANDLER(73, ZEND_INCLUDE_OR_EVAL, CONST|TMPVAR|CV, ANY, EVAL) } call->prev_execute_data = execute_data; - i_init_code_execute_data(call, new_op_array, return_value); + i_init_code_execute_data(call, new_op_array, return_value); if (EXPECTED(zend_execute_ex == execute_ex)) { ZEND_VM_ENTER(); } else { @@ -7276,14 +7287,12 @@ ZEND_VM_HANDLER(149, ZEND_HANDLE_EXCEPTION, ANY, ANY) } } - if (EX(call)) { - cleanup_call_frame(execute_data, EG(opline_before_exception)); - } + cleanup_unfinished_calls(execute_data, op_num); if (finally_op_num && (!catch_op_num || catch_op_num >= finally_op_num)) { zval *fast_call = EX_VAR(EX(func)->op_array.opcodes[finally_op_end].op1.var); - zend_cleanup_live_vars(execute_data, op_num, finally_op_num); + cleanup_live_vars(execute_data, op_num, finally_op_num); if (in_finally && Z_OBJ_P(fast_call)) { zend_exception_set_previous(EG(exception), Z_OBJ_P(fast_call)); } @@ -7293,7 +7302,7 @@ ZEND_VM_HANDLER(149, ZEND_HANDLE_EXCEPTION, ANY, ANY) ZEND_VM_SET_OPCODE(&EX(func)->op_array.opcodes[finally_op_num]); ZEND_VM_CONTINUE(); } else { - zend_cleanup_live_vars(execute_data, op_num, catch_op_num); + cleanup_live_vars(execute_data, op_num, catch_op_num); if (in_finally) { /* we are going out of current finally scope */ zval *fast_call = EX_VAR(EX(func)->op_array.opcodes[finally_op_end].op1.var); @@ -7715,7 +7724,7 @@ ZEND_VM_HANDLER(163, ZEND_FAST_RET, ANY, TRY_CATCH, FAST_RET) if (opline->extended_value == ZEND_FAST_RET_TO_FINALLY) { uint32_t finally_op = EX(func)->op_array.try_catch_array[opline->op2.num].finally_op; - zend_cleanup_live_vars(execute_data, opline - EX(func)->op_array.opcodes, finally_op); + cleanup_live_vars(execute_data, opline - EX(func)->op_array.opcodes, finally_op); ZEND_VM_SET_OPCODE(&EX(func)->op_array.opcodes[finally_op]); ZEND_VM_CONTINUE(); } else { @@ -7724,11 +7733,11 @@ ZEND_VM_HANDLER(163, ZEND_FAST_RET, ANY, TRY_CATCH, FAST_RET) if (opline->extended_value == ZEND_FAST_RET_TO_CATCH) { uint32_t catch_op = EX(func)->op_array.try_catch_array[opline->op2.num].catch_op; - zend_cleanup_live_vars(execute_data, opline - EX(func)->op_array.opcodes, catch_op); + cleanup_live_vars(execute_data, opline - EX(func)->op_array.opcodes, catch_op); ZEND_VM_SET_OPCODE(&EX(func)->op_array.opcodes[catch_op]); ZEND_VM_CONTINUE(); } else { - zend_cleanup_live_vars(execute_data, opline - EX(func)->op_array.opcodes, 0); + cleanup_live_vars(execute_data, opline - EX(func)->op_array.opcodes, 0); if (UNEXPECTED((EX(func)->op_array.fn_flags & ZEND_ACC_GENERATOR) != 0)) { zend_generator *generator = zend_get_running_generator(execute_data); zend_generator_close(generator, 1); diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 157cb37..246324a 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -621,6 +621,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_DO_UCALL_SPEC_HANDLER(ZEND_OPC SAVE_OPLINE(); EX(call) = NULL; + EG(scope) = NULL; ret = NULL; call->symbol_table = NULL; @@ -644,9 +645,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_DO_FCALL_BY_NAME_SPEC_HANDLER( zval *ret; SAVE_OPLINE(); + EX(call) = NULL; if (EXPECTED(fbc->type == ZEND_USER_FUNCTION)) { - EX(call) = NULL; EG(scope) = NULL; if (UNEXPECTED((fbc->common.fn_flags & ZEND_ACC_GENERATOR) != 0)) { if (EXPECTED(RETURN_VALUE_USED(opline))) { @@ -688,7 +689,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_DO_FCALL_BY_NAME_SPEC_HANDLER( call->prev_execute_data = execute_data; EG(current_execute_data) = call; - EX(call) = NULL; if (fbc->common.fn_flags & ZEND_ACC_HAS_TYPE_HINTS) { uint32_t i; @@ -749,6 +749,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_DO_FCALL_SPEC_HANDLER(ZEND_OPC zval *ret; SAVE_OPLINE(); + EX(call) = NULL; if (UNEXPECTED((fbc->common.fn_flags & (ZEND_ACC_ABSTRACT|ZEND_ACC_DEPRECATED)) != 0)) { if (UNEXPECTED((fbc->common.fn_flags & ZEND_ACC_ABSTRACT) != 0)) { zend_throw_error(NULL, "Cannot call abstract method %s::%s()", ZSTR_VAL(fbc->common.scope->name), ZSTR_VAL(fbc->common.function_name)); @@ -764,7 +765,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_DO_FCALL_SPEC_HANDLER(ZEND_OPC } } } - EX(call) = NULL; LOAD_OPLINE(); @@ -1514,14 +1514,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_HANDLE_EXCEPTION_SPEC_HANDLER( } } - if (EX(call)) { - cleanup_call_frame(execute_data, EG(opline_before_exception)); - } + cleanup_unfinished_calls(execute_data, op_num); if (finally_op_num && (!catch_op_num || catch_op_num >= finally_op_num)) { zval *fast_call = EX_VAR(EX(func)->op_array.opcodes[finally_op_end].op1.var); - zend_cleanup_live_vars(execute_data, op_num, finally_op_num); + cleanup_live_vars(execute_data, op_num, finally_op_num); if (in_finally && Z_OBJ_P(fast_call)) { zend_exception_set_previous(EG(exception), Z_OBJ_P(fast_call)); } @@ -1531,7 +1529,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_HANDLE_EXCEPTION_SPEC_HANDLER( ZEND_VM_SET_OPCODE(&EX(func)->op_array.opcodes[finally_op_num]); ZEND_VM_CONTINUE(); } else { - zend_cleanup_live_vars(execute_data, op_num, catch_op_num); + cleanup_live_vars(execute_data, op_num, catch_op_num); if (in_finally) { /* we are going out of current finally scope */ zval *fast_call = EX_VAR(EX(func)->op_array.opcodes[finally_op_end].op1.var); @@ -1645,7 +1643,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FAST_RET_SPEC_HANDLER(ZEND_OPC if (opline->extended_value == ZEND_FAST_RET_TO_FINALLY) { uint32_t finally_op = EX(func)->op_array.try_catch_array[opline->op2.num].finally_op; - zend_cleanup_live_vars(execute_data, opline - EX(func)->op_array.opcodes, finally_op); + cleanup_live_vars(execute_data, opline - EX(func)->op_array.opcodes, finally_op); ZEND_VM_SET_OPCODE(&EX(func)->op_array.opcodes[finally_op]); ZEND_VM_CONTINUE(); } else { @@ -1654,11 +1652,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FAST_RET_SPEC_HANDLER(ZEND_OPC if (opline->extended_value == ZEND_FAST_RET_TO_CATCH) { uint32_t catch_op = EX(func)->op_array.try_catch_array[opline->op2.num].catch_op; - zend_cleanup_live_vars(execute_data, opline - EX(func)->op_array.opcodes, catch_op); + cleanup_live_vars(execute_data, opline - EX(func)->op_array.opcodes, catch_op); ZEND_VM_SET_OPCODE(&EX(func)->op_array.opcodes[catch_op]); ZEND_VM_CONTINUE(); } else { - zend_cleanup_live_vars(execute_data, opline - EX(func)->op_array.opcodes, 0); + cleanup_live_vars(execute_data, opline - EX(func)->op_array.opcodes, 0); if (UNEXPECTED((EX(func)->op_array.fn_flags & ZEND_ACC_GENERATOR) != 0)) { zend_generator *generator = zend_get_running_generator(execute_data); zend_generator_close(generator, 1); @@ -1908,6 +1906,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_FCALL_BY_NAME_SPEC_CONST_ USE_OPLINE zend_function *fbc; zval *function_name, *func; + zend_execute_data *call; fbc = CACHED_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op2))); if (UNEXPECTED(fbc == NULL)) { @@ -1921,8 +1920,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_FCALL_BY_NAME_SPEC_CONST_ fbc = Z_FUNC_P(func); CACHE_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op2)), fbc); } - EX(call) = zend_vm_stack_push_call_frame(ZEND_CALL_NESTED_FUNCTION, + call = zend_vm_stack_push_call_frame(ZEND_CALL_NESTED_FUNCTION, fbc, opline->extended_value, NULL, NULL); + EX(call) = call; ZEND_VM_NEXT_OPCODE(); } @@ -1936,6 +1936,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_DYNAMIC_CALL_SPEC_CONST_H zend_class_entry *called_scope; zend_object *object; + zend_execute_data *call; uint32_t call_info = ZEND_CALL_NESTED_FUNCTION; SAVE_OPLINE(); @@ -1959,8 +1960,7 @@ try_function_name: called_scope = zend_fetch_class_by_name(lcname, NULL, ZEND_FETCH_CLASS_DEFAULT | ZEND_FETCH_CLASS_EXCEPTION); if (UNEXPECTED(called_scope == NULL)) { zend_string_release(lcname); - - HANDLE_EXCEPTION(); + ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); } mname = zend_string_init(Z_STRVAL_P(function_name) + (cname_length + sizeof("::") - 1), mname_length, 0); @@ -2019,6 +2019,7 @@ try_function_name: called_scope = NULL; object = NULL; } + } else if (IS_CONST != IS_CONST && EXPECTED(Z_TYPE_P(function_name) == IS_OBJECT) && Z_OBJ_HANDLER_P(function_name, get_closure) && @@ -2032,6 +2033,7 @@ try_function_name: call_info |= ZEND_CALL_RELEASE_THIS; GC_REFCOUNT(object)++; /* For $this pointer */ } + } else if (EXPECTED(Z_TYPE_P(function_name) == IS_ARRAY) && zend_hash_num_elements(Z_ARRVAL_P(function_name)) == 2) { zval *obj; @@ -2115,6 +2117,7 @@ try_function_name: GC_REFCOUNT(object)++; /* For $this pointer */ } } + } else if ((IS_CONST & (IS_VAR|IS_CV)) && Z_TYPE_P(function_name) == IS_REFERENCE) { function_name = Z_REFVAL_P(function_name); goto try_function_name; @@ -2129,9 +2132,9 @@ try_function_name: HANDLE_EXCEPTION(); } - - EX(call) = zend_vm_stack_push_call_frame(call_info, + call = zend_vm_stack_push_call_frame(call_info, fbc, opline->extended_value, called_scope, object); + EX(call) = call; ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); } @@ -2175,6 +2178,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_FCALL_SPEC_CONST_HANDLER( zval *fname = EX_CONSTANT(opline->op2); zval *func; zend_function *fbc; + zend_execute_data *call; fbc = CACHED_PTR(Z_CACHE_SLOT_P(fname)); if (UNEXPECTED(fbc == NULL)) { @@ -2188,9 +2192,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_FCALL_SPEC_CONST_HANDLER( CACHE_PTR(Z_CACHE_SLOT_P(fname), fbc); } - EX(call) = zend_vm_stack_push_call_frame_ex( + call = zend_vm_stack_push_call_frame_ex( opline->op1.num, ZEND_CALL_NESTED_FUNCTION, fbc, opline->extended_value, NULL, NULL); + EX(call) = call; ZEND_VM_NEXT_OPCODE(); } @@ -2351,6 +2356,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_DYNAMIC_CALL_SPEC_CV_HAND zend_class_entry *called_scope; zend_object *object; + zend_execute_data *call; uint32_t call_info = ZEND_CALL_NESTED_FUNCTION; SAVE_OPLINE(); @@ -2374,8 +2380,7 @@ try_function_name: called_scope = zend_fetch_class_by_name(lcname, NULL, ZEND_FETCH_CLASS_DEFAULT | ZEND_FETCH_CLASS_EXCEPTION); if (UNEXPECTED(called_scope == NULL)) { zend_string_release(lcname); - - HANDLE_EXCEPTION(); + ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); } mname = zend_string_init(Z_STRVAL_P(function_name) + (cname_length + sizeof("::") - 1), mname_length, 0); @@ -2434,6 +2439,7 @@ try_function_name: called_scope = NULL; object = NULL; } + } else if (IS_CV != IS_CONST && EXPECTED(Z_TYPE_P(function_name) == IS_OBJECT) && Z_OBJ_HANDLER_P(function_name, get_closure) && @@ -2447,6 +2453,7 @@ try_function_name: call_info |= ZEND_CALL_RELEASE_THIS; GC_REFCOUNT(object)++; /* For $this pointer */ } + } else if (EXPECTED(Z_TYPE_P(function_name) == IS_ARRAY) && zend_hash_num_elements(Z_ARRVAL_P(function_name)) == 2) { zval *obj; @@ -2530,6 +2537,7 @@ try_function_name: GC_REFCOUNT(object)++; /* For $this pointer */ } } + } else if ((IS_CV & (IS_VAR|IS_CV)) && Z_TYPE_P(function_name) == IS_REFERENCE) { function_name = Z_REFVAL_P(function_name); goto try_function_name; @@ -2544,9 +2552,9 @@ try_function_name: HANDLE_EXCEPTION(); } - - EX(call) = zend_vm_stack_push_call_frame(call_info, + call = zend_vm_stack_push_call_frame(call_info, fbc, opline->extended_value, called_scope, object); + EX(call) = call; ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); } @@ -2603,6 +2611,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_DYNAMIC_CALL_SPEC_TMPVAR_ zend_free_op free_op2; zend_class_entry *called_scope; zend_object *object; + zend_execute_data *call; uint32_t call_info = ZEND_CALL_NESTED_FUNCTION; SAVE_OPLINE(); @@ -2626,8 +2635,7 @@ try_function_name: called_scope = zend_fetch_class_by_name(lcname, NULL, ZEND_FETCH_CLASS_DEFAULT | ZEND_FETCH_CLASS_EXCEPTION); if (UNEXPECTED(called_scope == NULL)) { zend_string_release(lcname); - zval_ptr_dtor_nogc(free_op2); - HANDLE_EXCEPTION(); + ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); } mname = zend_string_init(Z_STRVAL_P(function_name) + (cname_length + sizeof("::") - 1), mname_length, 0); @@ -2686,6 +2694,7 @@ try_function_name: called_scope = NULL; object = NULL; } + zval_ptr_dtor_nogc(free_op2); } else if ((IS_TMP_VAR|IS_VAR) != IS_CONST && EXPECTED(Z_TYPE_P(function_name) == IS_OBJECT) && Z_OBJ_HANDLER_P(function_name, get_closure) && @@ -2699,6 +2708,7 @@ try_function_name: call_info |= ZEND_CALL_RELEASE_THIS; GC_REFCOUNT(object)++; /* For $this pointer */ } + zval_ptr_dtor_nogc(free_op2); } else if (EXPECTED(Z_TYPE_P(function_name) == IS_ARRAY) && zend_hash_num_elements(Z_ARRVAL_P(function_name)) == 2) { zval *obj; @@ -2782,6 +2792,7 @@ try_function_name: GC_REFCOUNT(object)++; /* For $this pointer */ } } + zval_ptr_dtor_nogc(free_op2); } else if (((IS_TMP_VAR|IS_VAR) & (IS_VAR|IS_CV)) && Z_TYPE_P(function_name) == IS_REFERENCE) { function_name = Z_REFVAL_P(function_name); goto try_function_name; @@ -2796,11 +2807,10 @@ try_function_name: zval_ptr_dtor_nogc(free_op2); HANDLE_EXCEPTION(); } - - EX(call) = zend_vm_stack_push_call_frame(call_info, + call = zend_vm_stack_push_call_frame(call_info, fbc, opline->extended_value, called_scope, object); + EX(call) = call; - zval_ptr_dtor_nogc(free_op2); ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); } @@ -3368,13 +3378,14 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_NEW_SPEC_CONST_HANDLER(ZEND_OP ZEND_VM_JMP(OP_JMP_ADDR(opline, opline->op2)); } else { /* We are not handling overloaded classes right now */ - EX(call) = zend_vm_stack_push_call_frame( - ZEND_CALL_FUNCTION | ZEND_CALL_RELEASE_THIS | ZEND_CALL_CTOR | - (EXPECTED(RETURN_VALUE_USED(opline)) ? 0 : ZEND_CALL_CTOR_RESULT_UNUSED), + zend_execute_data *call = zend_vm_stack_push_call_frame( + ZEND_CALL_FUNCTION | ZEND_CALL_RELEASE_THIS | ZEND_CALL_CTOR | + (EXPECTED(RETURN_VALUE_USED(opline)) ? 0 : ZEND_CALL_CTOR_RESULT_UNUSED), constructor, opline->extended_value, ce, Z_OBJ(object_zval)); + EX(call) = call; if (EXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), &object_zval); @@ -3671,7 +3682,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INCLUDE_OR_EVAL_SPEC_CONST_HAN } call->prev_execute_data = execute_data; - i_init_code_execute_data(call, new_op_array, return_value); + i_init_code_execute_data(call, new_op_array, return_value); if (EXPECTED(zend_execute_ex == execute_ex)) { ZEND_VM_ENTER(); } else { @@ -5090,12 +5101,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_CONST_ SAVE_OPLINE(); if (zend_is_by_ref_func_arg_fetch(opline, EX(call))) { - if (IS_CONST == IS_CONST || IS_CONST == IS_TMP_VAR) { - zend_throw_error(NULL, "Cannot use temporary expression in write context"); + if (IS_CONST == IS_CONST || IS_CONST == IS_TMP_VAR) { + zend_throw_error(NULL, "Cannot use temporary expression in write context"); HANDLE_EXCEPTION(); - } + } container = NULL; if (IS_CONST == IS_VAR && UNEXPECTED(container == NULL)) { zend_throw_error(NULL, "Cannot use string offset as an array"); @@ -5429,6 +5440,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_CONST_CO zend_function *fbc; zend_class_entry *called_scope; zend_object *obj; + zend_execute_data *call; uint32_t call_info; SAVE_OPLINE(); @@ -5529,8 +5541,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_CONST_CO GC_REFCOUNT(obj)++; /* For $this pointer */ } - EX(call) = zend_vm_stack_push_call_frame(call_info, + call = zend_vm_stack_push_call_frame(call_info, fbc, opline->extended_value, called_scope, obj); + EX(call) = call; ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); @@ -5543,6 +5556,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_C zend_class_entry *ce; zend_object *object; zend_function *fbc; + zend_execute_data *call; SAVE_OPLINE(); @@ -5667,8 +5681,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_C } } - EX(call) = zend_vm_stack_push_call_frame(ZEND_CALL_NESTED_FUNCTION, + call = zend_vm_stack_push_call_frame(ZEND_CALL_NESTED_FUNCTION, fbc, opline->extended_value, ce, object); + EX(call) = call; ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); } @@ -5683,25 +5698,13 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_USER_CALL_SPEC_CONST_CONS zend_function *func; zend_class_entry *called_scope; zend_object *object; + zend_execute_data *call; uint32_t call_info = ZEND_CALL_NESTED_FUNCTION; SAVE_OPLINE(); function_name = EX_CONSTANT(opline->op2); if (zend_is_callable_ex(function_name, NULL, 0, NULL, &fcc, &error)) { func = fcc.function_handler; - - if (error) { - efree(error); - /* This is the only soft error is_callable() can generate */ - zend_error(E_DEPRECATED, - "Non-static method %s::%s() should not be called statically", - ZSTR_VAL(func->common.scope->name), ZSTR_VAL(func->common.function_name)); - if (UNEXPECTED(EG(exception) != NULL)) { - - HANDLE_EXCEPTION(); - } - } - if (func->common.fn_flags & ZEND_ACC_CLOSURE) { /* Delay closure destruction until its invocation */ if (IS_CONST & (IS_VAR|IS_CV)) { @@ -5717,16 +5720,27 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_USER_CALL_SPEC_CONST_CONS call_info |= ZEND_CALL_RELEASE_THIS; GC_REFCOUNT(object)++; /* For $this pointer */ } + if (error) { + efree(error); + /* This is the only soft error is_callable() can generate */ + zend_error(E_DEPRECATED, + "Non-static method %s::%s() should not be called statically", + ZSTR_VAL(func->common.scope->name), ZSTR_VAL(func->common.function_name)); + if (UNEXPECTED(EG(exception) != NULL)) { + HANDLE_EXCEPTION(); + } + } } else { zend_internal_type_error(EX_USES_STRICT_TYPES(), "%s() expects parameter 1 to be a valid callback, %s", Z_STRVAL_P(EX_CONSTANT(opline->op1)), error); efree(error); - func = (zend_function *) &zend_pass_function; + func = (zend_function*)&zend_pass_function; called_scope = NULL; object = NULL; } - EX(call) = zend_vm_stack_push_call_frame(call_info, + call = zend_vm_stack_push_call_frame(call_info, func, opline->extended_value, called_scope, object); + EX(call) = call; ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); } @@ -7389,12 +7403,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_CONST_ SAVE_OPLINE(); if (zend_is_by_ref_func_arg_fetch(opline, EX(call))) { - if (IS_CONST == IS_CONST || IS_CONST == IS_TMP_VAR) { - zend_throw_error(NULL, "Cannot use temporary expression in write context"); + if (IS_CONST == IS_CONST || IS_CONST == IS_TMP_VAR) { + zend_throw_error(NULL, "Cannot use temporary expression in write context"); HANDLE_EXCEPTION(); - } + } container = NULL; if (IS_CONST == IS_VAR && UNEXPECTED(container == NULL)) { zend_throw_error(NULL, "Cannot use string offset as an array"); @@ -7429,6 +7443,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_C zend_class_entry *ce; zend_object *object; zend_function *fbc; + zend_execute_data *call; SAVE_OPLINE(); @@ -7553,8 +7568,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_C } } - EX(call) = zend_vm_stack_push_call_frame(ZEND_CALL_NESTED_FUNCTION, + call = zend_vm_stack_push_call_frame(ZEND_CALL_NESTED_FUNCTION, fbc, opline->extended_value, ce, object); + EX(call) = call; ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); } @@ -8826,12 +8842,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_CONST_ SAVE_OPLINE(); if (zend_is_by_ref_func_arg_fetch(opline, EX(call))) { - if (IS_CONST == IS_CONST || IS_CONST == IS_TMP_VAR) { - zend_throw_error(NULL, "Cannot use temporary expression in write context"); + if (IS_CONST == IS_CONST || IS_CONST == IS_TMP_VAR) { + zend_throw_error(NULL, "Cannot use temporary expression in write context"); HANDLE_EXCEPTION(); - } + } container = NULL; if (IS_CONST == IS_VAR && UNEXPECTED(container == NULL)) { zend_throw_error(NULL, "Cannot use string offset as an array"); @@ -9121,6 +9137,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_CONST_CV zend_function *fbc; zend_class_entry *called_scope; zend_object *obj; + zend_execute_data *call; uint32_t call_info; SAVE_OPLINE(); @@ -9221,8 +9238,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_CONST_CV GC_REFCOUNT(obj)++; /* For $this pointer */ } - EX(call) = zend_vm_stack_push_call_frame(call_info, + call = zend_vm_stack_push_call_frame(call_info, fbc, opline->extended_value, called_scope, obj); + EX(call) = call; ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); @@ -9235,6 +9253,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_C zend_class_entry *ce; zend_object *object; zend_function *fbc; + zend_execute_data *call; SAVE_OPLINE(); @@ -9359,8 +9378,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_C } } - EX(call) = zend_vm_stack_push_call_frame(ZEND_CALL_NESTED_FUNCTION, + call = zend_vm_stack_push_call_frame(ZEND_CALL_NESTED_FUNCTION, fbc, opline->extended_value, ce, object); + EX(call) = call; ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); } @@ -9375,25 +9395,13 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_USER_CALL_SPEC_CONST_CV_H zend_function *func; zend_class_entry *called_scope; zend_object *object; + zend_execute_data *call; uint32_t call_info = ZEND_CALL_NESTED_FUNCTION; SAVE_OPLINE(); function_name = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op2.var); if (zend_is_callable_ex(function_name, NULL, 0, NULL, &fcc, &error)) { func = fcc.function_handler; - - if (error) { - efree(error); - /* This is the only soft error is_callable() can generate */ - zend_error(E_DEPRECATED, - "Non-static method %s::%s() should not be called statically", - ZSTR_VAL(func->common.scope->name), ZSTR_VAL(func->common.function_name)); - if (UNEXPECTED(EG(exception) != NULL)) { - - HANDLE_EXCEPTION(); - } - } - if (func->common.fn_flags & ZEND_ACC_CLOSURE) { /* Delay closure destruction until its invocation */ if (IS_CV & (IS_VAR|IS_CV)) { @@ -9409,16 +9417,27 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_USER_CALL_SPEC_CONST_CV_H call_info |= ZEND_CALL_RELEASE_THIS; GC_REFCOUNT(object)++; /* For $this pointer */ } + if (error) { + efree(error); + /* This is the only soft error is_callable() can generate */ + zend_error(E_DEPRECATED, + "Non-static method %s::%s() should not be called statically", + ZSTR_VAL(func->common.scope->name), ZSTR_VAL(func->common.function_name)); + if (UNEXPECTED(EG(exception) != NULL)) { + HANDLE_EXCEPTION(); + } + } } else { zend_internal_type_error(EX_USES_STRICT_TYPES(), "%s() expects parameter 1 to be a valid callback, %s", Z_STRVAL_P(EX_CONSTANT(opline->op1)), error); efree(error); - func = (zend_function *) &zend_pass_function; + func = (zend_function*)&zend_pass_function; called_scope = NULL; object = NULL; } - EX(call) = zend_vm_stack_push_call_frame(call_info, + call = zend_vm_stack_push_call_frame(call_info, func, opline->extended_value, called_scope, object); + EX(call) = call; ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); } @@ -10631,12 +10650,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_CONST_ SAVE_OPLINE(); if (zend_is_by_ref_func_arg_fetch(opline, EX(call))) { - if (IS_CONST == IS_CONST || IS_CONST == IS_TMP_VAR) { - zend_throw_error(NULL, "Cannot use temporary expression in write context"); + if (IS_CONST == IS_CONST || IS_CONST == IS_TMP_VAR) { + zend_throw_error(NULL, "Cannot use temporary expression in write context"); zval_ptr_dtor_nogc(EX_VAR(opline->op2.var)); HANDLE_EXCEPTION(); - } + } container = NULL; if (IS_CONST == IS_VAR && UNEXPECTED(container == NULL)) { zend_throw_error(NULL, "Cannot use string offset as an array"); @@ -10928,6 +10947,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_CONST_TM zend_function *fbc; zend_class_entry *called_scope; zend_object *obj; + zend_execute_data *call; uint32_t call_info; SAVE_OPLINE(); @@ -11028,8 +11048,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_CONST_TM GC_REFCOUNT(obj)++; /* For $this pointer */ } - EX(call) = zend_vm_stack_push_call_frame(call_info, + call = zend_vm_stack_push_call_frame(call_info, fbc, opline->extended_value, called_scope, obj); + EX(call) = call; zval_ptr_dtor_nogc(free_op2); @@ -11043,6 +11064,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_C zend_class_entry *ce; zend_object *object; zend_function *fbc; + zend_execute_data *call; SAVE_OPLINE(); @@ -11167,8 +11189,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_C } } - EX(call) = zend_vm_stack_push_call_frame(ZEND_CALL_NESTED_FUNCTION, + call = zend_vm_stack_push_call_frame(ZEND_CALL_NESTED_FUNCTION, fbc, opline->extended_value, ce, object); + EX(call) = call; ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); } @@ -11183,25 +11206,13 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_USER_CALL_SPEC_CONST_TMPV zend_function *func; zend_class_entry *called_scope; zend_object *object; + zend_execute_data *call; uint32_t call_info = ZEND_CALL_NESTED_FUNCTION; SAVE_OPLINE(); function_name = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2); if (zend_is_callable_ex(function_name, NULL, 0, NULL, &fcc, &error)) { func = fcc.function_handler; - - if (error) { - efree(error); - /* This is the only soft error is_callable() can generate */ - zend_error(E_DEPRECATED, - "Non-static method %s::%s() should not be called statically", - ZSTR_VAL(func->common.scope->name), ZSTR_VAL(func->common.function_name)); - if (UNEXPECTED(EG(exception) != NULL)) { - zval_ptr_dtor_nogc(free_op2); - HANDLE_EXCEPTION(); - } - } - if (func->common.fn_flags & ZEND_ACC_CLOSURE) { /* Delay closure destruction until its invocation */ if ((IS_TMP_VAR|IS_VAR) & (IS_VAR|IS_CV)) { @@ -11217,16 +11228,27 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_USER_CALL_SPEC_CONST_TMPV call_info |= ZEND_CALL_RELEASE_THIS; GC_REFCOUNT(object)++; /* For $this pointer */ } + if (error) { + efree(error); + /* This is the only soft error is_callable() can generate */ + zend_error(E_DEPRECATED, + "Non-static method %s::%s() should not be called statically", + ZSTR_VAL(func->common.scope->name), ZSTR_VAL(func->common.function_name)); + if (UNEXPECTED(EG(exception) != NULL)) { + HANDLE_EXCEPTION(); + } + } } else { zend_internal_type_error(EX_USES_STRICT_TYPES(), "%s() expects parameter 1 to be a valid callback, %s", Z_STRVAL_P(EX_CONSTANT(opline->op1)), error); efree(error); - func = (zend_function *) &zend_pass_function; + func = (zend_function*)&zend_pass_function; called_scope = NULL; object = NULL; } - EX(call) = zend_vm_stack_push_call_frame(call_info, + call = zend_vm_stack_push_call_frame(call_info, func, opline->extended_value, called_scope, object); + EX(call) = call; zval_ptr_dtor_nogc(free_op2); ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); @@ -12514,12 +12536,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_TMP_CO SAVE_OPLINE(); if (zend_is_by_ref_func_arg_fetch(opline, EX(call))) { - if (IS_TMP_VAR == IS_CONST || IS_TMP_VAR == IS_TMP_VAR) { - zend_throw_error(NULL, "Cannot use temporary expression in write context"); + if (IS_TMP_VAR == IS_CONST || IS_TMP_VAR == IS_TMP_VAR) { + zend_throw_error(NULL, "Cannot use temporary expression in write context"); zval_ptr_dtor_nogc(EX_VAR(opline->op1.var)); HANDLE_EXCEPTION(); - } + } container = NULL; if (IS_TMP_VAR == IS_VAR && UNEXPECTED(container == NULL)) { zend_throw_error(NULL, "Cannot use string offset as an array"); @@ -13381,12 +13403,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_TMP_UN SAVE_OPLINE(); if (zend_is_by_ref_func_arg_fetch(opline, EX(call))) { - if (IS_TMP_VAR == IS_CONST || IS_TMP_VAR == IS_TMP_VAR) { - zend_throw_error(NULL, "Cannot use temporary expression in write context"); + if (IS_TMP_VAR == IS_CONST || IS_TMP_VAR == IS_TMP_VAR) { + zend_throw_error(NULL, "Cannot use temporary expression in write context"); zval_ptr_dtor_nogc(EX_VAR(opline->op1.var)); HANDLE_EXCEPTION(); - } + } container = NULL; if (IS_TMP_VAR == IS_VAR && UNEXPECTED(container == NULL)) { zend_throw_error(NULL, "Cannot use string offset as an array"); @@ -13785,12 +13807,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_TMP_CV SAVE_OPLINE(); if (zend_is_by_ref_func_arg_fetch(opline, EX(call))) { - if (IS_TMP_VAR == IS_CONST || IS_TMP_VAR == IS_TMP_VAR) { - zend_throw_error(NULL, "Cannot use temporary expression in write context"); + if (IS_TMP_VAR == IS_CONST || IS_TMP_VAR == IS_TMP_VAR) { + zend_throw_error(NULL, "Cannot use temporary expression in write context"); zval_ptr_dtor_nogc(EX_VAR(opline->op1.var)); HANDLE_EXCEPTION(); - } + } container = NULL; if (IS_TMP_VAR == IS_VAR && UNEXPECTED(container == NULL)) { zend_throw_error(NULL, "Cannot use string offset as an array"); @@ -14298,12 +14320,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_TMP_TM SAVE_OPLINE(); if (zend_is_by_ref_func_arg_fetch(opline, EX(call))) { - if (IS_TMP_VAR == IS_CONST || IS_TMP_VAR == IS_TMP_VAR) { - zend_throw_error(NULL, "Cannot use temporary expression in write context"); + if (IS_TMP_VAR == IS_CONST || IS_TMP_VAR == IS_TMP_VAR) { + zend_throw_error(NULL, "Cannot use temporary expression in write context"); zval_ptr_dtor_nogc(EX_VAR(opline->op2.var)); zval_ptr_dtor_nogc(EX_VAR(opline->op1.var)); HANDLE_EXCEPTION(); - } + } container = NULL; if (IS_TMP_VAR == IS_VAR && UNEXPECTED(container == NULL)) { zend_throw_error(NULL, "Cannot use string offset as an array"); @@ -15137,7 +15159,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SEND_REF_SPEC_VAR_HANDLER(ZEND } if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SEND_VAR_EX_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -15284,13 +15306,14 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_NEW_SPEC_VAR_HANDLER(ZEND_OPCO ZEND_VM_JMP(OP_JMP_ADDR(opline, opline->op2)); } else { /* We are not handling overloaded classes right now */ - EX(call) = zend_vm_stack_push_call_frame( - ZEND_CALL_FUNCTION | ZEND_CALL_RELEASE_THIS | ZEND_CALL_CTOR | - (EXPECTED(RETURN_VALUE_USED(opline)) ? 0 : ZEND_CALL_CTOR_RESULT_UNUSED), + zend_execute_data *call = zend_vm_stack_push_call_frame( + ZEND_CALL_FUNCTION | ZEND_CALL_RELEASE_THIS | ZEND_CALL_CTOR | + (EXPECTED(RETURN_VALUE_USED(opline)) ? 0 : ZEND_CALL_CTOR_RESULT_UNUSED), constructor, opline->extended_value, ce, Z_OBJ(object_zval)); + EX(call) = call; if (EXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), &object_zval); @@ -16936,12 +16959,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_VAR_CO SAVE_OPLINE(); if (zend_is_by_ref_func_arg_fetch(opline, EX(call))) { - if (IS_VAR == IS_CONST || IS_VAR == IS_TMP_VAR) { - zend_throw_error(NULL, "Cannot use temporary expression in write context"); + if (IS_VAR == IS_CONST || IS_VAR == IS_TMP_VAR) { + zend_throw_error(NULL, "Cannot use temporary expression in write context"); zval_ptr_dtor_nogc(EX_VAR(opline->op1.var)); HANDLE_EXCEPTION(); - } + } container = _get_zval_ptr_ptr_var(opline->op1.var, execute_data, &free_op1); if (IS_VAR == IS_VAR && UNEXPECTED(container == NULL)) { zend_throw_error(NULL, "Cannot use string offset as an array"); @@ -17369,6 +17392,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_V zend_class_entry *ce; zend_object *object; zend_function *fbc; + zend_execute_data *call; SAVE_OPLINE(); @@ -17493,8 +17517,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_V } } - EX(call) = zend_vm_stack_push_call_frame(ZEND_CALL_NESTED_FUNCTION, + call = zend_vm_stack_push_call_frame(ZEND_CALL_NESTED_FUNCTION, fbc, opline->extended_value, ce, object); + EX(call) = call; ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); } @@ -18826,12 +18851,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_VAR_UN SAVE_OPLINE(); if (zend_is_by_ref_func_arg_fetch(opline, EX(call))) { - if (IS_VAR == IS_CONST || IS_VAR == IS_TMP_VAR) { - zend_throw_error(NULL, "Cannot use temporary expression in write context"); + if (IS_VAR == IS_CONST || IS_VAR == IS_TMP_VAR) { + zend_throw_error(NULL, "Cannot use temporary expression in write context"); zval_ptr_dtor_nogc(EX_VAR(opline->op1.var)); HANDLE_EXCEPTION(); - } + } container = _get_zval_ptr_ptr_var(opline->op1.var, execute_data, &free_op1); if (IS_VAR == IS_VAR && UNEXPECTED(container == NULL)) { zend_throw_error(NULL, "Cannot use string offset as an array"); @@ -18972,6 +18997,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_V zend_class_entry *ce; zend_object *object; zend_function *fbc; + zend_execute_data *call; SAVE_OPLINE(); @@ -19096,8 +19122,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_V } } - EX(call) = zend_vm_stack_push_call_frame(ZEND_CALL_NESTED_FUNCTION, + call = zend_vm_stack_push_call_frame(ZEND_CALL_NESTED_FUNCTION, fbc, opline->extended_value, ce, object); + EX(call) = call; ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); } @@ -20102,12 +20129,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_VAR_CV SAVE_OPLINE(); if (zend_is_by_ref_func_arg_fetch(opline, EX(call))) { - if (IS_VAR == IS_CONST || IS_VAR == IS_TMP_VAR) { - zend_throw_error(NULL, "Cannot use temporary expression in write context"); + if (IS_VAR == IS_CONST || IS_VAR == IS_TMP_VAR) { + zend_throw_error(NULL, "Cannot use temporary expression in write context"); zval_ptr_dtor_nogc(EX_VAR(opline->op1.var)); HANDLE_EXCEPTION(); - } + } container = _get_zval_ptr_ptr_var(opline->op1.var, execute_data, &free_op1); if (IS_VAR == IS_VAR && UNEXPECTED(container == NULL)) { zend_throw_error(NULL, "Cannot use string offset as an array"); @@ -20594,6 +20621,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_V zend_class_entry *ce; zend_object *object; zend_function *fbc; + zend_execute_data *call; SAVE_OPLINE(); @@ -20718,8 +20746,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_V } } - EX(call) = zend_vm_stack_push_call_frame(ZEND_CALL_NESTED_FUNCTION, + call = zend_vm_stack_push_call_frame(ZEND_CALL_NESTED_FUNCTION, fbc, opline->extended_value, ce, object); + EX(call) = call; ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); } @@ -21761,12 +21790,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_VAR_TM SAVE_OPLINE(); if (zend_is_by_ref_func_arg_fetch(opline, EX(call))) { - if (IS_VAR == IS_CONST || IS_VAR == IS_TMP_VAR) { - zend_throw_error(NULL, "Cannot use temporary expression in write context"); + if (IS_VAR == IS_CONST || IS_VAR == IS_TMP_VAR) { + zend_throw_error(NULL, "Cannot use temporary expression in write context"); zval_ptr_dtor_nogc(EX_VAR(opline->op2.var)); zval_ptr_dtor_nogc(EX_VAR(opline->op1.var)); HANDLE_EXCEPTION(); - } + } container = _get_zval_ptr_ptr_var(opline->op1.var, execute_data, &free_op1); if (IS_VAR == IS_VAR && UNEXPECTED(container == NULL)) { zend_throw_error(NULL, "Cannot use string offset as an array"); @@ -22167,6 +22196,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_V zend_class_entry *ce; zend_object *object; zend_function *fbc; + zend_execute_data *call; SAVE_OPLINE(); @@ -22291,8 +22321,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_V } } - EX(call) = zend_vm_stack_push_call_frame(ZEND_CALL_NESTED_FUNCTION, + call = zend_vm_stack_push_call_frame(ZEND_CALL_NESTED_FUNCTION, fbc, opline->extended_value, ce, object); + EX(call) = call; ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); } @@ -22610,13 +22641,14 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_NEW_SPEC_UNUSED_HANDLER(ZEND_O ZEND_VM_JMP(OP_JMP_ADDR(opline, opline->op2)); } else { /* We are not handling overloaded classes right now */ - EX(call) = zend_vm_stack_push_call_frame( - ZEND_CALL_FUNCTION | ZEND_CALL_RELEASE_THIS | ZEND_CALL_CTOR | - (EXPECTED(RETURN_VALUE_USED(opline)) ? 0 : ZEND_CALL_CTOR_RESULT_UNUSED), + zend_execute_data *call = zend_vm_stack_push_call_frame( + ZEND_CALL_FUNCTION | ZEND_CALL_RELEASE_THIS | ZEND_CALL_CTOR | + (EXPECTED(RETURN_VALUE_USED(opline)) ? 0 : ZEND_CALL_CTOR_RESULT_UNUSED), constructor, opline->extended_value, ce, Z_OBJ(object_zval)); + EX(call) = call; if (EXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), &object_zval); @@ -23617,6 +23649,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_UNUSED_C zend_function *fbc; zend_class_entry *called_scope; zend_object *obj; + zend_execute_data *call; uint32_t call_info; SAVE_OPLINE(); @@ -23717,8 +23750,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_UNUSED_C GC_REFCOUNT(obj)++; /* For $this pointer */ } - EX(call) = zend_vm_stack_push_call_frame(call_info, + call = zend_vm_stack_push_call_frame(call_info, fbc, opline->extended_value, called_scope, obj); + EX(call) = call; ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); @@ -23731,6 +23765,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_U zend_class_entry *ce; zend_object *object; zend_function *fbc; + zend_execute_data *call; SAVE_OPLINE(); @@ -23855,8 +23890,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_U } } - EX(call) = zend_vm_stack_push_call_frame(ZEND_CALL_NESTED_FUNCTION, + call = zend_vm_stack_push_call_frame(ZEND_CALL_NESTED_FUNCTION, fbc, opline->extended_value, ce, object); + EX(call) = call; ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); } @@ -25079,6 +25115,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_U zend_class_entry *ce; zend_object *object; zend_function *fbc; + zend_execute_data *call; SAVE_OPLINE(); @@ -25203,8 +25240,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_U } } - EX(call) = zend_vm_stack_push_call_frame(ZEND_CALL_NESTED_FUNCTION, + call = zend_vm_stack_push_call_frame(ZEND_CALL_NESTED_FUNCTION, fbc, opline->extended_value, ce, object); + EX(call) = call; ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); } @@ -26317,6 +26355,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_UNUSED_C zend_function *fbc; zend_class_entry *called_scope; zend_object *obj; + zend_execute_data *call; uint32_t call_info; SAVE_OPLINE(); @@ -26417,8 +26456,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_UNUSED_C GC_REFCOUNT(obj)++; /* For $this pointer */ } - EX(call) = zend_vm_stack_push_call_frame(call_info, + call = zend_vm_stack_push_call_frame(call_info, fbc, opline->extended_value, called_scope, obj); + EX(call) = call; ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); @@ -26431,6 +26471,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_U zend_class_entry *ce; zend_object *object; zend_function *fbc; + zend_execute_data *call; SAVE_OPLINE(); @@ -26555,8 +26596,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_U } } - EX(call) = zend_vm_stack_push_call_frame(ZEND_CALL_NESTED_FUNCTION, + call = zend_vm_stack_push_call_frame(ZEND_CALL_NESTED_FUNCTION, fbc, opline->extended_value, ce, object); + EX(call) = call; ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); } @@ -27943,6 +27985,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_UNUSED_T zend_function *fbc; zend_class_entry *called_scope; zend_object *obj; + zend_execute_data *call; uint32_t call_info; SAVE_OPLINE(); @@ -28043,8 +28086,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_UNUSED_T GC_REFCOUNT(obj)++; /* For $this pointer */ } - EX(call) = zend_vm_stack_push_call_frame(call_info, + call = zend_vm_stack_push_call_frame(call_info, fbc, opline->extended_value, called_scope, obj); + EX(call) = call; zval_ptr_dtor_nogc(free_op2); @@ -28058,6 +28102,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_U zend_class_entry *ce; zend_object *object; zend_function *fbc; + zend_execute_data *call; SAVE_OPLINE(); @@ -28182,8 +28227,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_U } } - EX(call) = zend_vm_stack_push_call_frame(ZEND_CALL_NESTED_FUNCTION, + call = zend_vm_stack_push_call_frame(ZEND_CALL_NESTED_FUNCTION, fbc, opline->extended_value, ce, object); + EX(call) = call; ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); } @@ -29233,7 +29279,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SEND_REF_SPEC_CV_HANDLER(ZEND_ ZVAL_REF(varptr, Z_REF_P(arg)); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SEND_VAR_EX_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -29650,7 +29696,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INCLUDE_OR_EVAL_SPEC_CV_HANDLE } call->prev_execute_data = execute_data; - i_init_code_execute_data(call, new_op_array, return_value); + i_init_code_execute_data(call, new_op_array, return_value); if (EXPECTED(zend_execute_ex == execute_ex)) { ZEND_VM_ENTER(); } else { @@ -31660,12 +31706,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_CV_CON SAVE_OPLINE(); if (zend_is_by_ref_func_arg_fetch(opline, EX(call))) { - if (IS_CV == IS_CONST || IS_CV == IS_TMP_VAR) { - zend_throw_error(NULL, "Cannot use temporary expression in write context"); + if (IS_CV == IS_CONST || IS_CV == IS_TMP_VAR) { + zend_throw_error(NULL, "Cannot use temporary expression in write context"); HANDLE_EXCEPTION(); - } + } container = _get_zval_ptr_cv_undef_BP_VAR_W(execute_data, opline->op1.var); if (IS_CV == IS_VAR && UNEXPECTED(container == NULL)) { zend_throw_error(NULL, "Cannot use string offset as an array"); @@ -32278,6 +32324,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_CV_CONST zend_function *fbc; zend_class_entry *called_scope; zend_object *obj; + zend_execute_data *call; uint32_t call_info; SAVE_OPLINE(); @@ -32378,8 +32425,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_CV_CONST GC_REFCOUNT(obj)++; /* For $this pointer */ } - EX(call) = zend_vm_stack_push_call_frame(call_info, + call = zend_vm_stack_push_call_frame(call_info, fbc, opline->extended_value, called_scope, obj); + EX(call) = call; ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); @@ -34729,12 +34777,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_CV_UNU SAVE_OPLINE(); if (zend_is_by_ref_func_arg_fetch(opline, EX(call))) { - if (IS_CV == IS_CONST || IS_CV == IS_TMP_VAR) { - zend_throw_error(NULL, "Cannot use temporary expression in write context"); + if (IS_CV == IS_CONST || IS_CV == IS_TMP_VAR) { + zend_throw_error(NULL, "Cannot use temporary expression in write context"); HANDLE_EXCEPTION(); - } + } container = _get_zval_ptr_cv_undef_BP_VAR_W(execute_data, opline->op1.var); if (IS_CV == IS_VAR && UNEXPECTED(container == NULL)) { zend_throw_error(NULL, "Cannot use string offset as an array"); @@ -36774,12 +36822,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_CV_CV_ SAVE_OPLINE(); if (zend_is_by_ref_func_arg_fetch(opline, EX(call))) { - if (IS_CV == IS_CONST || IS_CV == IS_TMP_VAR) { - zend_throw_error(NULL, "Cannot use temporary expression in write context"); + if (IS_CV == IS_CONST || IS_CV == IS_TMP_VAR) { + zend_throw_error(NULL, "Cannot use temporary expression in write context"); HANDLE_EXCEPTION(); - } + } container = _get_zval_ptr_cv_undef_BP_VAR_W(execute_data, opline->op1.var); if (IS_CV == IS_VAR && UNEXPECTED(container == NULL)) { zend_throw_error(NULL, "Cannot use string offset as an array"); @@ -37406,6 +37454,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_CV_CV_HA zend_function *fbc; zend_class_entry *called_scope; zend_object *obj; + zend_execute_data *call; uint32_t call_info; SAVE_OPLINE(); @@ -37506,8 +37555,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_CV_CV_HA GC_REFCOUNT(obj)++; /* For $this pointer */ } - EX(call) = zend_vm_stack_push_call_frame(call_info, + call = zend_vm_stack_push_call_frame(call_info, fbc, opline->extended_value, called_scope, obj); + EX(call) = call; ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); @@ -39427,12 +39477,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_CV_TMP SAVE_OPLINE(); if (zend_is_by_ref_func_arg_fetch(opline, EX(call))) { - if (IS_CV == IS_CONST || IS_CV == IS_TMP_VAR) { - zend_throw_error(NULL, "Cannot use temporary expression in write context"); + if (IS_CV == IS_CONST || IS_CV == IS_TMP_VAR) { + zend_throw_error(NULL, "Cannot use temporary expression in write context"); zval_ptr_dtor_nogc(EX_VAR(opline->op2.var)); HANDLE_EXCEPTION(); - } + } container = _get_zval_ptr_cv_undef_BP_VAR_W(execute_data, opline->op1.var); if (IS_CV == IS_VAR && UNEXPECTED(container == NULL)) { zend_throw_error(NULL, "Cannot use string offset as an array"); @@ -39975,6 +40025,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_CV_TMPVA zend_function *fbc; zend_class_entry *called_scope; zend_object *obj; + zend_execute_data *call; uint32_t call_info; SAVE_OPLINE(); @@ -40075,8 +40126,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_CV_TMPVA GC_REFCOUNT(obj)++; /* For $this pointer */ } - EX(call) = zend_vm_stack_push_call_frame(call_info, + call = zend_vm_stack_push_call_frame(call_info, fbc, opline->extended_value, called_scope, obj); + EX(call) = call; zval_ptr_dtor_nogc(free_op2); @@ -41097,7 +41149,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INCLUDE_OR_EVAL_SPEC_TMPVAR_HA } call->prev_execute_data = execute_data; - i_init_code_execute_data(call, new_op_array, return_value); + i_init_code_execute_data(call, new_op_array, return_value); if (EXPECTED(zend_execute_ex == execute_ex)) { ZEND_VM_ENTER(); } else { @@ -42147,6 +42199,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_TMPVAR_C zend_function *fbc; zend_class_entry *called_scope; zend_object *obj; + zend_execute_data *call; uint32_t call_info; SAVE_OPLINE(); @@ -42247,10 +42300,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_TMPVAR_C GC_REFCOUNT(obj)++; /* For $this pointer */ } - EX(call) = zend_vm_stack_push_call_frame(call_info, + call = zend_vm_stack_push_call_frame(call_info, fbc, opline->extended_value, called_scope, obj); + EX(call) = call; zval_ptr_dtor_nogc(free_op1); + ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); } @@ -44343,6 +44398,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_TMPVAR_C zend_function *fbc; zend_class_entry *called_scope; zend_object *obj; + zend_execute_data *call; uint32_t call_info; SAVE_OPLINE(); @@ -44443,10 +44499,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_TMPVAR_C GC_REFCOUNT(obj)++; /* For $this pointer */ } - EX(call) = zend_vm_stack_push_call_frame(call_info, + call = zend_vm_stack_push_call_frame(call_info, fbc, opline->extended_value, called_scope, obj); + EX(call) = call; zval_ptr_dtor_nogc(free_op1); + ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); } @@ -45477,6 +45535,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_TMPVAR_T zend_function *fbc; zend_class_entry *called_scope; zend_object *obj; + zend_execute_data *call; uint32_t call_info; SAVE_OPLINE(); @@ -45577,11 +45636,13 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_TMPVAR_T GC_REFCOUNT(obj)++; /* For $this pointer */ } - EX(call) = zend_vm_stack_push_call_frame(call_info, + call = zend_vm_stack_push_call_frame(call_info, fbc, opline->extended_value, called_scope, obj); + EX(call) = call; zval_ptr_dtor_nogc(free_op2); zval_ptr_dtor_nogc(free_op1); + ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); }
« previous php.cvs (#90037) next »