com php-src: Separate arg values and arg passing This simplifies (better: makes it superfluous) cleanup of EX(call) in case of exceptions. Also it is
a requirement for stackless generators.: Zend/zend_compile. c Zend/zend_execute.c Zend/zend_execute.h Zend/ze nd_generators.c Zend/zend_vm_def.h
Zend/zend_vm _execute.h
| From: | Dmitry Stogov | Date: | Tue, 24 Nov 2015 08:27:23 +0000 |
| Subject: | com php-src: Separate arg values and arg passing This simplifies (better: makes it superfluous) cleanup of EX(call) in case of exceptions. Also it is a requirement for stackless generators.: Zend/zend_compile. c Zend/zend_execute.c Zend/zend_execute.h Zend/ze nd_generators.c Zend/zend_vm_def.h Zend/zend_vm _execute.h |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-90039@lists.php.net to get a copy of this message | ||
Commit: 5a75e8b484822bc6ae7377a256c4b9fad974cab3
Author: Bob Weinand <bobwei9@hotmail.com> Sun, 22 Nov 2015 14:52:37 +0100
Parents: 1e9fcb49ace6b1beb29572dc45eca0d6d2176867
Branches: separate_arg_value_and_passing
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5a75e8b484822bc6ae7377a256c4b9fad974cab3
Log:
Separate arg values and arg passing
This simplifies (better: makes it superfluous) cleanup of EX(call) in case of exceptions.
Also it is a requirement for stackless generators.
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 40bdc9f..85914dc 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -1892,6 +1892,7 @@ 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 */ @@ -1924,7 +1925,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, def->result.var); + ZEND_LIVE_TMPVAR, var); break; } } @@ -2153,7 +2154,7 @@ static zend_op *zend_delayed_compile_end(uint32_t offset) /* {{{ */ zend_op *opline = NULL, *oplines = zend_stack_base(&CG(delayed_oplines_stack)); uint32_t i, count = zend_stack_count(&CG(delayed_oplines_stack)); - ZEND_ASSERT(count > offset); + ZEND_ASSERT(count >= offset); for (i = offset; i < count; ++i) { opline = get_next_op(CG(active_op_array)); memcpy(opline, &oplines[i], sizeof(zend_op)); @@ -2874,44 +2875,85 @@ void zend_compile_compound_assign(znode *result, zend_ast *ast) /* {{{ */ } /* }}} */ -uint32_t zend_compile_args(zend_ast *ast, zend_function *fbc) /* {{{ */ +znode *zend_compile_arg_values(zend_ast *ast, zend_function *fbc) /* {{{ */ { - /* TODO.AST &var error */ zend_ast_list *args = zend_ast_get_list(ast); - uint32_t i; + uint32_t i = args->children; zend_bool uses_arg_unpack = 0; + znode *arg_nodes = emalloc(sizeof(znode) * args->children); + + for (i = 0; i < args->children; i++) { + zend_ast *arg = args->child[i]; + uint32_t arg_num = i + 1; + + arg_nodes[i].flag = 0; + + if (arg->kind == ZEND_AST_UNPACK) { + uses_arg_unpack = 1; + fbc = NULL; + + zend_compile_expr(arg_nodes + i, arg->child[0]); + continue; + } + + if (uses_arg_unpack) { + zend_error_noreturn(E_COMPILE_ERROR, "Cannot use positional argument after argument unpacking"); + } + + if (zend_is_variable(arg)) { + if (zend_is_call(arg)) { + zend_compile_var(arg_nodes + i, arg, BP_VAR_R); + } else if (fbc) { + if (ARG_SHOULD_BE_SENT_BY_REF(fbc, arg_num)) { + zend_compile_var(arg_nodes + i, arg, BP_VAR_W); + } else { + zend_compile_var(arg_nodes + i, arg, BP_VAR_R); + } + } else { + /* BP_VAR_FUNC_ARG needs to be fetched after EX(call) had been determined */ + uint32_t offset = zend_delayed_compile_begin(); + zend_delayed_compile_var(arg_nodes + i, arg, BP_VAR_FUNC_ARG | (arg_num << BP_VAR_SHIFT)); + arg_nodes[i].flag = zend_delayed_compile_begin() - offset; + } + } else { + zend_compile_expr(arg_nodes + i, arg); + } + } + + return arg_nodes; +} +/* }}} */ + +uint32_t zend_compile_arg_passing(zend_ast *ast, zend_function *fbc, znode *arg_nodes) /* {{{ */ +{ + zend_ast_list *args = zend_ast_get_list(ast); + int i; uint32_t arg_count = 0; /* number of arguments not including unpacks */ + for (i = args->children - 1; i >= 0; i--) { + if (arg_nodes[i].flag) { + zend_delayed_compile_end(zend_delayed_compile_begin() - arg_nodes[i].flag); + } + } + for (i = 0; i < args->children; ++i) { zend_ast *arg = args->child[i]; uint32_t arg_num = i + 1; - znode arg_node; zend_op *opline; zend_uchar opcode; zend_ulong flags = 0; if (arg->kind == ZEND_AST_UNPACK) { - uses_arg_unpack = 1; - fbc = NULL; - - zend_compile_expr(&arg_node, arg->child[0]); - opline = zend_emit_op(NULL, ZEND_SEND_UNPACK, &arg_node, NULL); + opline = zend_emit_op(NULL, ZEND_SEND_UNPACK, arg_nodes + i, NULL); opline->op2.num = arg_count; opline->result.var = (uint32_t)(zend_intptr_t)ZEND_CALL_ARG(NULL, arg_count); continue; } - if (uses_arg_unpack) { - zend_error_noreturn(E_COMPILE_ERROR, - "Cannot use positional argument after argument unpacking"); - } - - arg_count++; if (zend_is_variable(arg)) { if (zend_is_call(arg)) { - zend_compile_var(&arg_node, arg, BP_VAR_R); - if (arg_node.op_type & (IS_CONST|IS_TMP_VAR)) { + if (arg_nodes[i].op_type & (IS_CONST|IS_TMP_VAR)) { /* Function call was converted into builtin instruction */ opcode = ZEND_SEND_VAL; } else { @@ -2926,21 +2968,16 @@ uint32_t zend_compile_args(zend_ast *ast, zend_function *fbc) /* {{{ */ } } else if (fbc) { if (ARG_SHOULD_BE_SENT_BY_REF(fbc, arg_num)) { - zend_compile_var(&arg_node, arg, BP_VAR_W); opcode = ZEND_SEND_REF; } else { - zend_compile_var(&arg_node, arg, BP_VAR_R); opcode = ZEND_SEND_VAR; } } else { - zend_compile_var(&arg_node, arg, - BP_VAR_FUNC_ARG | (arg_num << BP_VAR_SHIFT)); opcode = ZEND_SEND_VAR_EX; } } else { - zend_compile_expr(&arg_node, arg); - ZEND_ASSERT(arg_node.op_type != IS_CV); - if (arg_node.op_type == IS_VAR) { + ZEND_ASSERT(arg_nodes[i].op_type != IS_CV); + if (arg_nodes[i].op_type == IS_VAR) { opcode = ZEND_SEND_VAR_NO_REF; if (fbc && ARG_MUST_BE_SENT_BY_REF(fbc, arg_num)) { flags |= ZEND_ARG_SEND_BY_REF; @@ -2957,7 +2994,7 @@ uint32_t zend_compile_args(zend_ast *ast, zend_function *fbc) /* {{{ */ } } - opline = zend_emit_op(NULL, opcode, &arg_node, NULL); + opline = zend_emit_op(NULL, opcode, arg_nodes + i, NULL); opline->op2.opline_num = arg_num; opline->result.var = (uint32_t)(zend_intptr_t)ZEND_CALL_ARG(NULL, arg_num); @@ -2974,8 +3011,12 @@ uint32_t zend_compile_args(zend_ast *ast, zend_function *fbc) /* {{{ */ } else if (fbc) { opline->extended_value = ZEND_ARG_COMPILE_TIME_BOUND; } + + arg_count++; } + efree(arg_nodes); + return arg_count; } /* }}} */ @@ -3005,16 +3046,14 @@ ZEND_API zend_uchar zend_get_call_op(zend_uchar init_op, zend_function *fbc) /* } /* }}} */ -void zend_compile_call_common(znode *result, zend_ast *args_ast, zend_function *fbc) /* {{{ */ +void zend_compile_call_common(znode *result, znode *arg_nodes, zend_ast *args_ast, zend_function *fbc) /* {{{ */ { zend_op *opline; - uint32_t opnum_init = get_next_op_number(CG(active_op_array)) - 1; - uint32_t arg_count; - uint32_t call_flags; + uint32_t arg_count, call_flags, opnum_init = get_next_op_number(CG(active_op_array)) - 1;; zend_do_extended_fcall_begin(); - arg_count = zend_compile_args(args_ast, fbc); + arg_count = zend_compile_arg_passing(args_ast, fbc, arg_nodes); opline = &CG(active_op_array)->opcodes[opnum_init]; opline->extended_value = arg_count; @@ -3046,6 +3085,7 @@ zend_bool zend_compile_function_name(znode *name_node, zend_ast *name_ast) /* {{ void zend_compile_ns_call(znode *result, znode *name_node, zend_ast *args_ast) /* {{{ */ { + znode *arg_nodes = zend_compile_arg_values(args_ast, NULL); zend_op *opline = get_next_op(CG(active_op_array)); opline->opcode = ZEND_INIT_NS_FCALL_BY_NAME; SET_UNUSED(opline->op1); @@ -3054,12 +3094,14 @@ void zend_compile_ns_call(znode *result, znode *name_node, zend_ast *args_ast) / CG(active_op_array), Z_STR(name_node->u.constant)); zend_alloc_cache_slot(opline->op2.constant); - zend_compile_call_common(result, args_ast, NULL); + zend_compile_call_common(result, arg_nodes, args_ast, NULL); } /* }}} */ void zend_compile_dynamic_call(znode *result, znode *name_node, zend_ast *args_ast) /* {{{ */ { + znode *arg_nodes = zend_compile_arg_values(args_ast, NULL); + if (name_node->op_type == IS_CONST && Z_TYPE(name_node->u.constant) == IS_STRING) { const char *colon; zend_string *str = Z_STR(name_node->u.constant); @@ -3088,7 +3130,7 @@ void zend_compile_dynamic_call(znode *result, znode *name_node, zend_ast *args_a zend_emit_op(NULL, ZEND_INIT_DYNAMIC_CALL, NULL, name_node); } - zend_compile_call_common(result, args_ast, NULL); + zend_compile_call_common(result, arg_nodes, args_ast, NULL); } /* }}} */ @@ -3233,8 +3275,8 @@ int zend_compile_func_cufa(znode *result, zend_ast_list *args, zend_string *lcna return FAILURE; } - zend_compile_init_user_func(args->child[0], 0, lcname); zend_compile_expr(&arg_node, args->child[1]); + zend_compile_init_user_func(args->child[0], 0, lcname); zend_emit_op(NULL, ZEND_SEND_ARRAY, &arg_node, NULL); zend_emit_op(result, ZEND_DO_FCALL, NULL, NULL); @@ -3245,33 +3287,36 @@ int zend_compile_func_cufa(znode *result, zend_ast_list *args, zend_string *lcna /* cuf = call_user_func */ int zend_compile_func_cuf(znode *result, zend_ast_list *args, zend_string *lcname) /* {{{ */ { - uint32_t i; + uint32_t i, offset = zend_delayed_compile_begin(); + znode *arg_nodes; if (args->children < 1 || zend_args_contain_unpack(args)) { return FAILURE; } - zend_compile_init_user_func(args->child[0], args->children - 1, lcname); + arg_nodes = emalloc(args->children * sizeof(znode)); + for (i = 1; i < args->children; ++i) { zend_ast *arg_ast = args->child[i]; - znode arg_node; - zend_op *opline; - zend_bool send_user = 0; if (zend_is_variable(arg_ast) && !zend_is_call(arg_ast)) { - zend_compile_var(&arg_node, arg_ast, BP_VAR_FUNC_ARG | (i << BP_VAR_SHIFT)); - send_user = 1; + /* BP_VAR_FUNC_ARG needs to be fetched after EX(call) had been determined */ + zend_delayed_compile_var(arg_nodes + i, arg_ast, BP_VAR_FUNC_ARG | (i << BP_VAR_SHIFT)); } else { - zend_compile_expr(&arg_node, arg_ast); - if (arg_node.op_type & (IS_VAR|IS_CV)) { - send_user = 1; - } + zend_compile_expr(arg_nodes + i, arg_ast); } + } + + zend_compile_init_user_func(args->child[0], args->children - 1, lcname); + zend_delayed_compile_end(offset); - if (send_user) { - opline = zend_emit_op(NULL, ZEND_SEND_USER, &arg_node, NULL); + for (i = 1; i < args->children; ++i) { + zend_op *opline; + + if (arg_nodes[i].op_type & (IS_VAR|IS_CV)) { + opline = zend_emit_op(NULL, ZEND_SEND_USER, arg_nodes + i, NULL); } else { - opline = zend_emit_op(NULL, ZEND_SEND_VAL, &arg_node, NULL); + opline = zend_emit_op(NULL, ZEND_SEND_VAL, arg_nodes + i, NULL); } opline->op2.num = i; @@ -3279,6 +3324,7 @@ int zend_compile_func_cuf(znode *result, zend_ast_list *args, zend_string *lcnam } zend_emit_op(result, ZEND_DO_FCALL, NULL, NULL); + efree(arg_nodes); return SUCCESS; } /* }}} */ @@ -3306,10 +3352,22 @@ static int zend_compile_assert(znode *result, zend_ast_list *args, zend_string * if (EG(assertions) >= 0) { znode name_node; zend_op *opline; + znode *arg_nodes; uint32_t check_op_number = get_next_op_number(CG(active_op_array)); zend_emit_op(NULL, ZEND_ASSERT_CHECK, NULL, NULL); + if (args->children == 1 && + (args->child[0]->kind != ZEND_AST_ZVAL || + Z_TYPE_P(zend_ast_get_zval(args->child[0])) != IS_STRING)) { + /* add "assert(condition) as assertion message */ + zend_ast_list_add((zend_ast*)args, + zend_ast_create_zval_from_str( + zend_ast_export("assert(", args->child[0], ")"))); + } + + arg_nodes = zend_compile_arg_values((zend_ast *) args, fbc); + if (fbc) { name_node.op_type = IS_CONST; ZVAL_STR_COPY(&name_node.u.constant, name); @@ -3323,16 +3381,7 @@ static int zend_compile_assert(znode *result, zend_ast_list *args, zend_string * } zend_alloc_cache_slot(opline->op2.constant); - if (args->children == 1 && - (args->child[0]->kind != ZEND_AST_ZVAL || - Z_TYPE_P(zend_ast_get_zval(args->child[0])) != IS_STRING)) { - /* add "assert(condition) as assertion message */ - zend_ast_list_add((zend_ast*)args, - zend_ast_create_zval_from_str( - zend_ast_export("assert(", args->child[0], ")"))); - } - - zend_compile_call_common(result, (zend_ast*)args, fbc); + zend_compile_call_common(result, arg_nodes, (zend_ast *) args, fbc); CG(active_op_array)->opcodes[check_op_number].op2.opline_num = get_next_op_number(CG(active_op_array)); } else { @@ -3423,6 +3472,7 @@ void zend_compile_call(znode *result, zend_ast *ast, uint32_t type) /* {{{ */ zend_string *lcname; zend_function *fbc; zend_op *opline; + znode *arg_nodes; lcname = zend_string_tolower(Z_STR_P(name)); @@ -3447,10 +3497,11 @@ void zend_compile_call(znode *result, zend_ast *ast, uint32_t type) /* {{{ */ zval_ptr_dtor(&name_node.u.constant); ZVAL_NEW_STR(&name_node.u.constant, lcname); + arg_nodes = zend_compile_arg_values(args_ast, fbc); opline = zend_emit_op(NULL, ZEND_INIT_FCALL, NULL, &name_node); zend_alloc_cache_slot(opline->op2.constant); - zend_compile_call_common(result, args_ast, fbc); + zend_compile_call_common(result, arg_nodes, args_ast, fbc); } } /* }}} */ @@ -3461,7 +3512,7 @@ void zend_compile_method_call(znode *result, zend_ast *ast, uint32_t type) /* {{ zend_ast *method_ast = ast->child[1]; zend_ast *args_ast = ast->child[2]; - znode obj_node, method_node; + znode obj_node, method_node, *arg_nodes; zend_op *opline; if (is_this_fetch(obj_ast)) { @@ -3471,6 +3522,8 @@ void zend_compile_method_call(znode *result, zend_ast *ast, uint32_t type) /* {{ } zend_compile_expr(&method_node, method_ast); + arg_nodes = zend_compile_arg_values(args_ast, NULL); + opline = zend_emit_op(NULL, ZEND_INIT_METHOD_CALL, &obj_node, NULL); if (method_node.op_type == IS_CONST) { @@ -3486,7 +3539,7 @@ void zend_compile_method_call(znode *result, zend_ast *ast, uint32_t type) /* {{ SET_NODE(opline->op2, &method_node); } - zend_compile_call_common(result, args_ast, NULL); + zend_compile_call_common(result, arg_nodes, args_ast, NULL); } /* }}} */ @@ -3502,7 +3555,7 @@ void zend_compile_static_call(znode *result, zend_ast *ast, uint32_t type) /* {{ zend_ast *method_ast = ast->child[1]; zend_ast *args_ast = ast->child[2]; - znode class_node, method_node; + znode class_node, method_node, *arg_nodes; zend_op *opline; zend_compile_class_ref_ex(&class_node, class_ast, ZEND_FETCH_CLASS_EXCEPTION); @@ -3519,6 +3572,8 @@ void zend_compile_static_call(znode *result, zend_ast *ast, uint32_t type) /* {{ } } + arg_nodes = zend_compile_arg_values(args_ast, NULL); + opline = get_next_op(CG(active_op_array)); opline->opcode = ZEND_INIT_STATIC_METHOD_CALL; @@ -3538,7 +3593,7 @@ void zend_compile_static_call(znode *result, zend_ast *ast, uint32_t type) /* {{ } zend_check_live_ranges(opline); - zend_compile_call_common(result, args_ast, NULL); + zend_compile_call_common(result, arg_nodes, args_ast, NULL); } /* }}} */ @@ -3549,7 +3604,7 @@ void zend_compile_new(znode *result, zend_ast *ast) /* {{{ */ zend_ast *class_ast = ast->child[0]; zend_ast *args_ast = ast->child[1]; - znode class_node, ctor_result; + znode class_node, ctor_result, *arg_nodes; zend_op *opline; uint32_t opnum; @@ -3568,6 +3623,8 @@ void zend_compile_new(znode *result, zend_ast *ast) /* {{{ */ zend_compile_class_ref_ex(&class_node, class_ast, ZEND_FETCH_CLASS_EXCEPTION); } + arg_nodes = zend_compile_arg_values(args_ast, NULL); + opnum = get_next_op_number(CG(active_op_array)); opline = zend_emit_op(result, ZEND_NEW, NULL, NULL); @@ -3579,7 +3636,7 @@ void zend_compile_new(znode *result, zend_ast *ast) /* {{{ */ SET_NODE(opline->op1, &class_node); } - zend_compile_call_common(&ctor_result, args_ast, NULL); + zend_compile_call_common(&ctor_result, arg_nodes, args_ast, NULL); zend_do_free(&ctor_result); /* New jumps over ctor call if ctor does not exist */ diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index 044b49e..108539b 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -2444,134 +2444,45 @@ static zend_always_inline zend_generator *zend_get_running_generator(zend_execut } /* }}} */ -static void cleanup_unfinished_calls(zend_execute_data *execute_data, uint32_t 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 */ +static void cleanup_call_frame(zend_execute_data *execute_data) /* {{{ */ { - if (UNEXPECTED(EX(call))) { - zend_execute_data *call = EX(call); - zend_op *opline = EX(func)->op_array.opcodes + op_num; - int level; - int do_exit; - - if (UNEXPECTED(opline->opcode == ZEND_INIT_FCALL || - opline->opcode == ZEND_INIT_FCALL_BY_NAME || - opline->opcode == ZEND_INIT_DYNAMIC_CALL || - opline->opcode == ZEND_INIT_METHOD_CALL || - opline->opcode == ZEND_INIT_STATIC_METHOD_CALL)) { - ZEND_ASSERT(op_num); - opline--; - } + zend_vm_stack_free_args(EX(call)); - do { - /* If the exception was thrown during a function call there might be - * arguments pushed to the stack that have to be dtor'ed. */ - - /* find the number of actually passed arguments */ - level = 0; - do_exit = 0; - do { - switch (opline->opcode) { - case ZEND_DO_FCALL: - case ZEND_DO_ICALL: - case ZEND_DO_UCALL: - case ZEND_DO_FCALL_BY_NAME: - level++; - break; - case ZEND_INIT_FCALL: - case ZEND_INIT_FCALL_BY_NAME: - case ZEND_INIT_NS_FCALL_BY_NAME: - case ZEND_INIT_DYNAMIC_CALL: - case ZEND_INIT_USER_CALL: - case ZEND_INIT_METHOD_CALL: - case ZEND_INIT_STATIC_METHOD_CALL: - case ZEND_NEW: - if (level == 0) { - ZEND_CALL_NUM_ARGS(call) = 0; - do_exit = 1; - } - level--; - 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: - if (level == 0) { - ZEND_CALL_NUM_ARGS(call) = opline->op2.num; - do_exit = 1; - } - break; - case ZEND_SEND_ARRAY: - case ZEND_SEND_UNPACK: - if (level == 0) { - do_exit = 1; - } - break; - } - if (!do_exit) { - opline--; - } - } while (!do_exit); - if (call->prev_execute_data) { - /* skip current call region */ - level = 0; - do_exit = 0; - do { - switch (opline->opcode) { - case ZEND_DO_FCALL: - case ZEND_DO_ICALL: - case ZEND_DO_UCALL: - case ZEND_DO_FCALL_BY_NAME: - level++; - break; - case ZEND_INIT_FCALL: - case ZEND_INIT_FCALL_BY_NAME: - case ZEND_INIT_NS_FCALL_BY_NAME: - case ZEND_INIT_DYNAMIC_CALL: - case ZEND_INIT_USER_CALL: - case ZEND_INIT_METHOD_CALL: - case ZEND_INIT_STATIC_METHOD_CALL: - case ZEND_NEW: - if (level == 0) { - do_exit = 1; - } - level--; - break; - } - opline--; - } while (!do_exit); + if (ZEND_CALL_INFO(EX(call)) & ZEND_CALL_RELEASE_THIS) { + if (ZEND_CALL_INFO(EX(call)) & ZEND_CALL_CTOR) { + if (!(ZEND_CALL_INFO(EX(call)) & ZEND_CALL_CTOR_RESULT_UNUSED)) { + GC_REFCOUNT(Z_OBJ(EX(call)->This))--; } - - zend_vm_stack_free_args(EX(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 (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(EX(call)->This)) == 1) { + zend_object_store_ctor_failed(Z_OBJ(EX(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); - } - - EX(call) = call->prev_execute_data; - zend_vm_stack_free_call_frame(call); - call = EX(call); - } while (call); + } + OBJ_RELEASE(Z_OBJ(EX(call)->This)); + } + if (EX(call)->func->common.fn_flags & ZEND_ACC_CLOSURE) { + zend_object_release((zend_object *) EX(call)->func->common.prototype); + } else if (EX(call)->func->common.fn_flags & ZEND_ACC_CALL_VIA_TRAMPOLINE) { + zend_string_release(EX(call)->func->common.function_name); + zend_free_trampoline(EX(call)->func); } + + zend_vm_stack_free_call_frame(EX(call)); + EX(call) = NULL; } /* }}} */ -static void cleanup_live_vars(zend_execute_data *execute_data, uint32_t op_num, uint32_t catch_op_num) /* {{{ */ +static zend_always_inline void try_cleanup_call_frame(zend_execute_data *execute_data) /* {{{ */ +{ + if (UNEXPECTED(EX(call))) { + ZEND_ASSERT((EG(opline_before_exception) + 1)->opcode == ZEND_SEND_VAR_EX); + ZEND_CALL_NUM_ARGS(EX(call)) = (EG(opline_before_exception) + 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } +} + +void zend_cleanup_live_vars(zend_execute_data *execute_data, uint32_t op_num, uint32_t catch_op_num) /* {{{ */ { int i; @@ -2621,11 +2532,6 @@ static void cleanup_live_vars(zend_execute_data *execute_data, uint32_t op_num, } /* }}} */ -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 50b2af1..40ee642 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_unfinished_execution(zend_execute_data *execute_data, uint32_t op_num, uint32_t catch_op_num); +void zend_cleanup_live_vars(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 3ffa82e..92cacc2 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_unfinished_execution(execute_data, op_num, 0); + zend_cleanup_live_vars(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 a653780..3d5bf88 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -1541,6 +1541,7 @@ ZEND_VM_HELPER_EX(zend_fetch_var_address_helper, CONST|TMPVAR|CV, UNUSED, int ty if (Z_CONSTANT_P(retval)) { if (UNEXPECTED(zval_update_constant_ex(retval, 1, NULL) != SUCCESS)) { FREE_OP1(); + try_cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } } @@ -1561,7 +1562,11 @@ ZEND_VM_HELPER_EX(zend_fetch_var_address_helper, CONST|TMPVAR|CV, UNUSED, int ty } else { ZVAL_INDIRECT(EX_VAR(opline->result.var), retval); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + try_cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } ZEND_VM_HANDLER(80, ZEND_FETCH_R, CONST|TMPVAR|CV, UNUSED, VAR_FETCH) @@ -1632,6 +1637,10 @@ ZEND_VM_HELPER_EX(zend_fetch_static_prop_helper, CONST|TMPVAR|CV, UNUSED|CONST|V if (UNEXPECTED(CE_STATIC_MEMBERS(ce) == NULL)) { zend_throw_error(NULL, "Access to undeclared static property: %s::$%s", ZSTR_VAL(ce->name), ZSTR_VAL(name)); FREE_OP1(); + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } HANDLE_EXCEPTION(); } @@ -1643,7 +1652,14 @@ ZEND_VM_HELPER_EX(zend_fetch_static_prop_helper, CONST|TMPVAR|CV, UNUSED|CONST|V zend_string_release(name); } FREE_OP1(); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } CACHE_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op2)), ce); } @@ -1652,6 +1668,10 @@ ZEND_VM_HELPER_EX(zend_fetch_static_prop_helper, CONST|TMPVAR|CV, UNUSED|CONST|V ce = zend_fetch_class(NULL, opline->op2.num); if (UNEXPECTED(ce == NULL)) { ZEND_ASSERT(EG(exception)); + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } HANDLE_EXCEPTION(); } } else { @@ -1664,6 +1684,10 @@ ZEND_VM_HELPER_EX(zend_fetch_static_prop_helper, CONST|TMPVAR|CV, UNUSED|CONST|V if (UNEXPECTED(CE_STATIC_MEMBERS(ce) == NULL)) { zend_throw_error(NULL, "Access to undeclared static property: %s::$%s", ZSTR_VAL(ce->name), ZSTR_VAL(name)); FREE_OP1(); + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } HANDLE_EXCEPTION(); } @@ -1673,6 +1697,7 @@ ZEND_VM_HELPER_EX(zend_fetch_static_prop_helper, CONST|TMPVAR|CV, UNUSED|CONST|V retval = zend_std_get_static_property(ce, name, 0); if (UNEXPECTED(EG(exception))) { FREE_OP1(); + try_cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if (OP1_TYPE == IS_CONST && retval) { @@ -1695,7 +1720,11 @@ ZEND_VM_C_LABEL(fetch_static_prop_return): } else { ZVAL_INDIRECT(EX_VAR(opline->result.var), retval); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + try_cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } ZEND_VM_HANDLER(173, ZEND_FETCH_STATIC_PROP_R, CONST|TMPVAR|CV, UNUSED|CONST|VAR) @@ -1815,16 +1844,20 @@ 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(); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); 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"); FREE_UNFETCHED_OP2(); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } zend_fetch_dimension_address_W(EX_VAR(opline->result.var), container, GET_OP2_ZVAL_PTR(BP_VAR_R), OP2_TYPE); @@ -1838,6 +1871,8 @@ ZEND_VM_HANDLER(93, ZEND_FETCH_DIM_FUNC_ARG, CONST|TMP|VAR|CV, CONST|TMPVAR|UNUS zend_throw_error(NULL, "Cannot use [] for reading"); FREE_UNFETCHED_OP2(); FREE_UNFETCHED_OP1(); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } container = GET_OP1_ZVAL_PTR(BP_VAR_R); @@ -1845,7 +1880,12 @@ ZEND_VM_HANDLER(93, ZEND_FETCH_DIM_FUNC_ARG, CONST|TMP|VAR|CV, CONST|TMPVAR|UNUS FREE_OP2(); FREE_OP1(); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } ZEND_VM_HANDLER(96, ZEND_FETCH_DIM_UNSET, VAR|CV, CONST|TMPVAR|CV) @@ -1885,6 +1925,7 @@ ZEND_VM_HANDLER(82, ZEND_FETCH_OBJ_R, CONST|TMP|VAR|UNUSED|CV, CONST|TMPVAR|CV) if (OP1_TYPE == IS_UNUSED && UNEXPECTED(Z_OBJ_P(container) == NULL)) { zend_throw_error(NULL, "Using $this when not in object context"); FREE_UNFETCHED_OP2(); + try_cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } @@ -1941,7 +1982,11 @@ ZEND_VM_C_LABEL(fetch_obj_r_no_object): FREE_OP2(); FREE_OP1(); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + try_cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } ZEND_VM_HANDLER(85, ZEND_FETCH_OBJ_W, VAR|UNUSED|CV, CONST|TMPVAR|CV) @@ -2095,17 +2140,23 @@ ZEND_VM_HANDLER(94, ZEND_FETCH_OBJ_FUNC_ARG, CONST|TMP|VAR|UNUSED|CV, CONST|TMPV if (OP1_TYPE == IS_UNUSED && UNEXPECTED(Z_OBJ_P(container) == NULL)) { zend_throw_error(NULL, "Using $this when not in object context"); FREE_OP2(); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if (OP1_TYPE == IS_CONST || OP1_TYPE == IS_TMP_VAR) { zend_throw_error(NULL, "Cannot use temporary expression in write context"); FREE_OP2(); FREE_OP1_VAR_PTR(); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if (OP1_TYPE == IS_VAR && UNEXPECTED(container == NULL)) { zend_throw_error(NULL, "Cannot use string offset as an object"); FREE_OP2(); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } zend_fetch_property_address(EX_VAR(opline->result.var), container, OP1_TYPE, property, OP2_TYPE, ((OP2_TYPE == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); @@ -2114,7 +2165,12 @@ ZEND_VM_HANDLER(94, ZEND_FETCH_OBJ_FUNC_ARG, CONST|TMP|VAR|UNUSED|CV, CONST|TMPV EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var), 0); } FREE_OP1_VAR_PTR(); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } else { ZEND_VM_DISPATCH_TO_HANDLER(ZEND_FETCH_OBJ_R); } @@ -3077,15 +3133,18 @@ ZEND_VM_HANDLER(112, ZEND_INIT_METHOD_CALL, CONST|TMPVAR|UNUSED|CV, CONST|TMPVAR GC_REFCOUNT(obj)++; /* For $this pointer */ } + FREE_OP2(); + FREE_OP1(); + if (UNEXPECTED(EG(exception) != NULL)) { + HANDLE_EXCEPTION(); + } + call = zend_vm_stack_push_call_frame(call_info, fbc, opline->extended_value, called_scope, obj); call->prev_execute_data = EX(call); EX(call) = call; - FREE_OP2(); - FREE_OP1(); - - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } ZEND_VM_HANDLER(113, ZEND_INIT_STATIC_METHOD_CALL, UNUSED|CONST|VAR, CONST|TMPVAR|UNUSED|CV, NUM) @@ -3225,7 +3284,7 @@ ZEND_VM_HANDLER(113, ZEND_INIT_STATIC_METHOD_CALL, UNUSED|CONST|VAR, CONST|TMPVA call->prev_execute_data = EX(call); EX(call) = call; - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } ZEND_VM_HANDLER(59, ZEND_INIT_FCALL_BY_NAME, ANY, CONST, NUM) @@ -3288,7 +3347,8 @@ 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); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + FREE_OP2(); + HANDLE_EXCEPTION(); } mname = zend_string_init(Z_STRVAL_P(function_name) + (cname_length + sizeof("::") - 1), mname_length, 0); @@ -3460,12 +3520,17 @@ ZEND_VM_C_LABEL(try_function_name): FREE_OP2(); HANDLE_EXCEPTION(); } + + if (UNEXPECTED(EG(exception) != NULL)) { + HANDLE_EXCEPTION(); + } + call = zend_vm_stack_push_call_frame(call_info, fbc, opline->extended_value, called_scope, object); call->prev_execute_data = EX(call); EX(call) = call; - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } ZEND_VM_HANDLER(118, ZEND_INIT_USER_CALL, CONST, CONST|TMPVAR|CV, NUM) @@ -3485,6 +3550,19 @@ ZEND_VM_HANDLER(118, ZEND_INIT_USER_CALL, CONST, CONST|TMPVAR|CV, NUM) 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)) { @@ -3500,22 +3578,17 @@ 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; - called_scope = NULL; - object = NULL; + if (EG(exception)) { + FREE_OP2(); + HANDLE_EXCEPTION(); + } else { + func = (zend_function *) &zend_pass_function; + called_scope = NULL; + object = NULL; + } } call = zend_vm_stack_push_call_frame(call_info, @@ -3524,7 +3597,10 @@ ZEND_VM_HANDLER(118, ZEND_INIT_USER_CALL, CONST, CONST|TMPVAR|CV, NUM) EX(call) = call; FREE_OP2(); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception) != NULL)) { + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } ZEND_VM_HANDLER(69, ZEND_INIT_NS_FCALL_BY_NAME, ANY, CONST, NUM) @@ -3669,9 +3745,9 @@ ZEND_VM_HANDLER(131, ZEND_DO_FCALL_BY_NAME, ANY, ANY) zval *ret; SAVE_OPLINE(); - EX(call) = call->prev_execute_data; 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))) { @@ -3707,12 +3783,14 @@ ZEND_VM_HANDLER(131, ZEND_DO_FCALL_BY_NAME, ANY, ANY) fbc->common.scope ? "::" : "", ZSTR_VAL(fbc->common.function_name)); if (UNEXPECTED(EG(exception) != NULL)) { + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } } 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; @@ -3773,10 +3851,10 @@ ZEND_VM_HANDLER(60, ZEND_DO_FCALL, ANY, ANY) zval *ret; SAVE_OPLINE(); - EX(call) = call->prev_execute_data; 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)); + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if (UNEXPECTED((fbc->common.fn_flags & ZEND_ACC_DEPRECATED) != 0)) { @@ -3785,10 +3863,12 @@ ZEND_VM_HANDLER(60, ZEND_DO_FCALL, ANY, ANY) fbc->common.scope ? "::" : "", ZSTR_VAL(fbc->common.function_name)); if (UNEXPECTED(EG(exception) != NULL)) { + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } } } + EX(call) = NULL; LOAD_OPLINE(); @@ -4296,6 +4376,8 @@ ZEND_VM_C_LABEL(send_val_by_ref): FREE_UNFETCHED_OP1(); arg = ZEND_CALL_VAR(EX(call), opline->result.var); ZVAL_UNDEF(arg); + ZEND_CALL_NUM_ARGS(EX(call)) = arg_num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } value = GET_OP1_ZVAL_PTR(BP_VAR_R); @@ -4319,9 +4401,15 @@ ZEND_VM_HANDLER(117, ZEND_SEND_VAR, VAR|CV, NUM) if (OP1_TYPE == IS_CV && UNEXPECTED(Z_TYPE_INFO_P(varptr) == IS_UNDEF)) { SAVE_OPLINE(); GET_OP1_UNDEF_CV(varptr, BP_VAR_R); + if (UNEXPECTED(EG(exception) != NULL)) { + ZEND_CALL_NUM_ARGS(EX(call)) = opline->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + arg = ZEND_CALL_VAR(EX(call), opline->result.var); ZVAL_NULL(arg); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } arg = ZEND_CALL_VAR(EX(call), opline->result.var); @@ -4373,9 +4461,15 @@ ZEND_VM_HANDLER(106, ZEND_SEND_VAR_NO_REF, VAR, NUM) !ARG_MAY_BE_SENT_BY_REF(EX(call)->func, opline->op2.num)) { SAVE_OPLINE(); zend_error(E_NOTICE, "Only variables should be passed by reference"); + if (UNEXPECTED(EG(exception) != NULL)) { + ZEND_CALL_NUM_ARGS(EX(call)) = opline->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + arg = ZEND_CALL_VAR(EX(call), opline->result.var); ZVAL_COPY_VALUE(arg, varptr); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } } @@ -4396,8 +4490,8 @@ ZEND_VM_HANDLER(67, ZEND_SEND_REF, VAR|CV, NUM) if (OP1_TYPE == IS_VAR && UNEXPECTED(varptr == NULL)) { zend_throw_error(NULL, "Only variables can be passed by reference"); - arg = ZEND_CALL_VAR(EX(call), opline->result.var); - ZVAL_UNDEF(arg); + ZEND_CALL_NUM_ARGS(EX(call)) = opline->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } @@ -4417,6 +4511,11 @@ ZEND_VM_HANDLER(67, ZEND_SEND_REF, VAR|CV, NUM) } FREE_OP1_VAR_PTR(); + if (OP1_TYPE == IS_VAR && UNEXPECTED(EG(exception) != NULL)) { + ZEND_CALL_NUM_ARGS(EX(call)) = opline->op2.num; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } ZEND_VM_NEXT_OPCODE(); } @@ -4440,9 +4539,15 @@ ZEND_VM_C_LABEL(send_var_by_ref): if (OP1_TYPE == IS_CV && UNEXPECTED(Z_TYPE_INFO_P(varptr) == IS_UNDEF)) { SAVE_OPLINE(); GET_OP1_UNDEF_CV(varptr, BP_VAR_R); + if (UNEXPECTED(EG(exception) != NULL)) { + ZEND_CALL_NUM_ARGS(EX(call)) = arg_num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + arg = ZEND_CALL_VAR(EX(call), opline->result.var); ZVAL_NULL(arg); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } arg = ZEND_CALL_VAR(EX(call), opline->result.var); @@ -4509,6 +4614,7 @@ ZEND_VM_C_LABEL(send_again): if (name) { zend_throw_error(NULL, "Cannot unpack array with string keys"); FREE_OP1(); + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } @@ -4547,6 +4653,7 @@ ZEND_VM_C_LABEL(send_again): NULL, 0, "Object of type %s did not create an Iterator", ZSTR_VAL(ce->name) ); } + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } @@ -4627,7 +4734,11 @@ ZEND_VM_C_LABEL(unpack_iter_dtor): } FREE_OP1(); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception) != NULL)) { + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } ZEND_VM_HANDLER(119, ZEND_SEND_ARRAY, ANY, ANY) @@ -4728,7 +4839,11 @@ ZEND_VM_C_LABEL(send_array): } ZEND_HASH_FOREACH_END(); } FREE_OP1(); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception) != NULL)) { + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } ZEND_VM_HANDLER(120, ZEND_SEND_USER, VAR|CV, NUM) @@ -4764,7 +4879,12 @@ ZEND_VM_HANDLER(120, ZEND_SEND_USER, VAR|CV, NUM) Z_OBJ(EX(call)->This) = NULL; FREE_OP1(); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception) != NULL)) { + ZEND_CALL_NUM_ARGS(EX(call)) = opline->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } ZVAL_NEW_REF(arg, arg); @@ -4783,7 +4903,12 @@ ZEND_VM_HANDLER(120, ZEND_SEND_USER, VAR|CV, NUM) ZVAL_COPY_VALUE(param, arg); FREE_OP1(); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception) != NULL)) { + ZEND_CALL_NUM_ARGS(EX(call)) = opline->op2.num; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } ZEND_VM_HANDLER(63, ZEND_RECV, NUM, ANY) @@ -5014,6 +5139,11 @@ ZEND_VM_HANDLER(68, ZEND_NEW, UNUSED|CONST|VAR, JMP_ADDR, NUM) } else { OBJ_RELEASE(Z_OBJ(object_zval)); } + if (UNEXPECTED(OP_JMP_ADDR(opline, opline->op2) != opline + 2)) { + /* free all these temps which are used between now and the DO_FCALL */ + zend_op *start_op = EX(func)->op_array.opcodes; + zend_cleanup_live_vars(execute_data, opline - start_op, OP_JMP_ADDR(opline, opline->op2) - start_op); + } ZEND_VM_JMP(OP_JMP_ADDR(opline, opline->op2)); } else { /* We are not handling overloaded classes right now */ @@ -7295,12 +7425,10 @@ ZEND_VM_HANDLER(149, ZEND_HANDLE_EXCEPTION, ANY, ANY) } } - 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); - cleanup_live_vars(execute_data, op_num, finally_op_num); + zend_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)); } @@ -7310,7 +7438,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 { - cleanup_live_vars(execute_data, op_num, catch_op_num); + zend_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); @@ -7732,7 +7860,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; - cleanup_live_vars(execute_data, opline - EX(func)->op_array.opcodes, finally_op); + zend_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 { @@ -7741,11 +7869,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; - cleanup_live_vars(execute_data, opline - EX(func)->op_array.opcodes, catch_op); + zend_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 { - cleanup_live_vars(execute_data, opline - EX(func)->op_array.opcodes, 0); + zend_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 975143a..002ed53 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -645,9 +645,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_DO_FCALL_BY_NAME_SPEC_HANDLER( zval *ret; SAVE_OPLINE(); - EX(call) = call->prev_execute_data; 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))) { @@ -683,12 +683,14 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_DO_FCALL_BY_NAME_SPEC_HANDLER( fbc->common.scope ? "::" : "", ZSTR_VAL(fbc->common.function_name)); if (UNEXPECTED(EG(exception) != NULL)) { + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } } 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,10 +751,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_DO_FCALL_SPEC_HANDLER(ZEND_OPC zval *ret; SAVE_OPLINE(); - EX(call) = call->prev_execute_data; 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)); + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if (UNEXPECTED((fbc->common.fn_flags & ZEND_ACC_DEPRECATED) != 0)) { @@ -761,10 +763,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_DO_FCALL_SPEC_HANDLER(ZEND_OPC fbc->common.scope ? "::" : "", ZSTR_VAL(fbc->common.function_name)); if (UNEXPECTED(EG(exception) != NULL)) { + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } } } + EX(call) = NULL; LOAD_OPLINE(); @@ -975,6 +979,7 @@ send_again: if (name) { zend_throw_error(NULL, "Cannot unpack array with string keys"); FREE_OP(free_op1); + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } @@ -1013,6 +1018,7 @@ send_again: NULL, 0, "Object of type %s did not create an Iterator", ZSTR_VAL(ce->name) ); } + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } @@ -1093,7 +1099,11 @@ unpack_iter_dtor: } FREE_OP(free_op1); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception) != NULL)) { + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SEND_ARRAY_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -1194,7 +1204,11 @@ send_array: } ZEND_HASH_FOREACH_END(); } FREE_OP(free_op1); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception) != NULL)) { + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_RECV_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -1514,12 +1528,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_HANDLE_EXCEPTION_SPEC_HANDLER( } } - 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); - cleanup_live_vars(execute_data, op_num, finally_op_num); + zend_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)); } @@ -1529,7 +1541,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 { - cleanup_live_vars(execute_data, op_num, catch_op_num); + zend_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); @@ -1643,7 +1655,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; - cleanup_live_vars(execute_data, opline - EX(func)->op_array.opcodes, finally_op); + zend_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 { @@ -1652,11 +1664,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; - cleanup_live_vars(execute_data, opline - EX(func)->op_array.opcodes, catch_op); + zend_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 { - cleanup_live_vars(execute_data, opline - EX(func)->op_array.opcodes, 0); + zend_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); @@ -1961,7 +1973,8 @@ 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); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + + HANDLE_EXCEPTION(); } mname = zend_string_init(Z_STRVAL_P(function_name) + (cname_length + sizeof("::") - 1), mname_length, 0); @@ -2133,12 +2146,17 @@ try_function_name: HANDLE_EXCEPTION(); } + + if (UNEXPECTED(EG(exception) != NULL)) { + HANDLE_EXCEPTION(); + } + call = zend_vm_stack_push_call_frame(call_info, fbc, opline->extended_value, called_scope, object); call->prev_execute_data = EX(call); EX(call) = call; - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_NS_FCALL_BY_NAME_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -2384,7 +2402,8 @@ 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); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + + HANDLE_EXCEPTION(); } mname = zend_string_init(Z_STRVAL_P(function_name) + (cname_length + sizeof("::") - 1), mname_length, 0); @@ -2556,12 +2575,17 @@ try_function_name: HANDLE_EXCEPTION(); } + + if (UNEXPECTED(EG(exception) != NULL)) { + HANDLE_EXCEPTION(); + } + call = zend_vm_stack_push_call_frame(call_info, fbc, opline->extended_value, called_scope, object); call->prev_execute_data = EX(call); EX(call) = call; - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_CLASS_SPEC_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -2640,7 +2664,8 @@ 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); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + zval_ptr_dtor_nogc(free_op2); + HANDLE_EXCEPTION(); } mname = zend_string_init(Z_STRVAL_P(function_name) + (cname_length + sizeof("::") - 1), mname_length, 0); @@ -2812,12 +2837,17 @@ try_function_name: zval_ptr_dtor_nogc(free_op2); HANDLE_EXCEPTION(); } + + if (UNEXPECTED(EG(exception) != NULL)) { + HANDLE_EXCEPTION(); + } + call = zend_vm_stack_push_call_frame(call_info, fbc, opline->extended_value, called_scope, object); call->prev_execute_data = EX(call); EX(call) = call; - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_BW_NOT_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -3306,6 +3336,8 @@ send_val_by_ref: arg = ZEND_CALL_VAR(EX(call), opline->result.var); ZVAL_UNDEF(arg); + ZEND_CALL_NUM_ARGS(EX(call)) = arg_num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } value = EX_CONSTANT(opline->op1); @@ -3381,6 +3413,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_NEW_SPEC_CONST_HANDLER(ZEND_OP } else { OBJ_RELEASE(Z_OBJ(object_zval)); } + if (UNEXPECTED(OP_JMP_ADDR(opline, opline->op2) != opline + 2)) { + /* free all these temps which are used between now and the DO_FCALL */ + zend_op *start_op = EX(func)->op_array.opcodes; + zend_cleanup_live_vars(execute_data, opline - start_op, OP_JMP_ADDR(opline, opline->op2) - start_op); + } ZEND_VM_JMP(OP_JMP_ADDR(opline, opline->op2)); } else { /* We are not handling overloaded classes right now */ @@ -4971,6 +5008,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ if (UNEXPECTED(CE_STATIC_MEMBERS(ce) == NULL)) { zend_throw_error(NULL, "Access to undeclared static property: %s::$%s", ZSTR_VAL(ce->name), ZSTR_VAL(name)); + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } HANDLE_EXCEPTION(); } @@ -4982,7 +5023,14 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ zend_string_release(name); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } CACHE_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op2)), ce); } @@ -4991,6 +5039,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ ce = zend_fetch_class(NULL, opline->op2.num); if (UNEXPECTED(ce == NULL)) { ZEND_ASSERT(EG(exception)); + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } HANDLE_EXCEPTION(); } } else { @@ -5003,6 +5055,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ if (UNEXPECTED(CE_STATIC_MEMBERS(ce) == NULL)) { zend_throw_error(NULL, "Access to undeclared static property: %s::$%s", ZSTR_VAL(ce->name), ZSTR_VAL(name)); + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } HANDLE_EXCEPTION(); } @@ -5012,6 +5068,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ retval = zend_std_get_static_property(ce, name, 0); if (UNEXPECTED(EG(exception))) { + try_cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if (IS_CONST == IS_CONST && retval) { @@ -5032,7 +5089,11 @@ fetch_static_prop_return: } else { ZVAL_INDIRECT(EX_VAR(opline->result.var), retval); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + try_cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_STATIC_PROP_R_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -5108,16 +5169,20 @@ 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"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); - } + } container = NULL; if (IS_CONST == IS_VAR && UNEXPECTED(container == NULL)) { zend_throw_error(NULL, "Cannot use string offset as an array"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } zend_fetch_dimension_address_W(EX_VAR(opline->result.var), container, EX_CONSTANT(opline->op2), IS_CONST); @@ -5131,6 +5196,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_CONST_ zend_throw_error(NULL, "Cannot use [] for reading"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } container = EX_CONSTANT(opline->op1); @@ -5138,7 +5205,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_CONST_ } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -5155,6 +5227,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_CONST_CONST_H if (IS_CONST == IS_UNUSED && UNEXPECTED(Z_OBJ_P(container) == NULL)) { zend_throw_error(NULL, "Using $this when not in object context"); + try_cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } @@ -5210,7 +5283,11 @@ fetch_obj_r_no_object: } while (0); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + try_cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_IS_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -5302,17 +5379,23 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CONST_ if (IS_CONST == IS_UNUSED && UNEXPECTED(Z_OBJ_P(container) == NULL)) { zend_throw_error(NULL, "Using $this when not in object context"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if (IS_CONST == IS_CONST || IS_CONST == IS_TMP_VAR) { zend_throw_error(NULL, "Cannot use temporary expression in write context"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if (IS_CONST == IS_VAR && UNEXPECTED(container == NULL)) { zend_throw_error(NULL, "Cannot use string offset as an object"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_CONST, property, IS_CONST, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); @@ -5321,7 +5404,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CONST_ EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var), 0); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } else { ZEND_VM_TAIL_CALL(ZEND_FETCH_OBJ_R_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU)); } @@ -5548,13 +5636,17 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_CONST_CO GC_REFCOUNT(obj)++; /* For $this pointer */ } + + if (UNEXPECTED(EG(exception) != NULL)) { + HANDLE_EXCEPTION(); + } + call = zend_vm_stack_push_call_frame(call_info, fbc, opline->extended_value, called_scope, obj); call->prev_execute_data = EX(call); EX(call) = call; - - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -5694,7 +5786,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_C call->prev_execute_data = EX(call); EX(call) = call; - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_USER_CALL_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -5714,6 +5806,19 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_USER_CALL_SPEC_CONST_CONS 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)) { @@ -5729,22 +5834,17 @@ 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; - called_scope = NULL; - object = NULL; + if (EG(exception)) { + + HANDLE_EXCEPTION(); + } else { + func = (zend_function *) &zend_pass_function; + called_scope = NULL; + object = NULL; + } } call = zend_vm_stack_push_call_frame(call_info, @@ -5752,7 +5852,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_USER_CALL_SPEC_CONST_CONS call->prev_execute_data = EX(call); EX(call) = call; - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception) != NULL)) { + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CASE_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -6768,6 +6871,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ if (UNEXPECTED(CE_STATIC_MEMBERS(ce) == NULL)) { zend_throw_error(NULL, "Access to undeclared static property: %s::$%s", ZSTR_VAL(ce->name), ZSTR_VAL(name)); + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } HANDLE_EXCEPTION(); } @@ -6779,7 +6886,14 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ zend_string_release(name); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } CACHE_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op2)), ce); } @@ -6788,6 +6902,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ ce = zend_fetch_class(NULL, opline->op2.num); if (UNEXPECTED(ce == NULL)) { ZEND_ASSERT(EG(exception)); + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } HANDLE_EXCEPTION(); } } else { @@ -6800,6 +6918,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ if (UNEXPECTED(CE_STATIC_MEMBERS(ce) == NULL)) { zend_throw_error(NULL, "Access to undeclared static property: %s::$%s", ZSTR_VAL(ce->name), ZSTR_VAL(name)); + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } HANDLE_EXCEPTION(); } @@ -6809,6 +6931,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ retval = zend_std_get_static_property(ce, name, 0); if (UNEXPECTED(EG(exception))) { + try_cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if (IS_CONST == IS_CONST && retval) { @@ -6829,7 +6952,11 @@ fetch_static_prop_return: } else { ZVAL_INDIRECT(EX_VAR(opline->result.var), retval); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + try_cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_STATIC_PROP_R_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -7213,6 +7340,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_ if (Z_CONSTANT_P(retval)) { if (UNEXPECTED(zval_update_constant_ex(retval, 1, NULL) != SUCCESS)) { + try_cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } } @@ -7233,7 +7361,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_ } else { ZVAL_INDIRECT(EX_VAR(opline->result.var), retval); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + try_cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_R_SPEC_CONST_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -7304,6 +7436,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ if (UNEXPECTED(CE_STATIC_MEMBERS(ce) == NULL)) { zend_throw_error(NULL, "Access to undeclared static property: %s::$%s", ZSTR_VAL(ce->name), ZSTR_VAL(name)); + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } HANDLE_EXCEPTION(); } @@ -7315,7 +7451,14 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ zend_string_release(name); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } CACHE_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op2)), ce); } @@ -7324,6 +7467,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ ce = zend_fetch_class(NULL, opline->op2.num); if (UNEXPECTED(ce == NULL)) { ZEND_ASSERT(EG(exception)); + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } HANDLE_EXCEPTION(); } } else { @@ -7336,6 +7483,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ if (UNEXPECTED(CE_STATIC_MEMBERS(ce) == NULL)) { zend_throw_error(NULL, "Access to undeclared static property: %s::$%s", ZSTR_VAL(ce->name), ZSTR_VAL(name)); + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } HANDLE_EXCEPTION(); } @@ -7345,6 +7496,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ retval = zend_std_get_static_property(ce, name, 0); if (UNEXPECTED(EG(exception))) { + try_cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if (IS_CONST == IS_CONST && retval) { @@ -7365,7 +7517,11 @@ fetch_static_prop_return: } else { ZVAL_INDIRECT(EX_VAR(opline->result.var), retval); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + try_cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_STATIC_PROP_R_SPEC_CONST_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -7413,16 +7569,20 @@ 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"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); - } + } container = NULL; if (IS_CONST == IS_VAR && UNEXPECTED(container == NULL)) { zend_throw_error(NULL, "Cannot use string offset as an array"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } zend_fetch_dimension_address_W(EX_VAR(opline->result.var), container, NULL, IS_UNUSED); @@ -7436,6 +7596,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_CONST_ zend_throw_error(NULL, "Cannot use [] for reading"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } container = EX_CONSTANT(opline->op1); @@ -7443,7 +7605,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_CONST_ } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -7583,7 +7750,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_C call->prev_execute_data = EX(call); EX(call) = call; - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_VERIFY_RETURN_TYPE_SPEC_CONST_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -8853,16 +9020,20 @@ 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"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); - } + } container = NULL; if (IS_CONST == IS_VAR && UNEXPECTED(container == NULL)) { zend_throw_error(NULL, "Cannot use string offset as an array"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } zend_fetch_dimension_address_W(EX_VAR(opline->result.var), container, _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op2.var), IS_CV); @@ -8876,6 +9047,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_CONST_ zend_throw_error(NULL, "Cannot use [] for reading"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } container = EX_CONSTANT(opline->op1); @@ -8883,7 +9056,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_CONST_ } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -8900,6 +9078,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_CONST_CV_HAND if (IS_CONST == IS_UNUSED && UNEXPECTED(Z_OBJ_P(container) == NULL)) { zend_throw_error(NULL, "Using $this when not in object context"); + try_cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } @@ -8955,7 +9134,11 @@ fetch_obj_r_no_object: } while (0); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + try_cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_IS_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -9047,17 +9230,23 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CONST_ if (IS_CONST == IS_UNUSED && UNEXPECTED(Z_OBJ_P(container) == NULL)) { zend_throw_error(NULL, "Using $this when not in object context"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if (IS_CONST == IS_CONST || IS_CONST == IS_TMP_VAR) { zend_throw_error(NULL, "Cannot use temporary expression in write context"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if (IS_CONST == IS_VAR && UNEXPECTED(container == NULL)) { zend_throw_error(NULL, "Cannot use string offset as an object"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_CONST, property, IS_CV, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); @@ -9066,7 +9255,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CONST_ EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var), 0); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } else { ZEND_VM_TAIL_CALL(ZEND_FETCH_OBJ_R_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU)); } @@ -9249,13 +9443,17 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_CONST_CV GC_REFCOUNT(obj)++; /* For $this pointer */ } + + if (UNEXPECTED(EG(exception) != NULL)) { + HANDLE_EXCEPTION(); + } + call = zend_vm_stack_push_call_frame(call_info, fbc, opline->extended_value, called_scope, obj); call->prev_execute_data = EX(call); EX(call) = call; - - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -9395,7 +9593,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_C call->prev_execute_data = EX(call); EX(call) = call; - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_USER_CALL_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -9415,6 +9613,19 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_USER_CALL_SPEC_CONST_CV_H 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)) { @@ -9430,22 +9641,17 @@ 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; - called_scope = NULL; - object = NULL; + if (EG(exception)) { + + HANDLE_EXCEPTION(); + } else { + func = (zend_function *) &zend_pass_function; + called_scope = NULL; + object = NULL; + } } call = zend_vm_stack_push_call_frame(call_info, @@ -9453,7 +9659,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_USER_CALL_SPEC_CONST_CV_H call->prev_execute_data = EX(call); EX(call) = call; - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception) != NULL)) { + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CATCH_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -10664,16 +10873,20 @@ 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)); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); - } + } container = NULL; if (IS_CONST == IS_VAR && UNEXPECTED(container == NULL)) { zend_throw_error(NULL, "Cannot use string offset as an array"); zval_ptr_dtor_nogc(EX_VAR(opline->op2.var)); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } zend_fetch_dimension_address_W(EX_VAR(opline->result.var), container, _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2), (IS_TMP_VAR|IS_VAR)); @@ -10687,6 +10900,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_CONST_ zend_throw_error(NULL, "Cannot use [] for reading"); zval_ptr_dtor_nogc(EX_VAR(opline->op2.var)); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } container = EX_CONSTANT(opline->op1); @@ -10694,7 +10909,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_CONST_ zval_ptr_dtor_nogc(free_op2); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_CONST_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -10711,6 +10931,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_CONST_TMPVAR_ if (IS_CONST == IS_UNUSED && UNEXPECTED(Z_OBJ_P(container) == NULL)) { zend_throw_error(NULL, "Using $this when not in object context"); zval_ptr_dtor_nogc(EX_VAR(opline->op2.var)); + try_cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } @@ -10767,7 +10988,11 @@ fetch_obj_r_no_object: zval_ptr_dtor_nogc(free_op2); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + try_cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_IS_SPEC_CONST_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -10860,17 +11085,23 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CONST_ if (IS_CONST == IS_UNUSED && UNEXPECTED(Z_OBJ_P(container) == NULL)) { zend_throw_error(NULL, "Using $this when not in object context"); zval_ptr_dtor_nogc(free_op2); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } 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(free_op2); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if (IS_CONST == IS_VAR && UNEXPECTED(container == NULL)) { zend_throw_error(NULL, "Cannot use string offset as an object"); zval_ptr_dtor_nogc(free_op2); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_CONST, property, (IS_TMP_VAR|IS_VAR), (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); @@ -10879,7 +11110,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CONST_ EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var), 0); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } else { ZEND_VM_TAIL_CALL(ZEND_FETCH_OBJ_R_SPEC_CONST_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU)); } @@ -11062,14 +11298,18 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_CONST_TM GC_REFCOUNT(obj)++; /* For $this pointer */ } + zval_ptr_dtor_nogc(free_op2); + + if (UNEXPECTED(EG(exception) != NULL)) { + HANDLE_EXCEPTION(); + } + call = zend_vm_stack_push_call_frame(call_info, fbc, opline->extended_value, called_scope, obj); call->prev_execute_data = EX(call); EX(call) = call; - zval_ptr_dtor_nogc(free_op2); - - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -11209,7 +11449,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_C call->prev_execute_data = EX(call); EX(call) = call; - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_USER_CALL_SPEC_CONST_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -11229,6 +11469,19 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_USER_CALL_SPEC_CONST_TMPV 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)) { @@ -11244,22 +11497,17 @@ 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; - called_scope = NULL; - object = NULL; + if (EG(exception)) { + zval_ptr_dtor_nogc(free_op2); + HANDLE_EXCEPTION(); + } else { + func = (zend_function *) &zend_pass_function; + called_scope = NULL; + object = NULL; + } } call = zend_vm_stack_push_call_frame(call_info, @@ -11268,7 +11516,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_USER_CALL_SPEC_CONST_TMPV EX(call) = call; zval_ptr_dtor_nogc(free_op2); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception) != NULL)) { + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CASE_SPEC_CONST_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -11882,6 +12133,8 @@ send_val_by_ref: zval_ptr_dtor_nogc(EX_VAR(opline->op1.var)); arg = ZEND_CALL_VAR(EX(call), opline->result.var); ZVAL_UNDEF(arg); + ZEND_CALL_NUM_ARGS(EX(call)) = arg_num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } value = _get_zval_ptr_tmp(opline->op1.var, execute_data, &free_op1); @@ -12553,16 +12806,20 @@ 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)); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); - } + } container = NULL; if (IS_TMP_VAR == IS_VAR && UNEXPECTED(container == NULL)) { zend_throw_error(NULL, "Cannot use string offset as an array"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } zend_fetch_dimension_address_W(EX_VAR(opline->result.var), container, EX_CONSTANT(opline->op2), IS_CONST); @@ -12576,6 +12833,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_TMP_CO zend_throw_error(NULL, "Cannot use [] for reading"); zval_ptr_dtor_nogc(EX_VAR(opline->op1.var)); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } container = _get_zval_ptr_tmp(opline->op1.var, execute_data, &free_op1); @@ -12583,7 +12842,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_TMP_CO zval_ptr_dtor_nogc(free_op1); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -12600,6 +12864,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_TMP_CONST_HAN if (IS_TMP_VAR == IS_UNUSED && UNEXPECTED(Z_OBJ_P(container) == NULL)) { zend_throw_error(NULL, "Using $this when not in object context"); + try_cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } @@ -12655,7 +12920,11 @@ fetch_obj_r_no_object: } while (0); zval_ptr_dtor_nogc(free_op1); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + try_cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -12675,17 +12944,23 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_TMP_CO if (IS_TMP_VAR == IS_UNUSED && UNEXPECTED(Z_OBJ_P(container) == NULL)) { zend_throw_error(NULL, "Using $this when not in object context"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if (IS_TMP_VAR == IS_CONST || IS_TMP_VAR == IS_TMP_VAR) { zend_throw_error(NULL, "Cannot use temporary expression in write context"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if (IS_TMP_VAR == IS_VAR && UNEXPECTED(container == NULL)) { zend_throw_error(NULL, "Cannot use string offset as an object"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_TMP_VAR, property, IS_CONST, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); @@ -12694,7 +12969,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_TMP_CO EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var), 0); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } else { ZEND_VM_TAIL_CALL(ZEND_FETCH_OBJ_R_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU)); } @@ -13420,16 +13700,20 @@ 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)); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); - } + } container = NULL; if (IS_TMP_VAR == IS_VAR && UNEXPECTED(container == NULL)) { zend_throw_error(NULL, "Cannot use string offset as an array"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } zend_fetch_dimension_address_W(EX_VAR(opline->result.var), container, NULL, IS_UNUSED); @@ -13443,6 +13727,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_TMP_UN zend_throw_error(NULL, "Cannot use [] for reading"); zval_ptr_dtor_nogc(EX_VAR(opline->op1.var)); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } container = _get_zval_ptr_tmp(opline->op1.var, execute_data, &free_op1); @@ -13450,7 +13736,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_TMP_UN zval_ptr_dtor_nogc(free_op1); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_VERIFY_RETURN_TYPE_SPEC_TMP_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -13824,16 +14115,20 @@ 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)); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); - } + } container = NULL; if (IS_TMP_VAR == IS_VAR && UNEXPECTED(container == NULL)) { zend_throw_error(NULL, "Cannot use string offset as an array"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } zend_fetch_dimension_address_W(EX_VAR(opline->result.var), container, _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op2.var), IS_CV); @@ -13847,6 +14142,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_TMP_CV zend_throw_error(NULL, "Cannot use [] for reading"); zval_ptr_dtor_nogc(EX_VAR(opline->op1.var)); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } container = _get_zval_ptr_tmp(opline->op1.var, execute_data, &free_op1); @@ -13854,7 +14151,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_TMP_CV zval_ptr_dtor_nogc(free_op1); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -13871,6 +14173,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_TMP_CV_HANDLE if (IS_TMP_VAR == IS_UNUSED && UNEXPECTED(Z_OBJ_P(container) == NULL)) { zend_throw_error(NULL, "Using $this when not in object context"); + try_cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } @@ -13926,7 +14229,11 @@ fetch_obj_r_no_object: } while (0); zval_ptr_dtor_nogc(free_op1); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + try_cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -13946,17 +14253,23 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_TMP_CV if (IS_TMP_VAR == IS_UNUSED && UNEXPECTED(Z_OBJ_P(container) == NULL)) { zend_throw_error(NULL, "Using $this when not in object context"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if (IS_TMP_VAR == IS_CONST || IS_TMP_VAR == IS_TMP_VAR) { zend_throw_error(NULL, "Cannot use temporary expression in write context"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if (IS_TMP_VAR == IS_VAR && UNEXPECTED(container == NULL)) { zend_throw_error(NULL, "Cannot use string offset as an object"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_TMP_VAR, property, IS_CV, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); @@ -13965,7 +14278,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_TMP_CV EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var), 0); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } else { ZEND_VM_TAIL_CALL(ZEND_FETCH_OBJ_R_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU)); } @@ -14337,16 +14655,20 @@ 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)); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); - } + } container = NULL; if (IS_TMP_VAR == IS_VAR && UNEXPECTED(container == NULL)) { zend_throw_error(NULL, "Cannot use string offset as an array"); zval_ptr_dtor_nogc(EX_VAR(opline->op2.var)); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } zend_fetch_dimension_address_W(EX_VAR(opline->result.var), container, _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2), (IS_TMP_VAR|IS_VAR)); @@ -14360,6 +14682,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_TMP_TM zend_throw_error(NULL, "Cannot use [] for reading"); zval_ptr_dtor_nogc(EX_VAR(opline->op2.var)); zval_ptr_dtor_nogc(EX_VAR(opline->op1.var)); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } container = _get_zval_ptr_tmp(opline->op1.var, execute_data, &free_op1); @@ -14367,7 +14691,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_TMP_TM zval_ptr_dtor_nogc(free_op2); zval_ptr_dtor_nogc(free_op1); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_TMP_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -14384,6 +14713,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_TMP_TMPVAR_HA if (IS_TMP_VAR == IS_UNUSED && UNEXPECTED(Z_OBJ_P(container) == NULL)) { zend_throw_error(NULL, "Using $this when not in object context"); zval_ptr_dtor_nogc(EX_VAR(opline->op2.var)); + try_cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } @@ -14440,7 +14770,11 @@ fetch_obj_r_no_object: zval_ptr_dtor_nogc(free_op2); zval_ptr_dtor_nogc(free_op1); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + try_cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_TMP_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -14460,17 +14794,23 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_TMP_TM if (IS_TMP_VAR == IS_UNUSED && UNEXPECTED(Z_OBJ_P(container) == NULL)) { zend_throw_error(NULL, "Using $this when not in object context"); zval_ptr_dtor_nogc(free_op2); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } 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(free_op2); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if (IS_TMP_VAR == IS_VAR && UNEXPECTED(container == NULL)) { zend_throw_error(NULL, "Cannot use string offset as an object"); zval_ptr_dtor_nogc(free_op2); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_TMP_VAR, property, (IS_TMP_VAR|IS_VAR), (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); @@ -14479,7 +14819,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_TMP_TM EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var), 0); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } else { ZEND_VM_TAIL_CALL(ZEND_FETCH_OBJ_R_SPEC_TMP_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU)); } @@ -15078,9 +15423,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SEND_VAR_SPEC_VAR_HANDLER(ZEND if (IS_VAR == IS_CV && UNEXPECTED(Z_TYPE_INFO_P(varptr) == IS_UNDEF)) { SAVE_OPLINE(); GET_OP1_UNDEF_CV(varptr, BP_VAR_R); + if (UNEXPECTED(EG(exception) != NULL)) { + ZEND_CALL_NUM_ARGS(EX(call)) = opline->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + arg = ZEND_CALL_VAR(EX(call), opline->result.var); ZVAL_NULL(arg); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } arg = ZEND_CALL_VAR(EX(call), opline->result.var); @@ -15132,9 +15483,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SEND_VAR_NO_REF_SPEC_VAR_HANDL !ARG_MAY_BE_SENT_BY_REF(EX(call)->func, opline->op2.num)) { SAVE_OPLINE(); zend_error(E_NOTICE, "Only variables should be passed by reference"); + if (UNEXPECTED(EG(exception) != NULL)) { + ZEND_CALL_NUM_ARGS(EX(call)) = opline->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + arg = ZEND_CALL_VAR(EX(call), opline->result.var); ZVAL_COPY_VALUE(arg, varptr); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } } @@ -15155,8 +15512,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SEND_REF_SPEC_VAR_HANDLER(ZEND if (IS_VAR == IS_VAR && UNEXPECTED(varptr == NULL)) { zend_throw_error(NULL, "Only variables can be passed by reference"); - arg = ZEND_CALL_VAR(EX(call), opline->result.var); - ZVAL_UNDEF(arg); + ZEND_CALL_NUM_ARGS(EX(call)) = opline->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } @@ -15176,6 +15533,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SEND_REF_SPEC_VAR_HANDLER(ZEND } if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; + if (IS_VAR == IS_VAR && UNEXPECTED(EG(exception) != NULL)) { + ZEND_CALL_NUM_ARGS(EX(call)) = opline->op2.num; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } ZEND_VM_NEXT_OPCODE(); } @@ -15199,9 +15561,15 @@ send_var_by_ref: if (IS_VAR == IS_CV && UNEXPECTED(Z_TYPE_INFO_P(varptr) == IS_UNDEF)) { SAVE_OPLINE(); GET_OP1_UNDEF_CV(varptr, BP_VAR_R); + if (UNEXPECTED(EG(exception) != NULL)) { + ZEND_CALL_NUM_ARGS(EX(call)) = arg_num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + arg = ZEND_CALL_VAR(EX(call), opline->result.var); ZVAL_NULL(arg); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } arg = ZEND_CALL_VAR(EX(call), opline->result.var); @@ -15261,7 +15629,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SEND_USER_SPEC_VAR_HANDLER(ZEN Z_OBJ(EX(call)->This) = NULL; zval_ptr_dtor_nogc(free_op1); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception) != NULL)) { + ZEND_CALL_NUM_ARGS(EX(call)) = opline->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } ZVAL_NEW_REF(arg, arg); @@ -15280,7 +15653,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SEND_USER_SPEC_VAR_HANDLER(ZEN ZVAL_COPY_VALUE(param, arg); zval_ptr_dtor_nogc(free_op1); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception) != NULL)) { + ZEND_CALL_NUM_ARGS(EX(call)) = opline->op2.num; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_NEW_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -15320,6 +15698,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_NEW_SPEC_VAR_HANDLER(ZEND_OPCO } else { OBJ_RELEASE(Z_OBJ(object_zval)); } + if (UNEXPECTED(OP_JMP_ADDR(opline, opline->op2) != opline + 2)) { + /* free all these temps which are used between now and the DO_FCALL */ + zend_op *start_op = EX(func)->op_array.opcodes; + zend_cleanup_live_vars(execute_data, opline - start_op, OP_JMP_ADDR(opline, opline->op2) - start_op); + } ZEND_VM_JMP(OP_JMP_ADDR(opline, opline->op2)); } else { /* We are not handling overloaded classes right now */ @@ -16977,16 +17360,20 @@ 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)); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); 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"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } zend_fetch_dimension_address_W(EX_VAR(opline->result.var), container, EX_CONSTANT(opline->op2), IS_CONST); @@ -17000,6 +17387,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_VAR_CO zend_throw_error(NULL, "Cannot use [] for reading"); zval_ptr_dtor_nogc(EX_VAR(opline->op1.var)); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } container = _get_zval_ptr_var(opline->op1.var, execute_data, &free_op1); @@ -17007,7 +17396,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_VAR_CO zval_ptr_dtor_nogc(free_op1); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_UNSET_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -17047,6 +17441,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_VAR_CONST_HAN if (IS_VAR == IS_UNUSED && UNEXPECTED(Z_OBJ_P(container) == NULL)) { zend_throw_error(NULL, "Using $this when not in object context"); + try_cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } @@ -17102,7 +17497,11 @@ fetch_obj_r_no_object: } while (0); zval_ptr_dtor_nogc(free_op1); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + try_cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_W_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -17183,17 +17582,23 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_VAR_CO if (IS_VAR == IS_UNUSED && UNEXPECTED(Z_OBJ_P(container) == NULL)) { zend_throw_error(NULL, "Using $this when not in object context"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if (IS_VAR == IS_CONST || IS_VAR == IS_TMP_VAR) { zend_throw_error(NULL, "Cannot use temporary expression in write context"); if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if (IS_VAR == IS_VAR && UNEXPECTED(container == NULL)) { zend_throw_error(NULL, "Cannot use string offset as an object"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_VAR, property, IS_CONST, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); @@ -17202,7 +17607,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_VAR_CO EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var), 0); } if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } else { ZEND_VM_TAIL_CALL(ZEND_FETCH_OBJ_R_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU)); } @@ -17540,7 +17950,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_V call->prev_execute_data = EX(call); EX(call) = call; - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_CLASS_CONSTANT_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -18870,16 +19280,20 @@ 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)); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); 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"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } zend_fetch_dimension_address_W(EX_VAR(opline->result.var), container, NULL, IS_UNUSED); @@ -18893,6 +19307,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_VAR_UN zend_throw_error(NULL, "Cannot use [] for reading"); zval_ptr_dtor_nogc(EX_VAR(opline->op1.var)); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } container = _get_zval_ptr_var(opline->op1.var, execute_data, &free_op1); @@ -18900,7 +19316,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_VAR_UN zval_ptr_dtor_nogc(free_op1); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_DIM_SPEC_VAR_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -19146,7 +19567,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_V call->prev_execute_data = EX(call); EX(call) = call; - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_VERIFY_RETURN_TYPE_SPEC_VAR_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -20149,16 +20570,20 @@ 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)); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); 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"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } zend_fetch_dimension_address_W(EX_VAR(opline->result.var), container, _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op2.var), IS_CV); @@ -20172,6 +20597,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_VAR_CV zend_throw_error(NULL, "Cannot use [] for reading"); zval_ptr_dtor_nogc(EX_VAR(opline->op1.var)); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } container = _get_zval_ptr_var(opline->op1.var, execute_data, &free_op1); @@ -20179,7 +20606,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_VAR_CV zval_ptr_dtor_nogc(free_op1); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_UNSET_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -20219,6 +20651,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_VAR_CV_HANDLE if (IS_VAR == IS_UNUSED && UNEXPECTED(Z_OBJ_P(container) == NULL)) { zend_throw_error(NULL, "Using $this when not in object context"); + try_cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } @@ -20274,7 +20707,11 @@ fetch_obj_r_no_object: } while (0); zval_ptr_dtor_nogc(free_op1); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + try_cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_W_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -20355,17 +20792,23 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_VAR_CV if (IS_VAR == IS_UNUSED && UNEXPECTED(Z_OBJ_P(container) == NULL)) { zend_throw_error(NULL, "Using $this when not in object context"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if (IS_VAR == IS_CONST || IS_VAR == IS_TMP_VAR) { zend_throw_error(NULL, "Cannot use temporary expression in write context"); if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if (IS_VAR == IS_VAR && UNEXPECTED(container == NULL)) { zend_throw_error(NULL, "Cannot use string offset as an object"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_VAR, property, IS_CV, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); @@ -20374,7 +20817,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_VAR_CV EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var), 0); } if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } else { ZEND_VM_TAIL_CALL(ZEND_FETCH_OBJ_R_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU)); } @@ -20771,7 +21219,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_V call->prev_execute_data = EX(call); EX(call) = call; - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ADD_ARRAY_ELEMENT_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -21811,16 +22259,20 @@ 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)); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); 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"); zval_ptr_dtor_nogc(EX_VAR(opline->op2.var)); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } zend_fetch_dimension_address_W(EX_VAR(opline->result.var), container, _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2), (IS_TMP_VAR|IS_VAR)); @@ -21834,6 +22286,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_VAR_TM zend_throw_error(NULL, "Cannot use [] for reading"); zval_ptr_dtor_nogc(EX_VAR(opline->op2.var)); zval_ptr_dtor_nogc(EX_VAR(opline->op1.var)); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } container = _get_zval_ptr_var(opline->op1.var, execute_data, &free_op1); @@ -21841,7 +22295,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_VAR_TM zval_ptr_dtor_nogc(free_op2); zval_ptr_dtor_nogc(free_op1); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_UNSET_SPEC_VAR_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -21881,6 +22340,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_VAR_TMPVAR_HA if (IS_VAR == IS_UNUSED && UNEXPECTED(Z_OBJ_P(container) == NULL)) { zend_throw_error(NULL, "Using $this when not in object context"); zval_ptr_dtor_nogc(EX_VAR(opline->op2.var)); + try_cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } @@ -21937,7 +22397,11 @@ fetch_obj_r_no_object: zval_ptr_dtor_nogc(free_op2); zval_ptr_dtor_nogc(free_op1); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + try_cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_W_SPEC_VAR_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -22018,17 +22482,23 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_VAR_TM if (IS_VAR == IS_UNUSED && UNEXPECTED(Z_OBJ_P(container) == NULL)) { zend_throw_error(NULL, "Using $this when not in object context"); zval_ptr_dtor_nogc(free_op2); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } 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(free_op2); if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if (IS_VAR == IS_VAR && UNEXPECTED(container == NULL)) { zend_throw_error(NULL, "Cannot use string offset as an object"); zval_ptr_dtor_nogc(free_op2); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_VAR, property, (IS_TMP_VAR|IS_VAR), (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); @@ -22037,7 +22507,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_VAR_TM EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var), 0); } if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } else { ZEND_VM_TAIL_CALL(ZEND_FETCH_OBJ_R_SPEC_VAR_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU)); } @@ -22347,7 +22822,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_V call->prev_execute_data = EX(call); EX(call) = call; - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ADD_ARRAY_ELEMENT_SPEC_VAR_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -22660,6 +23135,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_NEW_SPEC_UNUSED_HANDLER(ZEND_O } else { OBJ_RELEASE(Z_OBJ(object_zval)); } + if (UNEXPECTED(OP_JMP_ADDR(opline, opline->op2) != opline + 2)) { + /* free all these temps which are used between now and the DO_FCALL */ + zend_op *start_op = EX(func)->op_array.opcodes; + zend_cleanup_live_vars(execute_data, opline - start_op, OP_JMP_ADDR(opline, opline->op2) - start_op); + } ZEND_VM_JMP(OP_JMP_ADDR(opline, opline->op2)); } else { /* We are not handling overloaded classes right now */ @@ -23336,6 +23816,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_UNUSED_CONST_ if (IS_UNUSED == IS_UNUSED && UNEXPECTED(Z_OBJ_P(container) == NULL)) { zend_throw_error(NULL, "Using $this when not in object context"); + try_cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } @@ -23391,7 +23872,11 @@ fetch_obj_r_no_object: } while (0); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + try_cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_W_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -23544,17 +24029,23 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_UNUSED if (IS_UNUSED == IS_UNUSED && UNEXPECTED(Z_OBJ_P(container) == NULL)) { zend_throw_error(NULL, "Using $this when not in object context"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if (IS_UNUSED == IS_CONST || IS_UNUSED == IS_TMP_VAR) { zend_throw_error(NULL, "Cannot use temporary expression in write context"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if (IS_UNUSED == IS_VAR && UNEXPECTED(container == NULL)) { zend_throw_error(NULL, "Cannot use string offset as an object"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_UNUSED, property, IS_CONST, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); @@ -23563,7 +24054,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_UNUSED EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var), 0); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } else { ZEND_VM_TAIL_CALL(ZEND_FETCH_OBJ_R_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU)); } @@ -23773,13 +24269,17 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_UNUSED_C GC_REFCOUNT(obj)++; /* For $this pointer */ } + + if (UNEXPECTED(EG(exception) != NULL)) { + HANDLE_EXCEPTION(); + } + call = zend_vm_stack_push_call_frame(call_info, fbc, opline->extended_value, called_scope, obj); call->prev_execute_data = EX(call); EX(call) = call; - - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -23919,7 +24419,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_U call->prev_execute_data = EX(call); EX(call) = call; - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_CONSTANT_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -25270,7 +25770,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_U call->prev_execute_data = EX(call); EX(call) = call; - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_VERIFY_RETURN_TYPE_SPEC_UNUSED_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -26045,6 +26545,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_UNUSED_CV_HAN if (IS_UNUSED == IS_UNUSED && UNEXPECTED(Z_OBJ_P(container) == NULL)) { zend_throw_error(NULL, "Using $this when not in object context"); + try_cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } @@ -26100,7 +26601,11 @@ fetch_obj_r_no_object: } while (0); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + try_cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_W_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -26253,17 +26758,23 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_UNUSED if (IS_UNUSED == IS_UNUSED && UNEXPECTED(Z_OBJ_P(container) == NULL)) { zend_throw_error(NULL, "Using $this when not in object context"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if (IS_UNUSED == IS_CONST || IS_UNUSED == IS_TMP_VAR) { zend_throw_error(NULL, "Cannot use temporary expression in write context"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if (IS_UNUSED == IS_VAR && UNEXPECTED(container == NULL)) { zend_throw_error(NULL, "Cannot use string offset as an object"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_UNUSED, property, IS_CV, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); @@ -26272,7 +26783,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_UNUSED EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var), 0); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } else { ZEND_VM_TAIL_CALL(ZEND_FETCH_OBJ_R_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU)); } @@ -26482,13 +26998,17 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_UNUSED_C GC_REFCOUNT(obj)++; /* For $this pointer */ } + + if (UNEXPECTED(EG(exception) != NULL)) { + HANDLE_EXCEPTION(); + } + call = zend_vm_stack_push_call_frame(call_info, fbc, opline->extended_value, called_scope, obj); call->prev_execute_data = EX(call); EX(call) = call; - - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -26628,7 +27148,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_U call->prev_execute_data = EX(call); EX(call) = call; - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_ARRAY_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -27675,6 +28195,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_UNUSED_TMPVAR if (IS_UNUSED == IS_UNUSED && UNEXPECTED(Z_OBJ_P(container) == NULL)) { zend_throw_error(NULL, "Using $this when not in object context"); zval_ptr_dtor_nogc(EX_VAR(opline->op2.var)); + try_cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } @@ -27731,7 +28252,11 @@ fetch_obj_r_no_object: zval_ptr_dtor_nogc(free_op2); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + try_cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_W_SPEC_UNUSED_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -27885,17 +28410,23 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_UNUSED if (IS_UNUSED == IS_UNUSED && UNEXPECTED(Z_OBJ_P(container) == NULL)) { zend_throw_error(NULL, "Using $this when not in object context"); zval_ptr_dtor_nogc(free_op2); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if (IS_UNUSED == IS_CONST || IS_UNUSED == IS_TMP_VAR) { zend_throw_error(NULL, "Cannot use temporary expression in write context"); zval_ptr_dtor_nogc(free_op2); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if (IS_UNUSED == IS_VAR && UNEXPECTED(container == NULL)) { zend_throw_error(NULL, "Cannot use string offset as an object"); zval_ptr_dtor_nogc(free_op2); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_UNUSED, property, (IS_TMP_VAR|IS_VAR), (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); @@ -27904,7 +28435,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_UNUSED EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var), 0); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } else { ZEND_VM_TAIL_CALL(ZEND_FETCH_OBJ_R_SPEC_UNUSED_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU)); } @@ -28114,14 +28650,18 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_UNUSED_T GC_REFCOUNT(obj)++; /* For $this pointer */ } + zval_ptr_dtor_nogc(free_op2); + + if (UNEXPECTED(EG(exception) != NULL)) { + HANDLE_EXCEPTION(); + } + call = zend_vm_stack_push_call_frame(call_info, fbc, opline->extended_value, called_scope, obj); call->prev_execute_data = EX(call); EX(call) = call; - zval_ptr_dtor_nogc(free_op2); - - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_UNUSED_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -28261,7 +28801,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_U call->prev_execute_data = EX(call); EX(call) = call; - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_ARRAY_SPEC_UNUSED_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -29249,9 +29789,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SEND_VAR_SPEC_CV_HANDLER(ZEND_ if (IS_CV == IS_CV && UNEXPECTED(Z_TYPE_INFO_P(varptr) == IS_UNDEF)) { SAVE_OPLINE(); GET_OP1_UNDEF_CV(varptr, BP_VAR_R); + if (UNEXPECTED(EG(exception) != NULL)) { + ZEND_CALL_NUM_ARGS(EX(call)) = opline->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + arg = ZEND_CALL_VAR(EX(call), opline->result.var); ZVAL_NULL(arg); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } arg = ZEND_CALL_VAR(EX(call), opline->result.var); @@ -29289,8 +29835,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SEND_REF_SPEC_CV_HANDLER(ZEND_ if (IS_CV == IS_VAR && UNEXPECTED(varptr == NULL)) { zend_throw_error(NULL, "Only variables can be passed by reference"); - arg = ZEND_CALL_VAR(EX(call), opline->result.var); - ZVAL_UNDEF(arg); + ZEND_CALL_NUM_ARGS(EX(call)) = opline->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } @@ -29309,6 +29855,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SEND_REF_SPEC_CV_HANDLER(ZEND_ ZVAL_REF(varptr, Z_REF_P(arg)); } + if (IS_CV == IS_VAR && UNEXPECTED(EG(exception) != NULL)) { + ZEND_CALL_NUM_ARGS(EX(call)) = opline->op2.num; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } ZEND_VM_NEXT_OPCODE(); } @@ -29332,9 +29883,15 @@ send_var_by_ref: if (IS_CV == IS_CV && UNEXPECTED(Z_TYPE_INFO_P(varptr) == IS_UNDEF)) { SAVE_OPLINE(); GET_OP1_UNDEF_CV(varptr, BP_VAR_R); + if (UNEXPECTED(EG(exception) != NULL)) { + ZEND_CALL_NUM_ARGS(EX(call)) = arg_num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + arg = ZEND_CALL_VAR(EX(call), opline->result.var); ZVAL_NULL(arg); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } arg = ZEND_CALL_VAR(EX(call), opline->result.var); @@ -29393,7 +29950,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SEND_USER_SPEC_CV_HANDLER(ZEND EX(call)->called_scope = NULL; Z_OBJ(EX(call)->This) = NULL; - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception) != NULL)) { + ZEND_CALL_NUM_ARGS(EX(call)) = opline->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } ZVAL_NEW_REF(arg, arg); @@ -29411,7 +29973,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SEND_USER_SPEC_CV_HANDLER(ZEND } ZVAL_COPY_VALUE(param, arg); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception) != NULL)) { + ZEND_CALL_NUM_ARGS(EX(call)) = opline->op2.num; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_BOOL_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -31555,6 +32122,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ if (UNEXPECTED(CE_STATIC_MEMBERS(ce) == NULL)) { zend_throw_error(NULL, "Access to undeclared static property: %s::$%s", ZSTR_VAL(ce->name), ZSTR_VAL(name)); + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } HANDLE_EXCEPTION(); } @@ -31566,7 +32137,14 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ zend_string_release(name); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } CACHE_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op2)), ce); } @@ -31575,6 +32153,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ ce = zend_fetch_class(NULL, opline->op2.num); if (UNEXPECTED(ce == NULL)) { ZEND_ASSERT(EG(exception)); + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } HANDLE_EXCEPTION(); } } else { @@ -31587,6 +32169,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ if (UNEXPECTED(CE_STATIC_MEMBERS(ce) == NULL)) { zend_throw_error(NULL, "Access to undeclared static property: %s::$%s", ZSTR_VAL(ce->name), ZSTR_VAL(name)); + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } HANDLE_EXCEPTION(); } @@ -31596,6 +32182,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ retval = zend_std_get_static_property(ce, name, 0); if (UNEXPECTED(EG(exception))) { + try_cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if (IS_CV == IS_CONST && retval) { @@ -31616,7 +32203,11 @@ fetch_static_prop_return: } else { ZVAL_INDIRECT(EX_VAR(opline->result.var), retval); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + try_cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_STATIC_PROP_R_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -31736,16 +32327,20 @@ 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"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); 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"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } zend_fetch_dimension_address_W(EX_VAR(opline->result.var), container, EX_CONSTANT(opline->op2), IS_CONST); @@ -31759,6 +32354,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_CV_CON zend_throw_error(NULL, "Cannot use [] for reading"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } container = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op1.var); @@ -31766,7 +32363,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_CV_CON } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_UNSET_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -31806,6 +32408,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_CV_CONST_HAND if (IS_CV == IS_UNUSED && UNEXPECTED(Z_OBJ_P(container) == NULL)) { zend_throw_error(NULL, "Using $this when not in object context"); + try_cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } @@ -31861,7 +32464,11 @@ fetch_obj_r_no_object: } while (0); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + try_cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_W_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -32014,17 +32621,23 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CV_CON if (IS_CV == IS_UNUSED && UNEXPECTED(Z_OBJ_P(container) == NULL)) { zend_throw_error(NULL, "Using $this when not in object context"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if (IS_CV == IS_CONST || IS_CV == IS_TMP_VAR) { zend_throw_error(NULL, "Cannot use temporary expression in write context"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if (IS_CV == IS_VAR && UNEXPECTED(container == NULL)) { zend_throw_error(NULL, "Cannot use string offset as an object"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_CV, property, IS_CONST, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); @@ -32033,7 +32646,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CV_CON EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var), 0); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } else { ZEND_VM_TAIL_CALL(ZEND_FETCH_OBJ_R_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU)); } @@ -32455,13 +33073,17 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_CV_CONST GC_REFCOUNT(obj)++; /* For $this pointer */ } + + if (UNEXPECTED(EG(exception) != NULL)) { + HANDLE_EXCEPTION(); + } + call = zend_vm_stack_push_call_frame(call_info, fbc, opline->extended_value, called_scope, obj); call->prev_execute_data = EX(call); EX(call) = call; - - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CASE_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -33672,6 +34294,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ if (UNEXPECTED(CE_STATIC_MEMBERS(ce) == NULL)) { zend_throw_error(NULL, "Access to undeclared static property: %s::$%s", ZSTR_VAL(ce->name), ZSTR_VAL(name)); + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } HANDLE_EXCEPTION(); } @@ -33683,7 +34309,14 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ zend_string_release(name); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } CACHE_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op2)), ce); } @@ -33692,6 +34325,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ ce = zend_fetch_class(NULL, opline->op2.num); if (UNEXPECTED(ce == NULL)) { ZEND_ASSERT(EG(exception)); + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } HANDLE_EXCEPTION(); } } else { @@ -33704,6 +34341,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ if (UNEXPECTED(CE_STATIC_MEMBERS(ce) == NULL)) { zend_throw_error(NULL, "Access to undeclared static property: %s::$%s", ZSTR_VAL(ce->name), ZSTR_VAL(name)); + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } HANDLE_EXCEPTION(); } @@ -33713,6 +34354,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ retval = zend_std_get_static_property(ce, name, 0); if (UNEXPECTED(EG(exception))) { + try_cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if (IS_CV == IS_CONST && retval) { @@ -33733,7 +34375,11 @@ fetch_static_prop_return: } else { ZVAL_INDIRECT(EX_VAR(opline->result.var), retval); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + try_cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_STATIC_PROP_R_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -34564,6 +35210,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_ if (Z_CONSTANT_P(retval)) { if (UNEXPECTED(zval_update_constant_ex(retval, 1, NULL) != SUCCESS)) { + try_cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } } @@ -34584,7 +35231,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_ } else { ZVAL_INDIRECT(EX_VAR(opline->result.var), retval); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + try_cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_R_SPEC_CV_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -34655,6 +35306,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ if (UNEXPECTED(CE_STATIC_MEMBERS(ce) == NULL)) { zend_throw_error(NULL, "Access to undeclared static property: %s::$%s", ZSTR_VAL(ce->name), ZSTR_VAL(name)); + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } HANDLE_EXCEPTION(); } @@ -34666,7 +35321,14 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ zend_string_release(name); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } CACHE_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op2)), ce); } @@ -34675,6 +35337,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ ce = zend_fetch_class(NULL, opline->op2.num); if (UNEXPECTED(ce == NULL)) { ZEND_ASSERT(EG(exception)); + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } HANDLE_EXCEPTION(); } } else { @@ -34687,6 +35353,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ if (UNEXPECTED(CE_STATIC_MEMBERS(ce) == NULL)) { zend_throw_error(NULL, "Access to undeclared static property: %s::$%s", ZSTR_VAL(ce->name), ZSTR_VAL(name)); + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } HANDLE_EXCEPTION(); } @@ -34696,6 +35366,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ retval = zend_std_get_static_property(ce, name, 0); if (UNEXPECTED(EG(exception))) { + try_cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if (IS_CV == IS_CONST && retval) { @@ -34716,7 +35387,11 @@ fetch_static_prop_return: } else { ZVAL_INDIRECT(EX_VAR(opline->result.var), retval); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + try_cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_STATIC_PROP_R_SPEC_CV_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -34808,16 +35483,20 @@ 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"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); 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"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } zend_fetch_dimension_address_W(EX_VAR(opline->result.var), container, NULL, IS_UNUSED); @@ -34831,6 +35510,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_CV_UNU zend_throw_error(NULL, "Cannot use [] for reading"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } container = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op1.var); @@ -34838,7 +35519,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_CV_UNU } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_DIM_SPEC_CV_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -36853,16 +37539,20 @@ 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"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); 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"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } zend_fetch_dimension_address_W(EX_VAR(opline->result.var), container, _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op2.var), IS_CV); @@ -36876,6 +37566,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_CV_CV_ zend_throw_error(NULL, "Cannot use [] for reading"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } container = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op1.var); @@ -36883,7 +37575,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_CV_CV_ } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_UNSET_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -36923,6 +37620,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_CV_CV_HANDLER if (IS_CV == IS_UNUSED && UNEXPECTED(Z_OBJ_P(container) == NULL)) { zend_throw_error(NULL, "Using $this when not in object context"); + try_cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } @@ -36978,7 +37676,11 @@ fetch_obj_r_no_object: } while (0); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + try_cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_W_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -37131,17 +37833,23 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CV_CV_ if (IS_CV == IS_UNUSED && UNEXPECTED(Z_OBJ_P(container) == NULL)) { zend_throw_error(NULL, "Using $this when not in object context"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if (IS_CV == IS_CONST || IS_CV == IS_TMP_VAR) { zend_throw_error(NULL, "Cannot use temporary expression in write context"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if (IS_CV == IS_VAR && UNEXPECTED(container == NULL)) { zend_throw_error(NULL, "Cannot use string offset as an object"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_CV, property, IS_CV, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); @@ -37150,7 +37858,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CV_CV_ EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var), 0); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } else { ZEND_VM_TAIL_CALL(ZEND_FETCH_OBJ_R_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU)); } @@ -37586,13 +38299,17 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_CV_CV_HA GC_REFCOUNT(obj)++; /* For $this pointer */ } + + if (UNEXPECTED(EG(exception) != NULL)) { + HANDLE_EXCEPTION(); + } + call = zend_vm_stack_push_call_frame(call_info, fbc, opline->extended_value, called_scope, obj); call->prev_execute_data = EX(call); EX(call) = call; - - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CASE_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -39509,16 +40226,20 @@ 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)); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); 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"); zval_ptr_dtor_nogc(EX_VAR(opline->op2.var)); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } zend_fetch_dimension_address_W(EX_VAR(opline->result.var), container, _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2), (IS_TMP_VAR|IS_VAR)); @@ -39532,6 +40253,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_CV_TMP zend_throw_error(NULL, "Cannot use [] for reading"); zval_ptr_dtor_nogc(EX_VAR(opline->op2.var)); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } container = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op1.var); @@ -39539,7 +40262,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_CV_TMP zval_ptr_dtor_nogc(free_op2); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_UNSET_SPEC_CV_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -39579,6 +40307,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_CV_TMPVAR_HAN if (IS_CV == IS_UNUSED && UNEXPECTED(Z_OBJ_P(container) == NULL)) { zend_throw_error(NULL, "Using $this when not in object context"); zval_ptr_dtor_nogc(EX_VAR(opline->op2.var)); + try_cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } @@ -39635,7 +40364,11 @@ fetch_obj_r_no_object: zval_ptr_dtor_nogc(free_op2); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + try_cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_W_SPEC_CV_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -39789,17 +40522,23 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CV_TMP if (IS_CV == IS_UNUSED && UNEXPECTED(Z_OBJ_P(container) == NULL)) { zend_throw_error(NULL, "Using $this when not in object context"); zval_ptr_dtor_nogc(free_op2); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } 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(free_op2); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if (IS_CV == IS_VAR && UNEXPECTED(container == NULL)) { zend_throw_error(NULL, "Cannot use string offset as an object"); zval_ptr_dtor_nogc(free_op2); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_CV, property, (IS_TMP_VAR|IS_VAR), (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); @@ -39808,7 +40547,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CV_TMP EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var), 0); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } else { ZEND_VM_TAIL_CALL(ZEND_FETCH_OBJ_R_SPEC_CV_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU)); } @@ -40158,14 +40902,18 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_CV_TMPVA GC_REFCOUNT(obj)++; /* For $this pointer */ } + zval_ptr_dtor_nogc(free_op2); + + if (UNEXPECTED(EG(exception) != NULL)) { + HANDLE_EXCEPTION(); + } + call = zend_vm_stack_push_call_frame(call_info, fbc, opline->extended_value, called_scope, obj); call->prev_execute_data = EX(call); EX(call) = call; - zval_ptr_dtor_nogc(free_op2); - - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CASE_SPEC_CV_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -41910,6 +42658,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ if (UNEXPECTED(CE_STATIC_MEMBERS(ce) == NULL)) { zend_throw_error(NULL, "Access to undeclared static property: %s::$%s", ZSTR_VAL(ce->name), ZSTR_VAL(name)); zval_ptr_dtor_nogc(free_op1); + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } HANDLE_EXCEPTION(); } @@ -41921,7 +42673,14 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ zend_string_release(name); } zval_ptr_dtor_nogc(free_op1); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } CACHE_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op2)), ce); } @@ -41930,6 +42689,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ ce = zend_fetch_class(NULL, opline->op2.num); if (UNEXPECTED(ce == NULL)) { ZEND_ASSERT(EG(exception)); + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } HANDLE_EXCEPTION(); } } else { @@ -41942,6 +42705,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ if (UNEXPECTED(CE_STATIC_MEMBERS(ce) == NULL)) { zend_throw_error(NULL, "Access to undeclared static property: %s::$%s", ZSTR_VAL(ce->name), ZSTR_VAL(name)); zval_ptr_dtor_nogc(free_op1); + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } HANDLE_EXCEPTION(); } @@ -41951,6 +42718,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ retval = zend_std_get_static_property(ce, name, 0); if (UNEXPECTED(EG(exception))) { zval_ptr_dtor_nogc(free_op1); + try_cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if ((IS_TMP_VAR|IS_VAR) == IS_CONST && retval) { @@ -41973,7 +42741,11 @@ fetch_static_prop_return: } else { ZVAL_INDIRECT(EX_VAR(opline->result.var), retval); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + try_cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_STATIC_PROP_R_SPEC_TMPVAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -42333,14 +43105,17 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_TMPVAR_C GC_REFCOUNT(obj)++; /* For $this pointer */ } + zval_ptr_dtor_nogc(free_op1); + if (UNEXPECTED(EG(exception) != NULL)) { + HANDLE_EXCEPTION(); + } + call = zend_vm_stack_push_call_frame(call_info, fbc, opline->extended_value, called_scope, obj); call->prev_execute_data = EX(call); EX(call) = call; - zval_ptr_dtor_nogc(free_op1); - - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CASE_SPEC_TMPVAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -42808,6 +43583,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ if (UNEXPECTED(CE_STATIC_MEMBERS(ce) == NULL)) { zend_throw_error(NULL, "Access to undeclared static property: %s::$%s", ZSTR_VAL(ce->name), ZSTR_VAL(name)); zval_ptr_dtor_nogc(free_op1); + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } HANDLE_EXCEPTION(); } @@ -42819,7 +43598,14 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ zend_string_release(name); } zval_ptr_dtor_nogc(free_op1); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } CACHE_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op2)), ce); } @@ -42828,6 +43614,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ ce = zend_fetch_class(NULL, opline->op2.num); if (UNEXPECTED(ce == NULL)) { ZEND_ASSERT(EG(exception)); + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } HANDLE_EXCEPTION(); } } else { @@ -42840,6 +43630,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ if (UNEXPECTED(CE_STATIC_MEMBERS(ce) == NULL)) { zend_throw_error(NULL, "Access to undeclared static property: %s::$%s", ZSTR_VAL(ce->name), ZSTR_VAL(name)); zval_ptr_dtor_nogc(free_op1); + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } HANDLE_EXCEPTION(); } @@ -42849,6 +43643,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ retval = zend_std_get_static_property(ce, name, 0); if (UNEXPECTED(EG(exception))) { zval_ptr_dtor_nogc(free_op1); + try_cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if ((IS_TMP_VAR|IS_VAR) == IS_CONST && retval) { @@ -42871,7 +43666,11 @@ fetch_static_prop_return: } else { ZVAL_INDIRECT(EX_VAR(opline->result.var), retval); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + try_cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_STATIC_PROP_R_SPEC_TMPVAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -43165,6 +43964,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_ if (Z_CONSTANT_P(retval)) { if (UNEXPECTED(zval_update_constant_ex(retval, 1, NULL) != SUCCESS)) { zval_ptr_dtor_nogc(free_op1); + try_cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } } @@ -43185,7 +43985,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_ } else { ZVAL_INDIRECT(EX_VAR(opline->result.var), retval); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + try_cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_R_SPEC_TMPVAR_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -43256,6 +44060,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ if (UNEXPECTED(CE_STATIC_MEMBERS(ce) == NULL)) { zend_throw_error(NULL, "Access to undeclared static property: %s::$%s", ZSTR_VAL(ce->name), ZSTR_VAL(name)); zval_ptr_dtor_nogc(free_op1); + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } HANDLE_EXCEPTION(); } @@ -43267,7 +44075,14 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ zend_string_release(name); } zval_ptr_dtor_nogc(free_op1); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } CACHE_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op2)), ce); } @@ -43276,6 +44091,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ ce = zend_fetch_class(NULL, opline->op2.num); if (UNEXPECTED(ce == NULL)) { ZEND_ASSERT(EG(exception)); + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } HANDLE_EXCEPTION(); } } else { @@ -43288,6 +44107,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ if (UNEXPECTED(CE_STATIC_MEMBERS(ce) == NULL)) { zend_throw_error(NULL, "Access to undeclared static property: %s::$%s", ZSTR_VAL(ce->name), ZSTR_VAL(name)); zval_ptr_dtor_nogc(free_op1); + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } HANDLE_EXCEPTION(); } @@ -43297,6 +44120,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ retval = zend_std_get_static_property(ce, name, 0); if (UNEXPECTED(EG(exception))) { zval_ptr_dtor_nogc(free_op1); + try_cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if ((IS_TMP_VAR|IS_VAR) == IS_CONST && retval) { @@ -43319,7 +44143,11 @@ fetch_static_prop_return: } else { ZVAL_INDIRECT(EX_VAR(opline->result.var), retval); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + try_cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_STATIC_PROP_R_SPEC_TMPVAR_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -44533,14 +45361,17 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_TMPVAR_C GC_REFCOUNT(obj)++; /* For $this pointer */ } + zval_ptr_dtor_nogc(free_op1); + if (UNEXPECTED(EG(exception) != NULL)) { + HANDLE_EXCEPTION(); + } + call = zend_vm_stack_push_call_frame(call_info, fbc, opline->extended_value, called_scope, obj); call->prev_execute_data = EX(call); EX(call) = call; - zval_ptr_dtor_nogc(free_op1); - - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CASE_SPEC_TMPVAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -45671,15 +46502,18 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_TMPVAR_T GC_REFCOUNT(obj)++; /* For $this pointer */ } + zval_ptr_dtor_nogc(free_op2); + zval_ptr_dtor_nogc(free_op1); + if (UNEXPECTED(EG(exception) != NULL)) { + HANDLE_EXCEPTION(); + } + call = zend_vm_stack_push_call_frame(call_info, fbc, opline->extended_value, called_scope, obj); call->prev_execute_data = EX(call); EX(call) = call; - zval_ptr_dtor_nogc(free_op2); - zval_ptr_dtor_nogc(free_op1); - - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CASE_SPEC_TMPVAR_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 40bdc9f..85914dc 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -1892,6 +1892,7 @@ 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 */ @@ -1924,7 +1925,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, def->result.var); + ZEND_LIVE_TMPVAR, var); break; } } @@ -2153,7 +2154,7 @@ static zend_op *zend_delayed_compile_end(uint32_t offset) /* {{{ */ zend_op *opline = NULL, *oplines = zend_stack_base(&CG(delayed_oplines_stack)); uint32_t i, count = zend_stack_count(&CG(delayed_oplines_stack)); - ZEND_ASSERT(count > offset); + ZEND_ASSERT(count >= offset); for (i = offset; i < count; ++i) { opline = get_next_op(CG(active_op_array)); memcpy(opline, &oplines[i], sizeof(zend_op)); @@ -2874,44 +2875,85 @@ void zend_compile_compound_assign(znode *result, zend_ast *ast) /* {{{ */ } /* }}} */ -uint32_t zend_compile_args(zend_ast *ast, zend_function *fbc) /* {{{ */ +znode *zend_compile_arg_values(zend_ast *ast, zend_function *fbc) /* {{{ */ { - /* TODO.AST &var error */ zend_ast_list *args = zend_ast_get_list(ast); - uint32_t i; + uint32_t i = args->children; zend_bool uses_arg_unpack = 0; + znode *arg_nodes = emalloc(sizeof(znode) * args->children); + + for (i = 0; i < args->children; i++) { + zend_ast *arg = args->child[i]; + uint32_t arg_num = i + 1; + + arg_nodes[i].flag = 0; + + if (arg->kind == ZEND_AST_UNPACK) { + uses_arg_unpack = 1; + fbc = NULL; + + zend_compile_expr(arg_nodes + i, arg->child[0]); + continue; + } + + if (uses_arg_unpack) { + zend_error_noreturn(E_COMPILE_ERROR, "Cannot use positional argument after argument unpacking"); + } + + if (zend_is_variable(arg)) { + if (zend_is_call(arg)) { + zend_compile_var(arg_nodes + i, arg, BP_VAR_R); + } else if (fbc) { + if (ARG_SHOULD_BE_SENT_BY_REF(fbc, arg_num)) { + zend_compile_var(arg_nodes + i, arg, BP_VAR_W); + } else { + zend_compile_var(arg_nodes + i, arg, BP_VAR_R); + } + } else { + /* BP_VAR_FUNC_ARG needs to be fetched after EX(call) had been determined */ + uint32_t offset = zend_delayed_compile_begin(); + zend_delayed_compile_var(arg_nodes + i, arg, BP_VAR_FUNC_ARG | (arg_num << BP_VAR_SHIFT)); + arg_nodes[i].flag = zend_delayed_compile_begin() - offset; + } + } else { + zend_compile_expr(arg_nodes + i, arg); + } + } + + return arg_nodes; +} +/* }}} */ + +uint32_t zend_compile_arg_passing(zend_ast *ast, zend_function *fbc, znode *arg_nodes) /* {{{ */ +{ + zend_ast_list *args = zend_ast_get_list(ast); + int i; uint32_t arg_count = 0; /* number of arguments not including unpacks */ + for (i = args->children - 1; i >= 0; i--) { + if (arg_nodes[i].flag) { + zend_delayed_compile_end(zend_delayed_compile_begin() - arg_nodes[i].flag); + } + } + for (i = 0; i < args->children; ++i) { zend_ast *arg = args->child[i]; uint32_t arg_num = i + 1; - znode arg_node; zend_op *opline; zend_uchar opcode; zend_ulong flags = 0; if (arg->kind == ZEND_AST_UNPACK) { - uses_arg_unpack = 1; - fbc = NULL; - - zend_compile_expr(&arg_node, arg->child[0]); - opline = zend_emit_op(NULL, ZEND_SEND_UNPACK, &arg_node, NULL); + opline = zend_emit_op(NULL, ZEND_SEND_UNPACK, arg_nodes + i, NULL); opline->op2.num = arg_count; opline->result.var = (uint32_t)(zend_intptr_t)ZEND_CALL_ARG(NULL, arg_count); continue; } - if (uses_arg_unpack) { - zend_error_noreturn(E_COMPILE_ERROR, - "Cannot use positional argument after argument unpacking"); - } - - arg_count++; if (zend_is_variable(arg)) { if (zend_is_call(arg)) { - zend_compile_var(&arg_node, arg, BP_VAR_R); - if (arg_node.op_type & (IS_CONST|IS_TMP_VAR)) { + if (arg_nodes[i].op_type & (IS_CONST|IS_TMP_VAR)) { /* Function call was converted into builtin instruction */ opcode = ZEND_SEND_VAL; } else { @@ -2926,21 +2968,16 @@ uint32_t zend_compile_args(zend_ast *ast, zend_function *fbc) /* {{{ */ } } else if (fbc) { if (ARG_SHOULD_BE_SENT_BY_REF(fbc, arg_num)) { - zend_compile_var(&arg_node, arg, BP_VAR_W); opcode = ZEND_SEND_REF; } else { - zend_compile_var(&arg_node, arg, BP_VAR_R); opcode = ZEND_SEND_VAR; } } else { - zend_compile_var(&arg_node, arg, - BP_VAR_FUNC_ARG | (arg_num << BP_VAR_SHIFT)); opcode = ZEND_SEND_VAR_EX; } } else { - zend_compile_expr(&arg_node, arg); - ZEND_ASSERT(arg_node.op_type != IS_CV); - if (arg_node.op_type == IS_VAR) { + ZEND_ASSERT(arg_nodes[i].op_type != IS_CV); + if (arg_nodes[i].op_type == IS_VAR) { opcode = ZEND_SEND_VAR_NO_REF; if (fbc && ARG_MUST_BE_SENT_BY_REF(fbc, arg_num)) { flags |= ZEND_ARG_SEND_BY_REF; @@ -2957,7 +2994,7 @@ uint32_t zend_compile_args(zend_ast *ast, zend_function *fbc) /* {{{ */ } } - opline = zend_emit_op(NULL, opcode, &arg_node, NULL); + opline = zend_emit_op(NULL, opcode, arg_nodes + i, NULL); opline->op2.opline_num = arg_num; opline->result.var = (uint32_t)(zend_intptr_t)ZEND_CALL_ARG(NULL, arg_num); @@ -2974,8 +3011,12 @@ uint32_t zend_compile_args(zend_ast *ast, zend_function *fbc) /* {{{ */ } else if (fbc) { opline->extended_value = ZEND_ARG_COMPILE_TIME_BOUND; } + + arg_count++; } + efree(arg_nodes); + return arg_count; } /* }}} */ @@ -3005,16 +3046,14 @@ ZEND_API zend_uchar zend_get_call_op(zend_uchar init_op, zend_function *fbc) /* } /* }}} */ -void zend_compile_call_common(znode *result, zend_ast *args_ast, zend_function *fbc) /* {{{ */ +void zend_compile_call_common(znode *result, znode *arg_nodes, zend_ast *args_ast, zend_function *fbc) /* {{{ */ { zend_op *opline; - uint32_t opnum_init = get_next_op_number(CG(active_op_array)) - 1; - uint32_t arg_count; - uint32_t call_flags; + uint32_t arg_count, call_flags, opnum_init = get_next_op_number(CG(active_op_array)) - 1;; zend_do_extended_fcall_begin(); - arg_count = zend_compile_args(args_ast, fbc); + arg_count = zend_compile_arg_passing(args_ast, fbc, arg_nodes); opline = &CG(active_op_array)->opcodes[opnum_init]; opline->extended_value = arg_count; @@ -3046,6 +3085,7 @@ zend_bool zend_compile_function_name(znode *name_node, zend_ast *name_ast) /* {{ void zend_compile_ns_call(znode *result, znode *name_node, zend_ast *args_ast) /* {{{ */ { + znode *arg_nodes = zend_compile_arg_values(args_ast, NULL); zend_op *opline = get_next_op(CG(active_op_array)); opline->opcode = ZEND_INIT_NS_FCALL_BY_NAME; SET_UNUSED(opline->op1); @@ -3054,12 +3094,14 @@ void zend_compile_ns_call(znode *result, znode *name_node, zend_ast *args_ast) / CG(active_op_array), Z_STR(name_node->u.constant)); zend_alloc_cache_slot(opline->op2.constant); - zend_compile_call_common(result, args_ast, NULL); + zend_compile_call_common(result, arg_nodes, args_ast, NULL); } /* }}} */ void zend_compile_dynamic_call(znode *result, znode *name_node, zend_ast *args_ast) /* {{{ */ { + znode *arg_nodes = zend_compile_arg_values(args_ast, NULL); + if (name_node->op_type == IS_CONST && Z_TYPE(name_node->u.constant) == IS_STRING) { const char *colon; zend_string *str = Z_STR(name_node->u.constant); @@ -3088,7 +3130,7 @@ void zend_compile_dynamic_call(znode *result, znode *name_node, zend_ast *args_a zend_emit_op(NULL, ZEND_INIT_DYNAMIC_CALL, NULL, name_node); } - zend_compile_call_common(result, args_ast, NULL); + zend_compile_call_common(result, arg_nodes, args_ast, NULL); } /* }}} */ @@ -3233,8 +3275,8 @@ int zend_compile_func_cufa(znode *result, zend_ast_list *args, zend_string *lcna return FAILURE; } - zend_compile_init_user_func(args->child[0], 0, lcname); zend_compile_expr(&arg_node, args->child[1]); + zend_compile_init_user_func(args->child[0], 0, lcname); zend_emit_op(NULL, ZEND_SEND_ARRAY, &arg_node, NULL); zend_emit_op(result, ZEND_DO_FCALL, NULL, NULL); @@ -3245,33 +3287,36 @@ int zend_compile_func_cufa(znode *result, zend_ast_list *args, zend_string *lcna /* cuf = call_user_func */ int zend_compile_func_cuf(znode *result, zend_ast_list *args, zend_string *lcname) /* {{{ */ { - uint32_t i; + uint32_t i, offset = zend_delayed_compile_begin(); + znode *arg_nodes; if (args->children < 1 || zend_args_contain_unpack(args)) { return FAILURE; } - zend_compile_init_user_func(args->child[0], args->children - 1, lcname); + arg_nodes = emalloc(args->children * sizeof(znode)); + for (i = 1; i < args->children; ++i) { zend_ast *arg_ast = args->child[i]; - znode arg_node; - zend_op *opline; - zend_bool send_user = 0; if (zend_is_variable(arg_ast) && !zend_is_call(arg_ast)) { - zend_compile_var(&arg_node, arg_ast, BP_VAR_FUNC_ARG | (i << BP_VAR_SHIFT)); - send_user = 1; + /* BP_VAR_FUNC_ARG needs to be fetched after EX(call) had been determined */ + zend_delayed_compile_var(arg_nodes + i, arg_ast, BP_VAR_FUNC_ARG | (i << BP_VAR_SHIFT)); } else { - zend_compile_expr(&arg_node, arg_ast); - if (arg_node.op_type & (IS_VAR|IS_CV)) { - send_user = 1; - } + zend_compile_expr(arg_nodes + i, arg_ast); } + } + + zend_compile_init_user_func(args->child[0], args->children - 1, lcname); + zend_delayed_compile_end(offset); - if (send_user) { - opline = zend_emit_op(NULL, ZEND_SEND_USER, &arg_node, NULL); + for (i = 1; i < args->children; ++i) { + zend_op *opline; + + if (arg_nodes[i].op_type & (IS_VAR|IS_CV)) { + opline = zend_emit_op(NULL, ZEND_SEND_USER, arg_nodes + i, NULL); } else { - opline = zend_emit_op(NULL, ZEND_SEND_VAL, &arg_node, NULL); + opline = zend_emit_op(NULL, ZEND_SEND_VAL, arg_nodes + i, NULL); } opline->op2.num = i; @@ -3279,6 +3324,7 @@ int zend_compile_func_cuf(znode *result, zend_ast_list *args, zend_string *lcnam } zend_emit_op(result, ZEND_DO_FCALL, NULL, NULL); + efree(arg_nodes); return SUCCESS; } /* }}} */ @@ -3306,10 +3352,22 @@ static int zend_compile_assert(znode *result, zend_ast_list *args, zend_string * if (EG(assertions) >= 0) { znode name_node; zend_op *opline; + znode *arg_nodes; uint32_t check_op_number = get_next_op_number(CG(active_op_array)); zend_emit_op(NULL, ZEND_ASSERT_CHECK, NULL, NULL); + if (args->children == 1 && + (args->child[0]->kind != ZEND_AST_ZVAL || + Z_TYPE_P(zend_ast_get_zval(args->child[0])) != IS_STRING)) { + /* add "assert(condition) as assertion message */ + zend_ast_list_add((zend_ast*)args, + zend_ast_create_zval_from_str( + zend_ast_export("assert(", args->child[0], ")"))); + } + + arg_nodes = zend_compile_arg_values((zend_ast *) args, fbc); + if (fbc) { name_node.op_type = IS_CONST; ZVAL_STR_COPY(&name_node.u.constant, name); @@ -3323,16 +3381,7 @@ static int zend_compile_assert(znode *result, zend_ast_list *args, zend_string * } zend_alloc_cache_slot(opline->op2.constant); - if (args->children == 1 && - (args->child[0]->kind != ZEND_AST_ZVAL || - Z_TYPE_P(zend_ast_get_zval(args->child[0])) != IS_STRING)) { - /* add "assert(condition) as assertion message */ - zend_ast_list_add((zend_ast*)args, - zend_ast_create_zval_from_str( - zend_ast_export("assert(", args->child[0], ")"))); - } - - zend_compile_call_common(result, (zend_ast*)args, fbc); + zend_compile_call_common(result, arg_nodes, (zend_ast *) args, fbc); CG(active_op_array)->opcodes[check_op_number].op2.opline_num = get_next_op_number(CG(active_op_array)); } else { @@ -3423,6 +3472,7 @@ void zend_compile_call(znode *result, zend_ast *ast, uint32_t type) /* {{{ */ zend_string *lcname; zend_function *fbc; zend_op *opline; + znode *arg_nodes; lcname = zend_string_tolower(Z_STR_P(name)); @@ -3447,10 +3497,11 @@ void zend_compile_call(znode *result, zend_ast *ast, uint32_t type) /* {{{ */ zval_ptr_dtor(&name_node.u.constant); ZVAL_NEW_STR(&name_node.u.constant, lcname); + arg_nodes = zend_compile_arg_values(args_ast, fbc); opline = zend_emit_op(NULL, ZEND_INIT_FCALL, NULL, &name_node); zend_alloc_cache_slot(opline->op2.constant); - zend_compile_call_common(result, args_ast, fbc); + zend_compile_call_common(result, arg_nodes, args_ast, fbc); } } /* }}} */ @@ -3461,7 +3512,7 @@ void zend_compile_method_call(znode *result, zend_ast *ast, uint32_t type) /* {{ zend_ast *method_ast = ast->child[1]; zend_ast *args_ast = ast->child[2]; - znode obj_node, method_node; + znode obj_node, method_node, *arg_nodes; zend_op *opline; if (is_this_fetch(obj_ast)) { @@ -3471,6 +3522,8 @@ void zend_compile_method_call(znode *result, zend_ast *ast, uint32_t type) /* {{ } zend_compile_expr(&method_node, method_ast); + arg_nodes = zend_compile_arg_values(args_ast, NULL); + opline = zend_emit_op(NULL, ZEND_INIT_METHOD_CALL, &obj_node, NULL); if (method_node.op_type == IS_CONST) { @@ -3486,7 +3539,7 @@ void zend_compile_method_call(znode *result, zend_ast *ast, uint32_t type) /* {{ SET_NODE(opline->op2, &method_node); } - zend_compile_call_common(result, args_ast, NULL); + zend_compile_call_common(result, arg_nodes, args_ast, NULL); } /* }}} */ @@ -3502,7 +3555,7 @@ void zend_compile_static_call(znode *result, zend_ast *ast, uint32_t type) /* {{ zend_ast *method_ast = ast->child[1]; zend_ast *args_ast = ast->child[2]; - znode class_node, method_node; + znode class_node, method_node, *arg_nodes; zend_op *opline; zend_compile_class_ref_ex(&class_node, class_ast, ZEND_FETCH_CLASS_EXCEPTION); @@ -3519,6 +3572,8 @@ void zend_compile_static_call(znode *result, zend_ast *ast, uint32_t type) /* {{ } } + arg_nodes = zend_compile_arg_values(args_ast, NULL); + opline = get_next_op(CG(active_op_array)); opline->opcode = ZEND_INIT_STATIC_METHOD_CALL; @@ -3538,7 +3593,7 @@ void zend_compile_static_call(znode *result, zend_ast *ast, uint32_t type) /* {{ } zend_check_live_ranges(opline); - zend_compile_call_common(result, args_ast, NULL); + zend_compile_call_common(result, arg_nodes, args_ast, NULL); } /* }}} */ @@ -3549,7 +3604,7 @@ void zend_compile_new(znode *result, zend_ast *ast) /* {{{ */ zend_ast *class_ast = ast->child[0]; zend_ast *args_ast = ast->child[1]; - znode class_node, ctor_result; + znode class_node, ctor_result, *arg_nodes; zend_op *opline; uint32_t opnum; @@ -3568,6 +3623,8 @@ void zend_compile_new(znode *result, zend_ast *ast) /* {{{ */ zend_compile_class_ref_ex(&class_node, class_ast, ZEND_FETCH_CLASS_EXCEPTION); } + arg_nodes = zend_compile_arg_values(args_ast, NULL); + opnum = get_next_op_number(CG(active_op_array)); opline = zend_emit_op(result, ZEND_NEW, NULL, NULL); @@ -3579,7 +3636,7 @@ void zend_compile_new(znode *result, zend_ast *ast) /* {{{ */ SET_NODE(opline->op1, &class_node); } - zend_compile_call_common(&ctor_result, args_ast, NULL); + zend_compile_call_common(&ctor_result, arg_nodes, args_ast, NULL); zend_do_free(&ctor_result); /* New jumps over ctor call if ctor does not exist */ diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index 044b49e..108539b 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -2444,134 +2444,45 @@ static zend_always_inline zend_generator *zend_get_running_generator(zend_execut } /* }}} */ -static void cleanup_unfinished_calls(zend_execute_data *execute_data, uint32_t 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 */ +static void cleanup_call_frame(zend_execute_data *execute_data) /* {{{ */ { - if (UNEXPECTED(EX(call))) { - zend_execute_data *call = EX(call); - zend_op *opline = EX(func)->op_array.opcodes + op_num; - int level; - int do_exit; - - if (UNEXPECTED(opline->opcode == ZEND_INIT_FCALL || - opline->opcode == ZEND_INIT_FCALL_BY_NAME || - opline->opcode == ZEND_INIT_DYNAMIC_CALL || - opline->opcode == ZEND_INIT_METHOD_CALL || - opline->opcode == ZEND_INIT_STATIC_METHOD_CALL)) { - ZEND_ASSERT(op_num); - opline--; - } + zend_vm_stack_free_args(EX(call)); - do { - /* If the exception was thrown during a function call there might be - * arguments pushed to the stack that have to be dtor'ed. */ - - /* find the number of actually passed arguments */ - level = 0; - do_exit = 0; - do { - switch (opline->opcode) { - case ZEND_DO_FCALL: - case ZEND_DO_ICALL: - case ZEND_DO_UCALL: - case ZEND_DO_FCALL_BY_NAME: - level++; - break; - case ZEND_INIT_FCALL: - case ZEND_INIT_FCALL_BY_NAME: - case ZEND_INIT_NS_FCALL_BY_NAME: - case ZEND_INIT_DYNAMIC_CALL: - case ZEND_INIT_USER_CALL: - case ZEND_INIT_METHOD_CALL: - case ZEND_INIT_STATIC_METHOD_CALL: - case ZEND_NEW: - if (level == 0) { - ZEND_CALL_NUM_ARGS(call) = 0; - do_exit = 1; - } - level--; - 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: - if (level == 0) { - ZEND_CALL_NUM_ARGS(call) = opline->op2.num; - do_exit = 1; - } - break; - case ZEND_SEND_ARRAY: - case ZEND_SEND_UNPACK: - if (level == 0) { - do_exit = 1; - } - break; - } - if (!do_exit) { - opline--; - } - } while (!do_exit); - if (call->prev_execute_data) { - /* skip current call region */ - level = 0; - do_exit = 0; - do { - switch (opline->opcode) { - case ZEND_DO_FCALL: - case ZEND_DO_ICALL: - case ZEND_DO_UCALL: - case ZEND_DO_FCALL_BY_NAME: - level++; - break; - case ZEND_INIT_FCALL: - case ZEND_INIT_FCALL_BY_NAME: - case ZEND_INIT_NS_FCALL_BY_NAME: - case ZEND_INIT_DYNAMIC_CALL: - case ZEND_INIT_USER_CALL: - case ZEND_INIT_METHOD_CALL: - case ZEND_INIT_STATIC_METHOD_CALL: - case ZEND_NEW: - if (level == 0) { - do_exit = 1; - } - level--; - break; - } - opline--; - } while (!do_exit); + if (ZEND_CALL_INFO(EX(call)) & ZEND_CALL_RELEASE_THIS) { + if (ZEND_CALL_INFO(EX(call)) & ZEND_CALL_CTOR) { + if (!(ZEND_CALL_INFO(EX(call)) & ZEND_CALL_CTOR_RESULT_UNUSED)) { + GC_REFCOUNT(Z_OBJ(EX(call)->This))--; } - - zend_vm_stack_free_args(EX(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 (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(EX(call)->This)) == 1) { + zend_object_store_ctor_failed(Z_OBJ(EX(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); - } - - EX(call) = call->prev_execute_data; - zend_vm_stack_free_call_frame(call); - call = EX(call); - } while (call); + } + OBJ_RELEASE(Z_OBJ(EX(call)->This)); + } + if (EX(call)->func->common.fn_flags & ZEND_ACC_CLOSURE) { + zend_object_release((zend_object *) EX(call)->func->common.prototype); + } else if (EX(call)->func->common.fn_flags & ZEND_ACC_CALL_VIA_TRAMPOLINE) { + zend_string_release(EX(call)->func->common.function_name); + zend_free_trampoline(EX(call)->func); } + + zend_vm_stack_free_call_frame(EX(call)); + EX(call) = NULL; } /* }}} */ -static void cleanup_live_vars(zend_execute_data *execute_data, uint32_t op_num, uint32_t catch_op_num) /* {{{ */ +static zend_always_inline void try_cleanup_call_frame(zend_execute_data *execute_data) /* {{{ */ +{ + if (UNEXPECTED(EX(call))) { + ZEND_ASSERT((EG(opline_before_exception) + 1)->opcode == ZEND_SEND_VAR_EX); + ZEND_CALL_NUM_ARGS(EX(call)) = (EG(opline_before_exception) + 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } +} + +void zend_cleanup_live_vars(zend_execute_data *execute_data, uint32_t op_num, uint32_t catch_op_num) /* {{{ */ { int i; @@ -2621,11 +2532,6 @@ static void cleanup_live_vars(zend_execute_data *execute_data, uint32_t op_num, } /* }}} */ -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 50b2af1..40ee642 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_unfinished_execution(zend_execute_data *execute_data, uint32_t op_num, uint32_t catch_op_num); +void zend_cleanup_live_vars(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 3ffa82e..92cacc2 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_unfinished_execution(execute_data, op_num, 0); + zend_cleanup_live_vars(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 a653780..3d5bf88 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -1541,6 +1541,7 @@ ZEND_VM_HELPER_EX(zend_fetch_var_address_helper, CONST|TMPVAR|CV, UNUSED, int ty if (Z_CONSTANT_P(retval)) { if (UNEXPECTED(zval_update_constant_ex(retval, 1, NULL) != SUCCESS)) { FREE_OP1(); + try_cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } } @@ -1561,7 +1562,11 @@ ZEND_VM_HELPER_EX(zend_fetch_var_address_helper, CONST|TMPVAR|CV, UNUSED, int ty } else { ZVAL_INDIRECT(EX_VAR(opline->result.var), retval); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + try_cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } ZEND_VM_HANDLER(80, ZEND_FETCH_R, CONST|TMPVAR|CV, UNUSED, VAR_FETCH) @@ -1632,6 +1637,10 @@ ZEND_VM_HELPER_EX(zend_fetch_static_prop_helper, CONST|TMPVAR|CV, UNUSED|CONST|V if (UNEXPECTED(CE_STATIC_MEMBERS(ce) == NULL)) { zend_throw_error(NULL, "Access to undeclared static property: %s::$%s", ZSTR_VAL(ce->name), ZSTR_VAL(name)); FREE_OP1(); + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } HANDLE_EXCEPTION(); } @@ -1643,7 +1652,14 @@ ZEND_VM_HELPER_EX(zend_fetch_static_prop_helper, CONST|TMPVAR|CV, UNUSED|CONST|V zend_string_release(name); } FREE_OP1(); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } CACHE_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op2)), ce); } @@ -1652,6 +1668,10 @@ ZEND_VM_HELPER_EX(zend_fetch_static_prop_helper, CONST|TMPVAR|CV, UNUSED|CONST|V ce = zend_fetch_class(NULL, opline->op2.num); if (UNEXPECTED(ce == NULL)) { ZEND_ASSERT(EG(exception)); + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } HANDLE_EXCEPTION(); } } else { @@ -1664,6 +1684,10 @@ ZEND_VM_HELPER_EX(zend_fetch_static_prop_helper, CONST|TMPVAR|CV, UNUSED|CONST|V if (UNEXPECTED(CE_STATIC_MEMBERS(ce) == NULL)) { zend_throw_error(NULL, "Access to undeclared static property: %s::$%s", ZSTR_VAL(ce->name), ZSTR_VAL(name)); FREE_OP1(); + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } HANDLE_EXCEPTION(); } @@ -1673,6 +1697,7 @@ ZEND_VM_HELPER_EX(zend_fetch_static_prop_helper, CONST|TMPVAR|CV, UNUSED|CONST|V retval = zend_std_get_static_property(ce, name, 0); if (UNEXPECTED(EG(exception))) { FREE_OP1(); + try_cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if (OP1_TYPE == IS_CONST && retval) { @@ -1695,7 +1720,11 @@ ZEND_VM_C_LABEL(fetch_static_prop_return): } else { ZVAL_INDIRECT(EX_VAR(opline->result.var), retval); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + try_cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } ZEND_VM_HANDLER(173, ZEND_FETCH_STATIC_PROP_R, CONST|TMPVAR|CV, UNUSED|CONST|VAR) @@ -1815,16 +1844,20 @@ 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(); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); 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"); FREE_UNFETCHED_OP2(); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } zend_fetch_dimension_address_W(EX_VAR(opline->result.var), container, GET_OP2_ZVAL_PTR(BP_VAR_R), OP2_TYPE); @@ -1838,6 +1871,8 @@ ZEND_VM_HANDLER(93, ZEND_FETCH_DIM_FUNC_ARG, CONST|TMP|VAR|CV, CONST|TMPVAR|UNUS zend_throw_error(NULL, "Cannot use [] for reading"); FREE_UNFETCHED_OP2(); FREE_UNFETCHED_OP1(); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } container = GET_OP1_ZVAL_PTR(BP_VAR_R); @@ -1845,7 +1880,12 @@ ZEND_VM_HANDLER(93, ZEND_FETCH_DIM_FUNC_ARG, CONST|TMP|VAR|CV, CONST|TMPVAR|UNUS FREE_OP2(); FREE_OP1(); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } ZEND_VM_HANDLER(96, ZEND_FETCH_DIM_UNSET, VAR|CV, CONST|TMPVAR|CV) @@ -1885,6 +1925,7 @@ ZEND_VM_HANDLER(82, ZEND_FETCH_OBJ_R, CONST|TMP|VAR|UNUSED|CV, CONST|TMPVAR|CV) if (OP1_TYPE == IS_UNUSED && UNEXPECTED(Z_OBJ_P(container) == NULL)) { zend_throw_error(NULL, "Using $this when not in object context"); FREE_UNFETCHED_OP2(); + try_cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } @@ -1941,7 +1982,11 @@ ZEND_VM_C_LABEL(fetch_obj_r_no_object): FREE_OP2(); FREE_OP1(); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + try_cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } ZEND_VM_HANDLER(85, ZEND_FETCH_OBJ_W, VAR|UNUSED|CV, CONST|TMPVAR|CV) @@ -2095,17 +2140,23 @@ ZEND_VM_HANDLER(94, ZEND_FETCH_OBJ_FUNC_ARG, CONST|TMP|VAR|UNUSED|CV, CONST|TMPV if (OP1_TYPE == IS_UNUSED && UNEXPECTED(Z_OBJ_P(container) == NULL)) { zend_throw_error(NULL, "Using $this when not in object context"); FREE_OP2(); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if (OP1_TYPE == IS_CONST || OP1_TYPE == IS_TMP_VAR) { zend_throw_error(NULL, "Cannot use temporary expression in write context"); FREE_OP2(); FREE_OP1_VAR_PTR(); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if (OP1_TYPE == IS_VAR && UNEXPECTED(container == NULL)) { zend_throw_error(NULL, "Cannot use string offset as an object"); FREE_OP2(); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } zend_fetch_property_address(EX_VAR(opline->result.var), container, OP1_TYPE, property, OP2_TYPE, ((OP2_TYPE == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); @@ -2114,7 +2165,12 @@ ZEND_VM_HANDLER(94, ZEND_FETCH_OBJ_FUNC_ARG, CONST|TMP|VAR|UNUSED|CV, CONST|TMPV EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var), 0); } FREE_OP1_VAR_PTR(); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } else { ZEND_VM_DISPATCH_TO_HANDLER(ZEND_FETCH_OBJ_R); } @@ -3077,15 +3133,18 @@ ZEND_VM_HANDLER(112, ZEND_INIT_METHOD_CALL, CONST|TMPVAR|UNUSED|CV, CONST|TMPVAR GC_REFCOUNT(obj)++; /* For $this pointer */ } + FREE_OP2(); + FREE_OP1(); + if (UNEXPECTED(EG(exception) != NULL)) { + HANDLE_EXCEPTION(); + } + call = zend_vm_stack_push_call_frame(call_info, fbc, opline->extended_value, called_scope, obj); call->prev_execute_data = EX(call); EX(call) = call; - FREE_OP2(); - FREE_OP1(); - - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } ZEND_VM_HANDLER(113, ZEND_INIT_STATIC_METHOD_CALL, UNUSED|CONST|VAR, CONST|TMPVAR|UNUSED|CV, NUM) @@ -3225,7 +3284,7 @@ ZEND_VM_HANDLER(113, ZEND_INIT_STATIC_METHOD_CALL, UNUSED|CONST|VAR, CONST|TMPVA call->prev_execute_data = EX(call); EX(call) = call; - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } ZEND_VM_HANDLER(59, ZEND_INIT_FCALL_BY_NAME, ANY, CONST, NUM) @@ -3288,7 +3347,8 @@ 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); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + FREE_OP2(); + HANDLE_EXCEPTION(); } mname = zend_string_init(Z_STRVAL_P(function_name) + (cname_length + sizeof("::") - 1), mname_length, 0); @@ -3460,12 +3520,17 @@ ZEND_VM_C_LABEL(try_function_name): FREE_OP2(); HANDLE_EXCEPTION(); } + + if (UNEXPECTED(EG(exception) != NULL)) { + HANDLE_EXCEPTION(); + } + call = zend_vm_stack_push_call_frame(call_info, fbc, opline->extended_value, called_scope, object); call->prev_execute_data = EX(call); EX(call) = call; - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } ZEND_VM_HANDLER(118, ZEND_INIT_USER_CALL, CONST, CONST|TMPVAR|CV, NUM) @@ -3485,6 +3550,19 @@ ZEND_VM_HANDLER(118, ZEND_INIT_USER_CALL, CONST, CONST|TMPVAR|CV, NUM) 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)) { @@ -3500,22 +3578,17 @@ 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; - called_scope = NULL; - object = NULL; + if (EG(exception)) { + FREE_OP2(); + HANDLE_EXCEPTION(); + } else { + func = (zend_function *) &zend_pass_function; + called_scope = NULL; + object = NULL; + } } call = zend_vm_stack_push_call_frame(call_info, @@ -3524,7 +3597,10 @@ ZEND_VM_HANDLER(118, ZEND_INIT_USER_CALL, CONST, CONST|TMPVAR|CV, NUM) EX(call) = call; FREE_OP2(); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception) != NULL)) { + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } ZEND_VM_HANDLER(69, ZEND_INIT_NS_FCALL_BY_NAME, ANY, CONST, NUM) @@ -3669,9 +3745,9 @@ ZEND_VM_HANDLER(131, ZEND_DO_FCALL_BY_NAME, ANY, ANY) zval *ret; SAVE_OPLINE(); - EX(call) = call->prev_execute_data; 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))) { @@ -3707,12 +3783,14 @@ ZEND_VM_HANDLER(131, ZEND_DO_FCALL_BY_NAME, ANY, ANY) fbc->common.scope ? "::" : "", ZSTR_VAL(fbc->common.function_name)); if (UNEXPECTED(EG(exception) != NULL)) { + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } } 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; @@ -3773,10 +3851,10 @@ ZEND_VM_HANDLER(60, ZEND_DO_FCALL, ANY, ANY) zval *ret; SAVE_OPLINE(); - EX(call) = call->prev_execute_data; 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)); + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if (UNEXPECTED((fbc->common.fn_flags & ZEND_ACC_DEPRECATED) != 0)) { @@ -3785,10 +3863,12 @@ ZEND_VM_HANDLER(60, ZEND_DO_FCALL, ANY, ANY) fbc->common.scope ? "::" : "", ZSTR_VAL(fbc->common.function_name)); if (UNEXPECTED(EG(exception) != NULL)) { + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } } } + EX(call) = NULL; LOAD_OPLINE(); @@ -4296,6 +4376,8 @@ ZEND_VM_C_LABEL(send_val_by_ref): FREE_UNFETCHED_OP1(); arg = ZEND_CALL_VAR(EX(call), opline->result.var); ZVAL_UNDEF(arg); + ZEND_CALL_NUM_ARGS(EX(call)) = arg_num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } value = GET_OP1_ZVAL_PTR(BP_VAR_R); @@ -4319,9 +4401,15 @@ ZEND_VM_HANDLER(117, ZEND_SEND_VAR, VAR|CV, NUM) if (OP1_TYPE == IS_CV && UNEXPECTED(Z_TYPE_INFO_P(varptr) == IS_UNDEF)) { SAVE_OPLINE(); GET_OP1_UNDEF_CV(varptr, BP_VAR_R); + if (UNEXPECTED(EG(exception) != NULL)) { + ZEND_CALL_NUM_ARGS(EX(call)) = opline->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + arg = ZEND_CALL_VAR(EX(call), opline->result.var); ZVAL_NULL(arg); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } arg = ZEND_CALL_VAR(EX(call), opline->result.var); @@ -4373,9 +4461,15 @@ ZEND_VM_HANDLER(106, ZEND_SEND_VAR_NO_REF, VAR, NUM) !ARG_MAY_BE_SENT_BY_REF(EX(call)->func, opline->op2.num)) { SAVE_OPLINE(); zend_error(E_NOTICE, "Only variables should be passed by reference"); + if (UNEXPECTED(EG(exception) != NULL)) { + ZEND_CALL_NUM_ARGS(EX(call)) = opline->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + arg = ZEND_CALL_VAR(EX(call), opline->result.var); ZVAL_COPY_VALUE(arg, varptr); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } } @@ -4396,8 +4490,8 @@ ZEND_VM_HANDLER(67, ZEND_SEND_REF, VAR|CV, NUM) if (OP1_TYPE == IS_VAR && UNEXPECTED(varptr == NULL)) { zend_throw_error(NULL, "Only variables can be passed by reference"); - arg = ZEND_CALL_VAR(EX(call), opline->result.var); - ZVAL_UNDEF(arg); + ZEND_CALL_NUM_ARGS(EX(call)) = opline->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } @@ -4417,6 +4511,11 @@ ZEND_VM_HANDLER(67, ZEND_SEND_REF, VAR|CV, NUM) } FREE_OP1_VAR_PTR(); + if (OP1_TYPE == IS_VAR && UNEXPECTED(EG(exception) != NULL)) { + ZEND_CALL_NUM_ARGS(EX(call)) = opline->op2.num; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } ZEND_VM_NEXT_OPCODE(); } @@ -4440,9 +4539,15 @@ ZEND_VM_C_LABEL(send_var_by_ref): if (OP1_TYPE == IS_CV && UNEXPECTED(Z_TYPE_INFO_P(varptr) == IS_UNDEF)) { SAVE_OPLINE(); GET_OP1_UNDEF_CV(varptr, BP_VAR_R); + if (UNEXPECTED(EG(exception) != NULL)) { + ZEND_CALL_NUM_ARGS(EX(call)) = arg_num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + arg = ZEND_CALL_VAR(EX(call), opline->result.var); ZVAL_NULL(arg); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } arg = ZEND_CALL_VAR(EX(call), opline->result.var); @@ -4509,6 +4614,7 @@ ZEND_VM_C_LABEL(send_again): if (name) { zend_throw_error(NULL, "Cannot unpack array with string keys"); FREE_OP1(); + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } @@ -4547,6 +4653,7 @@ ZEND_VM_C_LABEL(send_again): NULL, 0, "Object of type %s did not create an Iterator", ZSTR_VAL(ce->name) ); } + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } @@ -4627,7 +4734,11 @@ ZEND_VM_C_LABEL(unpack_iter_dtor): } FREE_OP1(); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception) != NULL)) { + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } ZEND_VM_HANDLER(119, ZEND_SEND_ARRAY, ANY, ANY) @@ -4728,7 +4839,11 @@ ZEND_VM_C_LABEL(send_array): } ZEND_HASH_FOREACH_END(); } FREE_OP1(); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception) != NULL)) { + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } ZEND_VM_HANDLER(120, ZEND_SEND_USER, VAR|CV, NUM) @@ -4764,7 +4879,12 @@ ZEND_VM_HANDLER(120, ZEND_SEND_USER, VAR|CV, NUM) Z_OBJ(EX(call)->This) = NULL; FREE_OP1(); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception) != NULL)) { + ZEND_CALL_NUM_ARGS(EX(call)) = opline->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } ZVAL_NEW_REF(arg, arg); @@ -4783,7 +4903,12 @@ ZEND_VM_HANDLER(120, ZEND_SEND_USER, VAR|CV, NUM) ZVAL_COPY_VALUE(param, arg); FREE_OP1(); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception) != NULL)) { + ZEND_CALL_NUM_ARGS(EX(call)) = opline->op2.num; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } ZEND_VM_HANDLER(63, ZEND_RECV, NUM, ANY) @@ -5014,6 +5139,11 @@ ZEND_VM_HANDLER(68, ZEND_NEW, UNUSED|CONST|VAR, JMP_ADDR, NUM) } else { OBJ_RELEASE(Z_OBJ(object_zval)); } + if (UNEXPECTED(OP_JMP_ADDR(opline, opline->op2) != opline + 2)) { + /* free all these temps which are used between now and the DO_FCALL */ + zend_op *start_op = EX(func)->op_array.opcodes; + zend_cleanup_live_vars(execute_data, opline - start_op, OP_JMP_ADDR(opline, opline->op2) - start_op); + } ZEND_VM_JMP(OP_JMP_ADDR(opline, opline->op2)); } else { /* We are not handling overloaded classes right now */ @@ -7295,12 +7425,10 @@ ZEND_VM_HANDLER(149, ZEND_HANDLE_EXCEPTION, ANY, ANY) } } - 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); - cleanup_live_vars(execute_data, op_num, finally_op_num); + zend_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)); } @@ -7310,7 +7438,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 { - cleanup_live_vars(execute_data, op_num, catch_op_num); + zend_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); @@ -7732,7 +7860,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; - cleanup_live_vars(execute_data, opline - EX(func)->op_array.opcodes, finally_op); + zend_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 { @@ -7741,11 +7869,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; - cleanup_live_vars(execute_data, opline - EX(func)->op_array.opcodes, catch_op); + zend_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 { - cleanup_live_vars(execute_data, opline - EX(func)->op_array.opcodes, 0); + zend_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 975143a..002ed53 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -645,9 +645,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_DO_FCALL_BY_NAME_SPEC_HANDLER( zval *ret; SAVE_OPLINE(); - EX(call) = call->prev_execute_data; 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))) { @@ -683,12 +683,14 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_DO_FCALL_BY_NAME_SPEC_HANDLER( fbc->common.scope ? "::" : "", ZSTR_VAL(fbc->common.function_name)); if (UNEXPECTED(EG(exception) != NULL)) { + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } } 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,10 +751,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_DO_FCALL_SPEC_HANDLER(ZEND_OPC zval *ret; SAVE_OPLINE(); - EX(call) = call->prev_execute_data; 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)); + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if (UNEXPECTED((fbc->common.fn_flags & ZEND_ACC_DEPRECATED) != 0)) { @@ -761,10 +763,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_DO_FCALL_SPEC_HANDLER(ZEND_OPC fbc->common.scope ? "::" : "", ZSTR_VAL(fbc->common.function_name)); if (UNEXPECTED(EG(exception) != NULL)) { + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } } } + EX(call) = NULL; LOAD_OPLINE(); @@ -975,6 +979,7 @@ send_again: if (name) { zend_throw_error(NULL, "Cannot unpack array with string keys"); FREE_OP(free_op1); + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } @@ -1013,6 +1018,7 @@ send_again: NULL, 0, "Object of type %s did not create an Iterator", ZSTR_VAL(ce->name) ); } + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } @@ -1093,7 +1099,11 @@ unpack_iter_dtor: } FREE_OP(free_op1); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception) != NULL)) { + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SEND_ARRAY_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -1194,7 +1204,11 @@ send_array: } ZEND_HASH_FOREACH_END(); } FREE_OP(free_op1); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception) != NULL)) { + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_RECV_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -1514,12 +1528,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_HANDLE_EXCEPTION_SPEC_HANDLER( } } - 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); - cleanup_live_vars(execute_data, op_num, finally_op_num); + zend_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)); } @@ -1529,7 +1541,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 { - cleanup_live_vars(execute_data, op_num, catch_op_num); + zend_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); @@ -1643,7 +1655,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; - cleanup_live_vars(execute_data, opline - EX(func)->op_array.opcodes, finally_op); + zend_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 { @@ -1652,11 +1664,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; - cleanup_live_vars(execute_data, opline - EX(func)->op_array.opcodes, catch_op); + zend_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 { - cleanup_live_vars(execute_data, opline - EX(func)->op_array.opcodes, 0); + zend_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); @@ -1961,7 +1973,8 @@ 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); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + + HANDLE_EXCEPTION(); } mname = zend_string_init(Z_STRVAL_P(function_name) + (cname_length + sizeof("::") - 1), mname_length, 0); @@ -2133,12 +2146,17 @@ try_function_name: HANDLE_EXCEPTION(); } + + if (UNEXPECTED(EG(exception) != NULL)) { + HANDLE_EXCEPTION(); + } + call = zend_vm_stack_push_call_frame(call_info, fbc, opline->extended_value, called_scope, object); call->prev_execute_data = EX(call); EX(call) = call; - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_NS_FCALL_BY_NAME_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -2384,7 +2402,8 @@ 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); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + + HANDLE_EXCEPTION(); } mname = zend_string_init(Z_STRVAL_P(function_name) + (cname_length + sizeof("::") - 1), mname_length, 0); @@ -2556,12 +2575,17 @@ try_function_name: HANDLE_EXCEPTION(); } + + if (UNEXPECTED(EG(exception) != NULL)) { + HANDLE_EXCEPTION(); + } + call = zend_vm_stack_push_call_frame(call_info, fbc, opline->extended_value, called_scope, object); call->prev_execute_data = EX(call); EX(call) = call; - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_CLASS_SPEC_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -2640,7 +2664,8 @@ 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); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + zval_ptr_dtor_nogc(free_op2); + HANDLE_EXCEPTION(); } mname = zend_string_init(Z_STRVAL_P(function_name) + (cname_length + sizeof("::") - 1), mname_length, 0); @@ -2812,12 +2837,17 @@ try_function_name: zval_ptr_dtor_nogc(free_op2); HANDLE_EXCEPTION(); } + + if (UNEXPECTED(EG(exception) != NULL)) { + HANDLE_EXCEPTION(); + } + call = zend_vm_stack_push_call_frame(call_info, fbc, opline->extended_value, called_scope, object); call->prev_execute_data = EX(call); EX(call) = call; - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_BW_NOT_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -3306,6 +3336,8 @@ send_val_by_ref: arg = ZEND_CALL_VAR(EX(call), opline->result.var); ZVAL_UNDEF(arg); + ZEND_CALL_NUM_ARGS(EX(call)) = arg_num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } value = EX_CONSTANT(opline->op1); @@ -3381,6 +3413,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_NEW_SPEC_CONST_HANDLER(ZEND_OP } else { OBJ_RELEASE(Z_OBJ(object_zval)); } + if (UNEXPECTED(OP_JMP_ADDR(opline, opline->op2) != opline + 2)) { + /* free all these temps which are used between now and the DO_FCALL */ + zend_op *start_op = EX(func)->op_array.opcodes; + zend_cleanup_live_vars(execute_data, opline - start_op, OP_JMP_ADDR(opline, opline->op2) - start_op); + } ZEND_VM_JMP(OP_JMP_ADDR(opline, opline->op2)); } else { /* We are not handling overloaded classes right now */ @@ -4971,6 +5008,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ if (UNEXPECTED(CE_STATIC_MEMBERS(ce) == NULL)) { zend_throw_error(NULL, "Access to undeclared static property: %s::$%s", ZSTR_VAL(ce->name), ZSTR_VAL(name)); + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } HANDLE_EXCEPTION(); } @@ -4982,7 +5023,14 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ zend_string_release(name); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } CACHE_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op2)), ce); } @@ -4991,6 +5039,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ ce = zend_fetch_class(NULL, opline->op2.num); if (UNEXPECTED(ce == NULL)) { ZEND_ASSERT(EG(exception)); + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } HANDLE_EXCEPTION(); } } else { @@ -5003,6 +5055,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ if (UNEXPECTED(CE_STATIC_MEMBERS(ce) == NULL)) { zend_throw_error(NULL, "Access to undeclared static property: %s::$%s", ZSTR_VAL(ce->name), ZSTR_VAL(name)); + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } HANDLE_EXCEPTION(); } @@ -5012,6 +5068,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ retval = zend_std_get_static_property(ce, name, 0); if (UNEXPECTED(EG(exception))) { + try_cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if (IS_CONST == IS_CONST && retval) { @@ -5032,7 +5089,11 @@ fetch_static_prop_return: } else { ZVAL_INDIRECT(EX_VAR(opline->result.var), retval); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + try_cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_STATIC_PROP_R_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -5108,16 +5169,20 @@ 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"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); - } + } container = NULL; if (IS_CONST == IS_VAR && UNEXPECTED(container == NULL)) { zend_throw_error(NULL, "Cannot use string offset as an array"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } zend_fetch_dimension_address_W(EX_VAR(opline->result.var), container, EX_CONSTANT(opline->op2), IS_CONST); @@ -5131,6 +5196,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_CONST_ zend_throw_error(NULL, "Cannot use [] for reading"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } container = EX_CONSTANT(opline->op1); @@ -5138,7 +5205,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_CONST_ } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -5155,6 +5227,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_CONST_CONST_H if (IS_CONST == IS_UNUSED && UNEXPECTED(Z_OBJ_P(container) == NULL)) { zend_throw_error(NULL, "Using $this when not in object context"); + try_cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } @@ -5210,7 +5283,11 @@ fetch_obj_r_no_object: } while (0); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + try_cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_IS_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -5302,17 +5379,23 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CONST_ if (IS_CONST == IS_UNUSED && UNEXPECTED(Z_OBJ_P(container) == NULL)) { zend_throw_error(NULL, "Using $this when not in object context"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if (IS_CONST == IS_CONST || IS_CONST == IS_TMP_VAR) { zend_throw_error(NULL, "Cannot use temporary expression in write context"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if (IS_CONST == IS_VAR && UNEXPECTED(container == NULL)) { zend_throw_error(NULL, "Cannot use string offset as an object"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_CONST, property, IS_CONST, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); @@ -5321,7 +5404,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CONST_ EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var), 0); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } else { ZEND_VM_TAIL_CALL(ZEND_FETCH_OBJ_R_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU)); } @@ -5548,13 +5636,17 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_CONST_CO GC_REFCOUNT(obj)++; /* For $this pointer */ } + + if (UNEXPECTED(EG(exception) != NULL)) { + HANDLE_EXCEPTION(); + } + call = zend_vm_stack_push_call_frame(call_info, fbc, opline->extended_value, called_scope, obj); call->prev_execute_data = EX(call); EX(call) = call; - - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -5694,7 +5786,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_C call->prev_execute_data = EX(call); EX(call) = call; - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_USER_CALL_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -5714,6 +5806,19 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_USER_CALL_SPEC_CONST_CONS 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)) { @@ -5729,22 +5834,17 @@ 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; - called_scope = NULL; - object = NULL; + if (EG(exception)) { + + HANDLE_EXCEPTION(); + } else { + func = (zend_function *) &zend_pass_function; + called_scope = NULL; + object = NULL; + } } call = zend_vm_stack_push_call_frame(call_info, @@ -5752,7 +5852,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_USER_CALL_SPEC_CONST_CONS call->prev_execute_data = EX(call); EX(call) = call; - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception) != NULL)) { + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CASE_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -6768,6 +6871,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ if (UNEXPECTED(CE_STATIC_MEMBERS(ce) == NULL)) { zend_throw_error(NULL, "Access to undeclared static property: %s::$%s", ZSTR_VAL(ce->name), ZSTR_VAL(name)); + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } HANDLE_EXCEPTION(); } @@ -6779,7 +6886,14 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ zend_string_release(name); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } CACHE_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op2)), ce); } @@ -6788,6 +6902,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ ce = zend_fetch_class(NULL, opline->op2.num); if (UNEXPECTED(ce == NULL)) { ZEND_ASSERT(EG(exception)); + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } HANDLE_EXCEPTION(); } } else { @@ -6800,6 +6918,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ if (UNEXPECTED(CE_STATIC_MEMBERS(ce) == NULL)) { zend_throw_error(NULL, "Access to undeclared static property: %s::$%s", ZSTR_VAL(ce->name), ZSTR_VAL(name)); + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } HANDLE_EXCEPTION(); } @@ -6809,6 +6931,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ retval = zend_std_get_static_property(ce, name, 0); if (UNEXPECTED(EG(exception))) { + try_cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if (IS_CONST == IS_CONST && retval) { @@ -6829,7 +6952,11 @@ fetch_static_prop_return: } else { ZVAL_INDIRECT(EX_VAR(opline->result.var), retval); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + try_cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_STATIC_PROP_R_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -7213,6 +7340,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_ if (Z_CONSTANT_P(retval)) { if (UNEXPECTED(zval_update_constant_ex(retval, 1, NULL) != SUCCESS)) { + try_cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } } @@ -7233,7 +7361,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_ } else { ZVAL_INDIRECT(EX_VAR(opline->result.var), retval); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + try_cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_R_SPEC_CONST_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -7304,6 +7436,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ if (UNEXPECTED(CE_STATIC_MEMBERS(ce) == NULL)) { zend_throw_error(NULL, "Access to undeclared static property: %s::$%s", ZSTR_VAL(ce->name), ZSTR_VAL(name)); + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } HANDLE_EXCEPTION(); } @@ -7315,7 +7451,14 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ zend_string_release(name); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } CACHE_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op2)), ce); } @@ -7324,6 +7467,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ ce = zend_fetch_class(NULL, opline->op2.num); if (UNEXPECTED(ce == NULL)) { ZEND_ASSERT(EG(exception)); + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } HANDLE_EXCEPTION(); } } else { @@ -7336,6 +7483,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ if (UNEXPECTED(CE_STATIC_MEMBERS(ce) == NULL)) { zend_throw_error(NULL, "Access to undeclared static property: %s::$%s", ZSTR_VAL(ce->name), ZSTR_VAL(name)); + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } HANDLE_EXCEPTION(); } @@ -7345,6 +7496,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ retval = zend_std_get_static_property(ce, name, 0); if (UNEXPECTED(EG(exception))) { + try_cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if (IS_CONST == IS_CONST && retval) { @@ -7365,7 +7517,11 @@ fetch_static_prop_return: } else { ZVAL_INDIRECT(EX_VAR(opline->result.var), retval); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + try_cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_STATIC_PROP_R_SPEC_CONST_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -7413,16 +7569,20 @@ 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"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); - } + } container = NULL; if (IS_CONST == IS_VAR && UNEXPECTED(container == NULL)) { zend_throw_error(NULL, "Cannot use string offset as an array"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } zend_fetch_dimension_address_W(EX_VAR(opline->result.var), container, NULL, IS_UNUSED); @@ -7436,6 +7596,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_CONST_ zend_throw_error(NULL, "Cannot use [] for reading"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } container = EX_CONSTANT(opline->op1); @@ -7443,7 +7605,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_CONST_ } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -7583,7 +7750,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_C call->prev_execute_data = EX(call); EX(call) = call; - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_VERIFY_RETURN_TYPE_SPEC_CONST_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -8853,16 +9020,20 @@ 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"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); - } + } container = NULL; if (IS_CONST == IS_VAR && UNEXPECTED(container == NULL)) { zend_throw_error(NULL, "Cannot use string offset as an array"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } zend_fetch_dimension_address_W(EX_VAR(opline->result.var), container, _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op2.var), IS_CV); @@ -8876,6 +9047,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_CONST_ zend_throw_error(NULL, "Cannot use [] for reading"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } container = EX_CONSTANT(opline->op1); @@ -8883,7 +9056,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_CONST_ } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -8900,6 +9078,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_CONST_CV_HAND if (IS_CONST == IS_UNUSED && UNEXPECTED(Z_OBJ_P(container) == NULL)) { zend_throw_error(NULL, "Using $this when not in object context"); + try_cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } @@ -8955,7 +9134,11 @@ fetch_obj_r_no_object: } while (0); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + try_cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_IS_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -9047,17 +9230,23 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CONST_ if (IS_CONST == IS_UNUSED && UNEXPECTED(Z_OBJ_P(container) == NULL)) { zend_throw_error(NULL, "Using $this when not in object context"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if (IS_CONST == IS_CONST || IS_CONST == IS_TMP_VAR) { zend_throw_error(NULL, "Cannot use temporary expression in write context"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if (IS_CONST == IS_VAR && UNEXPECTED(container == NULL)) { zend_throw_error(NULL, "Cannot use string offset as an object"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_CONST, property, IS_CV, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); @@ -9066,7 +9255,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CONST_ EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var), 0); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } else { ZEND_VM_TAIL_CALL(ZEND_FETCH_OBJ_R_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU)); } @@ -9249,13 +9443,17 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_CONST_CV GC_REFCOUNT(obj)++; /* For $this pointer */ } + + if (UNEXPECTED(EG(exception) != NULL)) { + HANDLE_EXCEPTION(); + } + call = zend_vm_stack_push_call_frame(call_info, fbc, opline->extended_value, called_scope, obj); call->prev_execute_data = EX(call); EX(call) = call; - - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -9395,7 +9593,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_C call->prev_execute_data = EX(call); EX(call) = call; - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_USER_CALL_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -9415,6 +9613,19 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_USER_CALL_SPEC_CONST_CV_H 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)) { @@ -9430,22 +9641,17 @@ 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; - called_scope = NULL; - object = NULL; + if (EG(exception)) { + + HANDLE_EXCEPTION(); + } else { + func = (zend_function *) &zend_pass_function; + called_scope = NULL; + object = NULL; + } } call = zend_vm_stack_push_call_frame(call_info, @@ -9453,7 +9659,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_USER_CALL_SPEC_CONST_CV_H call->prev_execute_data = EX(call); EX(call) = call; - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception) != NULL)) { + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CATCH_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -10664,16 +10873,20 @@ 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)); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); - } + } container = NULL; if (IS_CONST == IS_VAR && UNEXPECTED(container == NULL)) { zend_throw_error(NULL, "Cannot use string offset as an array"); zval_ptr_dtor_nogc(EX_VAR(opline->op2.var)); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } zend_fetch_dimension_address_W(EX_VAR(opline->result.var), container, _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2), (IS_TMP_VAR|IS_VAR)); @@ -10687,6 +10900,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_CONST_ zend_throw_error(NULL, "Cannot use [] for reading"); zval_ptr_dtor_nogc(EX_VAR(opline->op2.var)); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } container = EX_CONSTANT(opline->op1); @@ -10694,7 +10909,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_CONST_ zval_ptr_dtor_nogc(free_op2); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_CONST_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -10711,6 +10931,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_CONST_TMPVAR_ if (IS_CONST == IS_UNUSED && UNEXPECTED(Z_OBJ_P(container) == NULL)) { zend_throw_error(NULL, "Using $this when not in object context"); zval_ptr_dtor_nogc(EX_VAR(opline->op2.var)); + try_cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } @@ -10767,7 +10988,11 @@ fetch_obj_r_no_object: zval_ptr_dtor_nogc(free_op2); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + try_cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_IS_SPEC_CONST_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -10860,17 +11085,23 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CONST_ if (IS_CONST == IS_UNUSED && UNEXPECTED(Z_OBJ_P(container) == NULL)) { zend_throw_error(NULL, "Using $this when not in object context"); zval_ptr_dtor_nogc(free_op2); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } 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(free_op2); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if (IS_CONST == IS_VAR && UNEXPECTED(container == NULL)) { zend_throw_error(NULL, "Cannot use string offset as an object"); zval_ptr_dtor_nogc(free_op2); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_CONST, property, (IS_TMP_VAR|IS_VAR), (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); @@ -10879,7 +11110,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CONST_ EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var), 0); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } else { ZEND_VM_TAIL_CALL(ZEND_FETCH_OBJ_R_SPEC_CONST_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU)); } @@ -11062,14 +11298,18 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_CONST_TM GC_REFCOUNT(obj)++; /* For $this pointer */ } + zval_ptr_dtor_nogc(free_op2); + + if (UNEXPECTED(EG(exception) != NULL)) { + HANDLE_EXCEPTION(); + } + call = zend_vm_stack_push_call_frame(call_info, fbc, opline->extended_value, called_scope, obj); call->prev_execute_data = EX(call); EX(call) = call; - zval_ptr_dtor_nogc(free_op2); - - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -11209,7 +11449,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_C call->prev_execute_data = EX(call); EX(call) = call; - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_USER_CALL_SPEC_CONST_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -11229,6 +11469,19 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_USER_CALL_SPEC_CONST_TMPV 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)) { @@ -11244,22 +11497,17 @@ 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; - called_scope = NULL; - object = NULL; + if (EG(exception)) { + zval_ptr_dtor_nogc(free_op2); + HANDLE_EXCEPTION(); + } else { + func = (zend_function *) &zend_pass_function; + called_scope = NULL; + object = NULL; + } } call = zend_vm_stack_push_call_frame(call_info, @@ -11268,7 +11516,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_USER_CALL_SPEC_CONST_TMPV EX(call) = call; zval_ptr_dtor_nogc(free_op2); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception) != NULL)) { + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CASE_SPEC_CONST_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -11882,6 +12133,8 @@ send_val_by_ref: zval_ptr_dtor_nogc(EX_VAR(opline->op1.var)); arg = ZEND_CALL_VAR(EX(call), opline->result.var); ZVAL_UNDEF(arg); + ZEND_CALL_NUM_ARGS(EX(call)) = arg_num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } value = _get_zval_ptr_tmp(opline->op1.var, execute_data, &free_op1); @@ -12553,16 +12806,20 @@ 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)); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); - } + } container = NULL; if (IS_TMP_VAR == IS_VAR && UNEXPECTED(container == NULL)) { zend_throw_error(NULL, "Cannot use string offset as an array"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } zend_fetch_dimension_address_W(EX_VAR(opline->result.var), container, EX_CONSTANT(opline->op2), IS_CONST); @@ -12576,6 +12833,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_TMP_CO zend_throw_error(NULL, "Cannot use [] for reading"); zval_ptr_dtor_nogc(EX_VAR(opline->op1.var)); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } container = _get_zval_ptr_tmp(opline->op1.var, execute_data, &free_op1); @@ -12583,7 +12842,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_TMP_CO zval_ptr_dtor_nogc(free_op1); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -12600,6 +12864,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_TMP_CONST_HAN if (IS_TMP_VAR == IS_UNUSED && UNEXPECTED(Z_OBJ_P(container) == NULL)) { zend_throw_error(NULL, "Using $this when not in object context"); + try_cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } @@ -12655,7 +12920,11 @@ fetch_obj_r_no_object: } while (0); zval_ptr_dtor_nogc(free_op1); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + try_cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -12675,17 +12944,23 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_TMP_CO if (IS_TMP_VAR == IS_UNUSED && UNEXPECTED(Z_OBJ_P(container) == NULL)) { zend_throw_error(NULL, "Using $this when not in object context"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if (IS_TMP_VAR == IS_CONST || IS_TMP_VAR == IS_TMP_VAR) { zend_throw_error(NULL, "Cannot use temporary expression in write context"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if (IS_TMP_VAR == IS_VAR && UNEXPECTED(container == NULL)) { zend_throw_error(NULL, "Cannot use string offset as an object"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_TMP_VAR, property, IS_CONST, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); @@ -12694,7 +12969,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_TMP_CO EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var), 0); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } else { ZEND_VM_TAIL_CALL(ZEND_FETCH_OBJ_R_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU)); } @@ -13420,16 +13700,20 @@ 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)); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); - } + } container = NULL; if (IS_TMP_VAR == IS_VAR && UNEXPECTED(container == NULL)) { zend_throw_error(NULL, "Cannot use string offset as an array"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } zend_fetch_dimension_address_W(EX_VAR(opline->result.var), container, NULL, IS_UNUSED); @@ -13443,6 +13727,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_TMP_UN zend_throw_error(NULL, "Cannot use [] for reading"); zval_ptr_dtor_nogc(EX_VAR(opline->op1.var)); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } container = _get_zval_ptr_tmp(opline->op1.var, execute_data, &free_op1); @@ -13450,7 +13736,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_TMP_UN zval_ptr_dtor_nogc(free_op1); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_VERIFY_RETURN_TYPE_SPEC_TMP_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -13824,16 +14115,20 @@ 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)); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); - } + } container = NULL; if (IS_TMP_VAR == IS_VAR && UNEXPECTED(container == NULL)) { zend_throw_error(NULL, "Cannot use string offset as an array"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } zend_fetch_dimension_address_W(EX_VAR(opline->result.var), container, _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op2.var), IS_CV); @@ -13847,6 +14142,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_TMP_CV zend_throw_error(NULL, "Cannot use [] for reading"); zval_ptr_dtor_nogc(EX_VAR(opline->op1.var)); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } container = _get_zval_ptr_tmp(opline->op1.var, execute_data, &free_op1); @@ -13854,7 +14151,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_TMP_CV zval_ptr_dtor_nogc(free_op1); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -13871,6 +14173,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_TMP_CV_HANDLE if (IS_TMP_VAR == IS_UNUSED && UNEXPECTED(Z_OBJ_P(container) == NULL)) { zend_throw_error(NULL, "Using $this when not in object context"); + try_cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } @@ -13926,7 +14229,11 @@ fetch_obj_r_no_object: } while (0); zval_ptr_dtor_nogc(free_op1); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + try_cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -13946,17 +14253,23 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_TMP_CV if (IS_TMP_VAR == IS_UNUSED && UNEXPECTED(Z_OBJ_P(container) == NULL)) { zend_throw_error(NULL, "Using $this when not in object context"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if (IS_TMP_VAR == IS_CONST || IS_TMP_VAR == IS_TMP_VAR) { zend_throw_error(NULL, "Cannot use temporary expression in write context"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if (IS_TMP_VAR == IS_VAR && UNEXPECTED(container == NULL)) { zend_throw_error(NULL, "Cannot use string offset as an object"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_TMP_VAR, property, IS_CV, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); @@ -13965,7 +14278,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_TMP_CV EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var), 0); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } else { ZEND_VM_TAIL_CALL(ZEND_FETCH_OBJ_R_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU)); } @@ -14337,16 +14655,20 @@ 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)); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); - } + } container = NULL; if (IS_TMP_VAR == IS_VAR && UNEXPECTED(container == NULL)) { zend_throw_error(NULL, "Cannot use string offset as an array"); zval_ptr_dtor_nogc(EX_VAR(opline->op2.var)); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } zend_fetch_dimension_address_W(EX_VAR(opline->result.var), container, _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2), (IS_TMP_VAR|IS_VAR)); @@ -14360,6 +14682,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_TMP_TM zend_throw_error(NULL, "Cannot use [] for reading"); zval_ptr_dtor_nogc(EX_VAR(opline->op2.var)); zval_ptr_dtor_nogc(EX_VAR(opline->op1.var)); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } container = _get_zval_ptr_tmp(opline->op1.var, execute_data, &free_op1); @@ -14367,7 +14691,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_TMP_TM zval_ptr_dtor_nogc(free_op2); zval_ptr_dtor_nogc(free_op1); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_TMP_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -14384,6 +14713,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_TMP_TMPVAR_HA if (IS_TMP_VAR == IS_UNUSED && UNEXPECTED(Z_OBJ_P(container) == NULL)) { zend_throw_error(NULL, "Using $this when not in object context"); zval_ptr_dtor_nogc(EX_VAR(opline->op2.var)); + try_cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } @@ -14440,7 +14770,11 @@ fetch_obj_r_no_object: zval_ptr_dtor_nogc(free_op2); zval_ptr_dtor_nogc(free_op1); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + try_cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_TMP_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -14460,17 +14794,23 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_TMP_TM if (IS_TMP_VAR == IS_UNUSED && UNEXPECTED(Z_OBJ_P(container) == NULL)) { zend_throw_error(NULL, "Using $this when not in object context"); zval_ptr_dtor_nogc(free_op2); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } 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(free_op2); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if (IS_TMP_VAR == IS_VAR && UNEXPECTED(container == NULL)) { zend_throw_error(NULL, "Cannot use string offset as an object"); zval_ptr_dtor_nogc(free_op2); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_TMP_VAR, property, (IS_TMP_VAR|IS_VAR), (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); @@ -14479,7 +14819,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_TMP_TM EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var), 0); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } else { ZEND_VM_TAIL_CALL(ZEND_FETCH_OBJ_R_SPEC_TMP_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU)); } @@ -15078,9 +15423,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SEND_VAR_SPEC_VAR_HANDLER(ZEND if (IS_VAR == IS_CV && UNEXPECTED(Z_TYPE_INFO_P(varptr) == IS_UNDEF)) { SAVE_OPLINE(); GET_OP1_UNDEF_CV(varptr, BP_VAR_R); + if (UNEXPECTED(EG(exception) != NULL)) { + ZEND_CALL_NUM_ARGS(EX(call)) = opline->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + arg = ZEND_CALL_VAR(EX(call), opline->result.var); ZVAL_NULL(arg); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } arg = ZEND_CALL_VAR(EX(call), opline->result.var); @@ -15132,9 +15483,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SEND_VAR_NO_REF_SPEC_VAR_HANDL !ARG_MAY_BE_SENT_BY_REF(EX(call)->func, opline->op2.num)) { SAVE_OPLINE(); zend_error(E_NOTICE, "Only variables should be passed by reference"); + if (UNEXPECTED(EG(exception) != NULL)) { + ZEND_CALL_NUM_ARGS(EX(call)) = opline->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + arg = ZEND_CALL_VAR(EX(call), opline->result.var); ZVAL_COPY_VALUE(arg, varptr); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } } @@ -15155,8 +15512,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SEND_REF_SPEC_VAR_HANDLER(ZEND if (IS_VAR == IS_VAR && UNEXPECTED(varptr == NULL)) { zend_throw_error(NULL, "Only variables can be passed by reference"); - arg = ZEND_CALL_VAR(EX(call), opline->result.var); - ZVAL_UNDEF(arg); + ZEND_CALL_NUM_ARGS(EX(call)) = opline->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } @@ -15176,6 +15533,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SEND_REF_SPEC_VAR_HANDLER(ZEND } if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; + if (IS_VAR == IS_VAR && UNEXPECTED(EG(exception) != NULL)) { + ZEND_CALL_NUM_ARGS(EX(call)) = opline->op2.num; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } ZEND_VM_NEXT_OPCODE(); } @@ -15199,9 +15561,15 @@ send_var_by_ref: if (IS_VAR == IS_CV && UNEXPECTED(Z_TYPE_INFO_P(varptr) == IS_UNDEF)) { SAVE_OPLINE(); GET_OP1_UNDEF_CV(varptr, BP_VAR_R); + if (UNEXPECTED(EG(exception) != NULL)) { + ZEND_CALL_NUM_ARGS(EX(call)) = arg_num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + arg = ZEND_CALL_VAR(EX(call), opline->result.var); ZVAL_NULL(arg); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } arg = ZEND_CALL_VAR(EX(call), opline->result.var); @@ -15261,7 +15629,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SEND_USER_SPEC_VAR_HANDLER(ZEN Z_OBJ(EX(call)->This) = NULL; zval_ptr_dtor_nogc(free_op1); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception) != NULL)) { + ZEND_CALL_NUM_ARGS(EX(call)) = opline->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } ZVAL_NEW_REF(arg, arg); @@ -15280,7 +15653,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SEND_USER_SPEC_VAR_HANDLER(ZEN ZVAL_COPY_VALUE(param, arg); zval_ptr_dtor_nogc(free_op1); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception) != NULL)) { + ZEND_CALL_NUM_ARGS(EX(call)) = opline->op2.num; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_NEW_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -15320,6 +15698,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_NEW_SPEC_VAR_HANDLER(ZEND_OPCO } else { OBJ_RELEASE(Z_OBJ(object_zval)); } + if (UNEXPECTED(OP_JMP_ADDR(opline, opline->op2) != opline + 2)) { + /* free all these temps which are used between now and the DO_FCALL */ + zend_op *start_op = EX(func)->op_array.opcodes; + zend_cleanup_live_vars(execute_data, opline - start_op, OP_JMP_ADDR(opline, opline->op2) - start_op); + } ZEND_VM_JMP(OP_JMP_ADDR(opline, opline->op2)); } else { /* We are not handling overloaded classes right now */ @@ -16977,16 +17360,20 @@ 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)); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); 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"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } zend_fetch_dimension_address_W(EX_VAR(opline->result.var), container, EX_CONSTANT(opline->op2), IS_CONST); @@ -17000,6 +17387,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_VAR_CO zend_throw_error(NULL, "Cannot use [] for reading"); zval_ptr_dtor_nogc(EX_VAR(opline->op1.var)); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } container = _get_zval_ptr_var(opline->op1.var, execute_data, &free_op1); @@ -17007,7 +17396,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_VAR_CO zval_ptr_dtor_nogc(free_op1); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_UNSET_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -17047,6 +17441,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_VAR_CONST_HAN if (IS_VAR == IS_UNUSED && UNEXPECTED(Z_OBJ_P(container) == NULL)) { zend_throw_error(NULL, "Using $this when not in object context"); + try_cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } @@ -17102,7 +17497,11 @@ fetch_obj_r_no_object: } while (0); zval_ptr_dtor_nogc(free_op1); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + try_cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_W_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -17183,17 +17582,23 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_VAR_CO if (IS_VAR == IS_UNUSED && UNEXPECTED(Z_OBJ_P(container) == NULL)) { zend_throw_error(NULL, "Using $this when not in object context"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if (IS_VAR == IS_CONST || IS_VAR == IS_TMP_VAR) { zend_throw_error(NULL, "Cannot use temporary expression in write context"); if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if (IS_VAR == IS_VAR && UNEXPECTED(container == NULL)) { zend_throw_error(NULL, "Cannot use string offset as an object"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_VAR, property, IS_CONST, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); @@ -17202,7 +17607,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_VAR_CO EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var), 0); } if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } else { ZEND_VM_TAIL_CALL(ZEND_FETCH_OBJ_R_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU)); } @@ -17540,7 +17950,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_V call->prev_execute_data = EX(call); EX(call) = call; - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_CLASS_CONSTANT_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -18870,16 +19280,20 @@ 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)); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); 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"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } zend_fetch_dimension_address_W(EX_VAR(opline->result.var), container, NULL, IS_UNUSED); @@ -18893,6 +19307,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_VAR_UN zend_throw_error(NULL, "Cannot use [] for reading"); zval_ptr_dtor_nogc(EX_VAR(opline->op1.var)); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } container = _get_zval_ptr_var(opline->op1.var, execute_data, &free_op1); @@ -18900,7 +19316,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_VAR_UN zval_ptr_dtor_nogc(free_op1); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_DIM_SPEC_VAR_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -19146,7 +19567,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_V call->prev_execute_data = EX(call); EX(call) = call; - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_VERIFY_RETURN_TYPE_SPEC_VAR_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -20149,16 +20570,20 @@ 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)); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); 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"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } zend_fetch_dimension_address_W(EX_VAR(opline->result.var), container, _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op2.var), IS_CV); @@ -20172,6 +20597,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_VAR_CV zend_throw_error(NULL, "Cannot use [] for reading"); zval_ptr_dtor_nogc(EX_VAR(opline->op1.var)); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } container = _get_zval_ptr_var(opline->op1.var, execute_data, &free_op1); @@ -20179,7 +20606,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_VAR_CV zval_ptr_dtor_nogc(free_op1); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_UNSET_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -20219,6 +20651,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_VAR_CV_HANDLE if (IS_VAR == IS_UNUSED && UNEXPECTED(Z_OBJ_P(container) == NULL)) { zend_throw_error(NULL, "Using $this when not in object context"); + try_cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } @@ -20274,7 +20707,11 @@ fetch_obj_r_no_object: } while (0); zval_ptr_dtor_nogc(free_op1); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + try_cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_W_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -20355,17 +20792,23 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_VAR_CV if (IS_VAR == IS_UNUSED && UNEXPECTED(Z_OBJ_P(container) == NULL)) { zend_throw_error(NULL, "Using $this when not in object context"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if (IS_VAR == IS_CONST || IS_VAR == IS_TMP_VAR) { zend_throw_error(NULL, "Cannot use temporary expression in write context"); if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if (IS_VAR == IS_VAR && UNEXPECTED(container == NULL)) { zend_throw_error(NULL, "Cannot use string offset as an object"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_VAR, property, IS_CV, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); @@ -20374,7 +20817,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_VAR_CV EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var), 0); } if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } else { ZEND_VM_TAIL_CALL(ZEND_FETCH_OBJ_R_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU)); } @@ -20771,7 +21219,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_V call->prev_execute_data = EX(call); EX(call) = call; - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ADD_ARRAY_ELEMENT_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -21811,16 +22259,20 @@ 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)); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); 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"); zval_ptr_dtor_nogc(EX_VAR(opline->op2.var)); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } zend_fetch_dimension_address_W(EX_VAR(opline->result.var), container, _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2), (IS_TMP_VAR|IS_VAR)); @@ -21834,6 +22286,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_VAR_TM zend_throw_error(NULL, "Cannot use [] for reading"); zval_ptr_dtor_nogc(EX_VAR(opline->op2.var)); zval_ptr_dtor_nogc(EX_VAR(opline->op1.var)); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } container = _get_zval_ptr_var(opline->op1.var, execute_data, &free_op1); @@ -21841,7 +22295,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_VAR_TM zval_ptr_dtor_nogc(free_op2); zval_ptr_dtor_nogc(free_op1); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_UNSET_SPEC_VAR_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -21881,6 +22340,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_VAR_TMPVAR_HA if (IS_VAR == IS_UNUSED && UNEXPECTED(Z_OBJ_P(container) == NULL)) { zend_throw_error(NULL, "Using $this when not in object context"); zval_ptr_dtor_nogc(EX_VAR(opline->op2.var)); + try_cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } @@ -21937,7 +22397,11 @@ fetch_obj_r_no_object: zval_ptr_dtor_nogc(free_op2); zval_ptr_dtor_nogc(free_op1); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + try_cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_W_SPEC_VAR_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -22018,17 +22482,23 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_VAR_TM if (IS_VAR == IS_UNUSED && UNEXPECTED(Z_OBJ_P(container) == NULL)) { zend_throw_error(NULL, "Using $this when not in object context"); zval_ptr_dtor_nogc(free_op2); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } 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(free_op2); if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if (IS_VAR == IS_VAR && UNEXPECTED(container == NULL)) { zend_throw_error(NULL, "Cannot use string offset as an object"); zval_ptr_dtor_nogc(free_op2); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_VAR, property, (IS_TMP_VAR|IS_VAR), (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); @@ -22037,7 +22507,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_VAR_TM EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var), 0); } if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}; - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } else { ZEND_VM_TAIL_CALL(ZEND_FETCH_OBJ_R_SPEC_VAR_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU)); } @@ -22347,7 +22822,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_V call->prev_execute_data = EX(call); EX(call) = call; - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ADD_ARRAY_ELEMENT_SPEC_VAR_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -22660,6 +23135,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_NEW_SPEC_UNUSED_HANDLER(ZEND_O } else { OBJ_RELEASE(Z_OBJ(object_zval)); } + if (UNEXPECTED(OP_JMP_ADDR(opline, opline->op2) != opline + 2)) { + /* free all these temps which are used between now and the DO_FCALL */ + zend_op *start_op = EX(func)->op_array.opcodes; + zend_cleanup_live_vars(execute_data, opline - start_op, OP_JMP_ADDR(opline, opline->op2) - start_op); + } ZEND_VM_JMP(OP_JMP_ADDR(opline, opline->op2)); } else { /* We are not handling overloaded classes right now */ @@ -23336,6 +23816,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_UNUSED_CONST_ if (IS_UNUSED == IS_UNUSED && UNEXPECTED(Z_OBJ_P(container) == NULL)) { zend_throw_error(NULL, "Using $this when not in object context"); + try_cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } @@ -23391,7 +23872,11 @@ fetch_obj_r_no_object: } while (0); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + try_cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_W_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -23544,17 +24029,23 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_UNUSED if (IS_UNUSED == IS_UNUSED && UNEXPECTED(Z_OBJ_P(container) == NULL)) { zend_throw_error(NULL, "Using $this when not in object context"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if (IS_UNUSED == IS_CONST || IS_UNUSED == IS_TMP_VAR) { zend_throw_error(NULL, "Cannot use temporary expression in write context"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if (IS_UNUSED == IS_VAR && UNEXPECTED(container == NULL)) { zend_throw_error(NULL, "Cannot use string offset as an object"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_UNUSED, property, IS_CONST, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); @@ -23563,7 +24054,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_UNUSED EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var), 0); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } else { ZEND_VM_TAIL_CALL(ZEND_FETCH_OBJ_R_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU)); } @@ -23773,13 +24269,17 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_UNUSED_C GC_REFCOUNT(obj)++; /* For $this pointer */ } + + if (UNEXPECTED(EG(exception) != NULL)) { + HANDLE_EXCEPTION(); + } + call = zend_vm_stack_push_call_frame(call_info, fbc, opline->extended_value, called_scope, obj); call->prev_execute_data = EX(call); EX(call) = call; - - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -23919,7 +24419,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_U call->prev_execute_data = EX(call); EX(call) = call; - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_CONSTANT_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -25270,7 +25770,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_U call->prev_execute_data = EX(call); EX(call) = call; - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_VERIFY_RETURN_TYPE_SPEC_UNUSED_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -26045,6 +26545,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_UNUSED_CV_HAN if (IS_UNUSED == IS_UNUSED && UNEXPECTED(Z_OBJ_P(container) == NULL)) { zend_throw_error(NULL, "Using $this when not in object context"); + try_cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } @@ -26100,7 +26601,11 @@ fetch_obj_r_no_object: } while (0); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + try_cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_W_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -26253,17 +26758,23 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_UNUSED if (IS_UNUSED == IS_UNUSED && UNEXPECTED(Z_OBJ_P(container) == NULL)) { zend_throw_error(NULL, "Using $this when not in object context"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if (IS_UNUSED == IS_CONST || IS_UNUSED == IS_TMP_VAR) { zend_throw_error(NULL, "Cannot use temporary expression in write context"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if (IS_UNUSED == IS_VAR && UNEXPECTED(container == NULL)) { zend_throw_error(NULL, "Cannot use string offset as an object"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_UNUSED, property, IS_CV, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); @@ -26272,7 +26783,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_UNUSED EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var), 0); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } else { ZEND_VM_TAIL_CALL(ZEND_FETCH_OBJ_R_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU)); } @@ -26482,13 +26998,17 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_UNUSED_C GC_REFCOUNT(obj)++; /* For $this pointer */ } + + if (UNEXPECTED(EG(exception) != NULL)) { + HANDLE_EXCEPTION(); + } + call = zend_vm_stack_push_call_frame(call_info, fbc, opline->extended_value, called_scope, obj); call->prev_execute_data = EX(call); EX(call) = call; - - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -26628,7 +27148,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_U call->prev_execute_data = EX(call); EX(call) = call; - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_ARRAY_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -27675,6 +28195,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_UNUSED_TMPVAR if (IS_UNUSED == IS_UNUSED && UNEXPECTED(Z_OBJ_P(container) == NULL)) { zend_throw_error(NULL, "Using $this when not in object context"); zval_ptr_dtor_nogc(EX_VAR(opline->op2.var)); + try_cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } @@ -27731,7 +28252,11 @@ fetch_obj_r_no_object: zval_ptr_dtor_nogc(free_op2); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + try_cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_W_SPEC_UNUSED_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -27885,17 +28410,23 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_UNUSED if (IS_UNUSED == IS_UNUSED && UNEXPECTED(Z_OBJ_P(container) == NULL)) { zend_throw_error(NULL, "Using $this when not in object context"); zval_ptr_dtor_nogc(free_op2); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if (IS_UNUSED == IS_CONST || IS_UNUSED == IS_TMP_VAR) { zend_throw_error(NULL, "Cannot use temporary expression in write context"); zval_ptr_dtor_nogc(free_op2); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if (IS_UNUSED == IS_VAR && UNEXPECTED(container == NULL)) { zend_throw_error(NULL, "Cannot use string offset as an object"); zval_ptr_dtor_nogc(free_op2); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_UNUSED, property, (IS_TMP_VAR|IS_VAR), (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); @@ -27904,7 +28435,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_UNUSED EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var), 0); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } else { ZEND_VM_TAIL_CALL(ZEND_FETCH_OBJ_R_SPEC_UNUSED_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU)); } @@ -28114,14 +28650,18 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_UNUSED_T GC_REFCOUNT(obj)++; /* For $this pointer */ } + zval_ptr_dtor_nogc(free_op2); + + if (UNEXPECTED(EG(exception) != NULL)) { + HANDLE_EXCEPTION(); + } + call = zend_vm_stack_push_call_frame(call_info, fbc, opline->extended_value, called_scope, obj); call->prev_execute_data = EX(call); EX(call) = call; - zval_ptr_dtor_nogc(free_op2); - - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_UNUSED_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -28261,7 +28801,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_U call->prev_execute_data = EX(call); EX(call) = call; - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_ARRAY_SPEC_UNUSED_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -29249,9 +29789,15 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SEND_VAR_SPEC_CV_HANDLER(ZEND_ if (IS_CV == IS_CV && UNEXPECTED(Z_TYPE_INFO_P(varptr) == IS_UNDEF)) { SAVE_OPLINE(); GET_OP1_UNDEF_CV(varptr, BP_VAR_R); + if (UNEXPECTED(EG(exception) != NULL)) { + ZEND_CALL_NUM_ARGS(EX(call)) = opline->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + arg = ZEND_CALL_VAR(EX(call), opline->result.var); ZVAL_NULL(arg); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } arg = ZEND_CALL_VAR(EX(call), opline->result.var); @@ -29289,8 +29835,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SEND_REF_SPEC_CV_HANDLER(ZEND_ if (IS_CV == IS_VAR && UNEXPECTED(varptr == NULL)) { zend_throw_error(NULL, "Only variables can be passed by reference"); - arg = ZEND_CALL_VAR(EX(call), opline->result.var); - ZVAL_UNDEF(arg); + ZEND_CALL_NUM_ARGS(EX(call)) = opline->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } @@ -29309,6 +29855,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SEND_REF_SPEC_CV_HANDLER(ZEND_ ZVAL_REF(varptr, Z_REF_P(arg)); } + if (IS_CV == IS_VAR && UNEXPECTED(EG(exception) != NULL)) { + ZEND_CALL_NUM_ARGS(EX(call)) = opline->op2.num; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } ZEND_VM_NEXT_OPCODE(); } @@ -29332,9 +29883,15 @@ send_var_by_ref: if (IS_CV == IS_CV && UNEXPECTED(Z_TYPE_INFO_P(varptr) == IS_UNDEF)) { SAVE_OPLINE(); GET_OP1_UNDEF_CV(varptr, BP_VAR_R); + if (UNEXPECTED(EG(exception) != NULL)) { + ZEND_CALL_NUM_ARGS(EX(call)) = arg_num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + arg = ZEND_CALL_VAR(EX(call), opline->result.var); ZVAL_NULL(arg); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } arg = ZEND_CALL_VAR(EX(call), opline->result.var); @@ -29393,7 +29950,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SEND_USER_SPEC_CV_HANDLER(ZEND EX(call)->called_scope = NULL; Z_OBJ(EX(call)->This) = NULL; - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception) != NULL)) { + ZEND_CALL_NUM_ARGS(EX(call)) = opline->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } ZVAL_NEW_REF(arg, arg); @@ -29411,7 +29973,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SEND_USER_SPEC_CV_HANDLER(ZEND } ZVAL_COPY_VALUE(param, arg); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception) != NULL)) { + ZEND_CALL_NUM_ARGS(EX(call)) = opline->op2.num; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_BOOL_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -31555,6 +32122,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ if (UNEXPECTED(CE_STATIC_MEMBERS(ce) == NULL)) { zend_throw_error(NULL, "Access to undeclared static property: %s::$%s", ZSTR_VAL(ce->name), ZSTR_VAL(name)); + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } HANDLE_EXCEPTION(); } @@ -31566,7 +32137,14 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ zend_string_release(name); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } CACHE_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op2)), ce); } @@ -31575,6 +32153,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ ce = zend_fetch_class(NULL, opline->op2.num); if (UNEXPECTED(ce == NULL)) { ZEND_ASSERT(EG(exception)); + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } HANDLE_EXCEPTION(); } } else { @@ -31587,6 +32169,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ if (UNEXPECTED(CE_STATIC_MEMBERS(ce) == NULL)) { zend_throw_error(NULL, "Access to undeclared static property: %s::$%s", ZSTR_VAL(ce->name), ZSTR_VAL(name)); + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } HANDLE_EXCEPTION(); } @@ -31596,6 +32182,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ retval = zend_std_get_static_property(ce, name, 0); if (UNEXPECTED(EG(exception))) { + try_cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if (IS_CV == IS_CONST && retval) { @@ -31616,7 +32203,11 @@ fetch_static_prop_return: } else { ZVAL_INDIRECT(EX_VAR(opline->result.var), retval); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + try_cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_STATIC_PROP_R_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -31736,16 +32327,20 @@ 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"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); 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"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } zend_fetch_dimension_address_W(EX_VAR(opline->result.var), container, EX_CONSTANT(opline->op2), IS_CONST); @@ -31759,6 +32354,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_CV_CON zend_throw_error(NULL, "Cannot use [] for reading"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } container = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op1.var); @@ -31766,7 +32363,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_CV_CON } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_UNSET_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -31806,6 +32408,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_CV_CONST_HAND if (IS_CV == IS_UNUSED && UNEXPECTED(Z_OBJ_P(container) == NULL)) { zend_throw_error(NULL, "Using $this when not in object context"); + try_cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } @@ -31861,7 +32464,11 @@ fetch_obj_r_no_object: } while (0); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + try_cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_W_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -32014,17 +32621,23 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CV_CON if (IS_CV == IS_UNUSED && UNEXPECTED(Z_OBJ_P(container) == NULL)) { zend_throw_error(NULL, "Using $this when not in object context"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if (IS_CV == IS_CONST || IS_CV == IS_TMP_VAR) { zend_throw_error(NULL, "Cannot use temporary expression in write context"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if (IS_CV == IS_VAR && UNEXPECTED(container == NULL)) { zend_throw_error(NULL, "Cannot use string offset as an object"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_CV, property, IS_CONST, ((IS_CONST == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); @@ -32033,7 +32646,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CV_CON EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var), 0); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } else { ZEND_VM_TAIL_CALL(ZEND_FETCH_OBJ_R_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU)); } @@ -32455,13 +33073,17 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_CV_CONST GC_REFCOUNT(obj)++; /* For $this pointer */ } + + if (UNEXPECTED(EG(exception) != NULL)) { + HANDLE_EXCEPTION(); + } + call = zend_vm_stack_push_call_frame(call_info, fbc, opline->extended_value, called_scope, obj); call->prev_execute_data = EX(call); EX(call) = call; - - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CASE_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -33672,6 +34294,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ if (UNEXPECTED(CE_STATIC_MEMBERS(ce) == NULL)) { zend_throw_error(NULL, "Access to undeclared static property: %s::$%s", ZSTR_VAL(ce->name), ZSTR_VAL(name)); + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } HANDLE_EXCEPTION(); } @@ -33683,7 +34309,14 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ zend_string_release(name); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } CACHE_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op2)), ce); } @@ -33692,6 +34325,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ ce = zend_fetch_class(NULL, opline->op2.num); if (UNEXPECTED(ce == NULL)) { ZEND_ASSERT(EG(exception)); + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } HANDLE_EXCEPTION(); } } else { @@ -33704,6 +34341,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ if (UNEXPECTED(CE_STATIC_MEMBERS(ce) == NULL)) { zend_throw_error(NULL, "Access to undeclared static property: %s::$%s", ZSTR_VAL(ce->name), ZSTR_VAL(name)); + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } HANDLE_EXCEPTION(); } @@ -33713,6 +34354,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ retval = zend_std_get_static_property(ce, name, 0); if (UNEXPECTED(EG(exception))) { + try_cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if (IS_CV == IS_CONST && retval) { @@ -33733,7 +34375,11 @@ fetch_static_prop_return: } else { ZVAL_INDIRECT(EX_VAR(opline->result.var), retval); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + try_cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_STATIC_PROP_R_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -34564,6 +35210,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_ if (Z_CONSTANT_P(retval)) { if (UNEXPECTED(zval_update_constant_ex(retval, 1, NULL) != SUCCESS)) { + try_cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } } @@ -34584,7 +35231,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_ } else { ZVAL_INDIRECT(EX_VAR(opline->result.var), retval); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + try_cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_R_SPEC_CV_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -34655,6 +35306,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ if (UNEXPECTED(CE_STATIC_MEMBERS(ce) == NULL)) { zend_throw_error(NULL, "Access to undeclared static property: %s::$%s", ZSTR_VAL(ce->name), ZSTR_VAL(name)); + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } HANDLE_EXCEPTION(); } @@ -34666,7 +35321,14 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ zend_string_release(name); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } CACHE_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op2)), ce); } @@ -34675,6 +35337,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ ce = zend_fetch_class(NULL, opline->op2.num); if (UNEXPECTED(ce == NULL)) { ZEND_ASSERT(EG(exception)); + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } HANDLE_EXCEPTION(); } } else { @@ -34687,6 +35353,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ if (UNEXPECTED(CE_STATIC_MEMBERS(ce) == NULL)) { zend_throw_error(NULL, "Access to undeclared static property: %s::$%s", ZSTR_VAL(ce->name), ZSTR_VAL(name)); + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } HANDLE_EXCEPTION(); } @@ -34696,6 +35366,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ retval = zend_std_get_static_property(ce, name, 0); if (UNEXPECTED(EG(exception))) { + try_cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if (IS_CV == IS_CONST && retval) { @@ -34716,7 +35387,11 @@ fetch_static_prop_return: } else { ZVAL_INDIRECT(EX_VAR(opline->result.var), retval); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + try_cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_STATIC_PROP_R_SPEC_CV_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -34808,16 +35483,20 @@ 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"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); 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"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } zend_fetch_dimension_address_W(EX_VAR(opline->result.var), container, NULL, IS_UNUSED); @@ -34831,6 +35510,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_CV_UNU zend_throw_error(NULL, "Cannot use [] for reading"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } container = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op1.var); @@ -34838,7 +35519,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_CV_UNU } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_DIM_SPEC_CV_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -36853,16 +37539,20 @@ 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"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); 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"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } zend_fetch_dimension_address_W(EX_VAR(opline->result.var), container, _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op2.var), IS_CV); @@ -36876,6 +37566,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_CV_CV_ zend_throw_error(NULL, "Cannot use [] for reading"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } container = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op1.var); @@ -36883,7 +37575,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_CV_CV_ } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_UNSET_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -36923,6 +37620,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_CV_CV_HANDLER if (IS_CV == IS_UNUSED && UNEXPECTED(Z_OBJ_P(container) == NULL)) { zend_throw_error(NULL, "Using $this when not in object context"); + try_cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } @@ -36978,7 +37676,11 @@ fetch_obj_r_no_object: } while (0); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + try_cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_W_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -37131,17 +37833,23 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CV_CV_ if (IS_CV == IS_UNUSED && UNEXPECTED(Z_OBJ_P(container) == NULL)) { zend_throw_error(NULL, "Using $this when not in object context"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if (IS_CV == IS_CONST || IS_CV == IS_TMP_VAR) { zend_throw_error(NULL, "Cannot use temporary expression in write context"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if (IS_CV == IS_VAR && UNEXPECTED(container == NULL)) { zend_throw_error(NULL, "Cannot use string offset as an object"); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_CV, property, IS_CV, ((IS_CV == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); @@ -37150,7 +37858,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CV_CV_ EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var), 0); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } else { ZEND_VM_TAIL_CALL(ZEND_FETCH_OBJ_R_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU)); } @@ -37586,13 +38299,17 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_CV_CV_HA GC_REFCOUNT(obj)++; /* For $this pointer */ } + + if (UNEXPECTED(EG(exception) != NULL)) { + HANDLE_EXCEPTION(); + } + call = zend_vm_stack_push_call_frame(call_info, fbc, opline->extended_value, called_scope, obj); call->prev_execute_data = EX(call); EX(call) = call; - - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CASE_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -39509,16 +40226,20 @@ 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)); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); 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"); zval_ptr_dtor_nogc(EX_VAR(opline->op2.var)); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } zend_fetch_dimension_address_W(EX_VAR(opline->result.var), container, _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2), (IS_TMP_VAR|IS_VAR)); @@ -39532,6 +40253,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_CV_TMP zend_throw_error(NULL, "Cannot use [] for reading"); zval_ptr_dtor_nogc(EX_VAR(opline->op2.var)); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } container = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op1.var); @@ -39539,7 +40262,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_CV_TMP zval_ptr_dtor_nogc(free_op2); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_UNSET_SPEC_CV_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -39579,6 +40307,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_CV_TMPVAR_HAN if (IS_CV == IS_UNUSED && UNEXPECTED(Z_OBJ_P(container) == NULL)) { zend_throw_error(NULL, "Using $this when not in object context"); zval_ptr_dtor_nogc(EX_VAR(opline->op2.var)); + try_cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } @@ -39635,7 +40364,11 @@ fetch_obj_r_no_object: zval_ptr_dtor_nogc(free_op2); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + try_cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_W_SPEC_CV_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -39789,17 +40522,23 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CV_TMP if (IS_CV == IS_UNUSED && UNEXPECTED(Z_OBJ_P(container) == NULL)) { zend_throw_error(NULL, "Using $this when not in object context"); zval_ptr_dtor_nogc(free_op2); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } 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(free_op2); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if (IS_CV == IS_VAR && UNEXPECTED(container == NULL)) { zend_throw_error(NULL, "Cannot use string offset as an object"); zval_ptr_dtor_nogc(free_op2); + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } zend_fetch_property_address(EX_VAR(opline->result.var), container, IS_CV, property, (IS_TMP_VAR|IS_VAR), (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(Z_CACHE_SLOT_P(property)) : NULL), BP_VAR_W); @@ -39808,7 +40547,12 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_FUNC_ARG_SPEC_CV_TMP EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var), 0); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline + 1)->op2.num - 1; + cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } else { ZEND_VM_TAIL_CALL(ZEND_FETCH_OBJ_R_SPEC_CV_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU)); } @@ -40158,14 +40902,18 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_CV_TMPVA GC_REFCOUNT(obj)++; /* For $this pointer */ } + zval_ptr_dtor_nogc(free_op2); + + if (UNEXPECTED(EG(exception) != NULL)) { + HANDLE_EXCEPTION(); + } + call = zend_vm_stack_push_call_frame(call_info, fbc, opline->extended_value, called_scope, obj); call->prev_execute_data = EX(call); EX(call) = call; - zval_ptr_dtor_nogc(free_op2); - - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CASE_SPEC_CV_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -41910,6 +42658,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ if (UNEXPECTED(CE_STATIC_MEMBERS(ce) == NULL)) { zend_throw_error(NULL, "Access to undeclared static property: %s::$%s", ZSTR_VAL(ce->name), ZSTR_VAL(name)); zval_ptr_dtor_nogc(free_op1); + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } HANDLE_EXCEPTION(); } @@ -41921,7 +42673,14 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ zend_string_release(name); } zval_ptr_dtor_nogc(free_op1); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } CACHE_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op2)), ce); } @@ -41930,6 +42689,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ ce = zend_fetch_class(NULL, opline->op2.num); if (UNEXPECTED(ce == NULL)) { ZEND_ASSERT(EG(exception)); + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } HANDLE_EXCEPTION(); } } else { @@ -41942,6 +42705,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ if (UNEXPECTED(CE_STATIC_MEMBERS(ce) == NULL)) { zend_throw_error(NULL, "Access to undeclared static property: %s::$%s", ZSTR_VAL(ce->name), ZSTR_VAL(name)); zval_ptr_dtor_nogc(free_op1); + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } HANDLE_EXCEPTION(); } @@ -41951,6 +42718,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ retval = zend_std_get_static_property(ce, name, 0); if (UNEXPECTED(EG(exception))) { zval_ptr_dtor_nogc(free_op1); + try_cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if ((IS_TMP_VAR|IS_VAR) == IS_CONST && retval) { @@ -41973,7 +42741,11 @@ fetch_static_prop_return: } else { ZVAL_INDIRECT(EX_VAR(opline->result.var), retval); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + try_cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_STATIC_PROP_R_SPEC_TMPVAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -42333,14 +43105,17 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_TMPVAR_C GC_REFCOUNT(obj)++; /* For $this pointer */ } + zval_ptr_dtor_nogc(free_op1); + if (UNEXPECTED(EG(exception) != NULL)) { + HANDLE_EXCEPTION(); + } + call = zend_vm_stack_push_call_frame(call_info, fbc, opline->extended_value, called_scope, obj); call->prev_execute_data = EX(call); EX(call) = call; - zval_ptr_dtor_nogc(free_op1); - - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CASE_SPEC_TMPVAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -42808,6 +43583,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ if (UNEXPECTED(CE_STATIC_MEMBERS(ce) == NULL)) { zend_throw_error(NULL, "Access to undeclared static property: %s::$%s", ZSTR_VAL(ce->name), ZSTR_VAL(name)); zval_ptr_dtor_nogc(free_op1); + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } HANDLE_EXCEPTION(); } @@ -42819,7 +43598,14 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ zend_string_release(name); } zval_ptr_dtor_nogc(free_op1); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } CACHE_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op2)), ce); } @@ -42828,6 +43614,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ ce = zend_fetch_class(NULL, opline->op2.num); if (UNEXPECTED(ce == NULL)) { ZEND_ASSERT(EG(exception)); + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } HANDLE_EXCEPTION(); } } else { @@ -42840,6 +43630,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ if (UNEXPECTED(CE_STATIC_MEMBERS(ce) == NULL)) { zend_throw_error(NULL, "Access to undeclared static property: %s::$%s", ZSTR_VAL(ce->name), ZSTR_VAL(name)); zval_ptr_dtor_nogc(free_op1); + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } HANDLE_EXCEPTION(); } @@ -42849,6 +43643,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ retval = zend_std_get_static_property(ce, name, 0); if (UNEXPECTED(EG(exception))) { zval_ptr_dtor_nogc(free_op1); + try_cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if ((IS_TMP_VAR|IS_VAR) == IS_CONST && retval) { @@ -42871,7 +43666,11 @@ fetch_static_prop_return: } else { ZVAL_INDIRECT(EX_VAR(opline->result.var), retval); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + try_cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_STATIC_PROP_R_SPEC_TMPVAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -43165,6 +43964,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_ if (Z_CONSTANT_P(retval)) { if (UNEXPECTED(zval_update_constant_ex(retval, 1, NULL) != SUCCESS)) { zval_ptr_dtor_nogc(free_op1); + try_cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } } @@ -43185,7 +43985,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_ } else { ZVAL_INDIRECT(EX_VAR(opline->result.var), retval); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + try_cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_R_SPEC_TMPVAR_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -43256,6 +44060,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ if (UNEXPECTED(CE_STATIC_MEMBERS(ce) == NULL)) { zend_throw_error(NULL, "Access to undeclared static property: %s::$%s", ZSTR_VAL(ce->name), ZSTR_VAL(name)); zval_ptr_dtor_nogc(free_op1); + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } HANDLE_EXCEPTION(); } @@ -43267,7 +44075,14 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ zend_string_release(name); } zval_ptr_dtor_nogc(free_op1); - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } CACHE_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op2)), ce); } @@ -43276,6 +44091,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ ce = zend_fetch_class(NULL, opline->op2.num); if (UNEXPECTED(ce == NULL)) { ZEND_ASSERT(EG(exception)); + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } HANDLE_EXCEPTION(); } } else { @@ -43288,6 +44107,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ if (UNEXPECTED(CE_STATIC_MEMBERS(ce) == NULL)) { zend_throw_error(NULL, "Access to undeclared static property: %s::$%s", ZSTR_VAL(ce->name), ZSTR_VAL(name)); zval_ptr_dtor_nogc(free_op1); + if (UNEXPECTED(EX(call))) { + ZEND_CALL_NUM_ARGS(EX(call)) = (opline - 1)->op2.num - 1; + cleanup_call_frame(execute_data); + } HANDLE_EXCEPTION(); } @@ -43297,6 +44120,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_static_prop_helper_SPEC_ retval = zend_std_get_static_property(ce, name, 0); if (UNEXPECTED(EG(exception))) { zval_ptr_dtor_nogc(free_op1); + try_cleanup_call_frame(execute_data); HANDLE_EXCEPTION(); } if ((IS_TMP_VAR|IS_VAR) == IS_CONST && retval) { @@ -43319,7 +44143,11 @@ fetch_static_prop_return: } else { ZVAL_INDIRECT(EX_VAR(opline->result.var), retval); } - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + if (UNEXPECTED(EG(exception))) { + try_cleanup_call_frame(execute_data); + HANDLE_EXCEPTION(); + } + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_STATIC_PROP_R_SPEC_TMPVAR_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -44533,14 +45361,17 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_TMPVAR_C GC_REFCOUNT(obj)++; /* For $this pointer */ } + zval_ptr_dtor_nogc(free_op1); + if (UNEXPECTED(EG(exception) != NULL)) { + HANDLE_EXCEPTION(); + } + call = zend_vm_stack_push_call_frame(call_info, fbc, opline->extended_value, called_scope, obj); call->prev_execute_data = EX(call); EX(call) = call; - zval_ptr_dtor_nogc(free_op1); - - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CASE_SPEC_TMPVAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS) @@ -45671,15 +46502,18 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_TMPVAR_T GC_REFCOUNT(obj)++; /* For $this pointer */ } + zval_ptr_dtor_nogc(free_op2); + zval_ptr_dtor_nogc(free_op1); + if (UNEXPECTED(EG(exception) != NULL)) { + HANDLE_EXCEPTION(); + } + call = zend_vm_stack_push_call_frame(call_info, fbc, opline->extended_value, called_scope, obj); call->prev_execute_data = EX(call); EX(call) = call; - zval_ptr_dtor_nogc(free_op2); - zval_ptr_dtor_nogc(free_op1); - - ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); + ZEND_VM_NEXT_OPCODE(); } static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CASE_SPEC_TMPVAR_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)