details: http://hg.nginx.org/njs/rev/8960cef1cd5f branches: changeset: 569:8960cef1cd5f user: Igor Sysoev <i...@sysoev.ru> date: Tue Jul 24 19:50:02 2018 +0300 description: Removed artifacts left after changeset 25bd2742a18b.
diffstat: njs/njs_vm.c | 17 +++++------------ 1 files changed, 5 insertions(+), 12 deletions(-) diffs (50 lines): diff -r 7ccf9c0a412a -r 8960cef1cd5f njs/njs_vm.c --- a/njs/njs_vm.c Tue Jul 24 19:25:39 2018 +0300 +++ b/njs/njs_vm.c Tue Jul 24 19:50:02 2018 +0300 @@ -43,7 +43,7 @@ static njs_ret_t njs_function_frame_free static void njs_vm_trap(njs_vm_t *vm, nxt_uint_t trap, njs_value_t *value1, njs_value_t *value2); -static njs_ret_t njs_vm_trap_argument(njs_vm_t *vm, nxt_uint_t trap); +static void njs_vm_trap_argument(njs_vm_t *vm, nxt_uint_t trap); static njs_ret_t njs_vmcode_number_primitive(njs_vm_t *vm, njs_value_t *invld, njs_value_t *narg); static njs_ret_t njs_vmcode_string_primitive(njs_vm_t *vm, njs_value_t *invld, @@ -188,12 +188,9 @@ start: case NJS_TRAP_NUMBER_ARG: case NJS_TRAP_STRING_ARG: - ret = njs_vm_trap_argument(vm, ret - NJS_TRAP_BASE); - if (nxt_fast_path(ret == NXT_OK)) { - goto start; - } - - break; + njs_vm_trap_argument(vm, ret - NJS_TRAP_BASE); + + goto start; default: break; @@ -2875,7 +2872,7 @@ njs_vm_trap(njs_vm_t *vm, nxt_uint_t tra } -static njs_ret_t +static void njs_vm_trap_argument(njs_vm_t *vm, nxt_uint_t trap) { njs_value_t *value; @@ -2888,12 +2885,8 @@ njs_vm_trap_argument(njs_vm_t *vm, nxt_u frame->trap_values[1].data.u.value = value; frame->trap_values[0] = *value; - njs_set_invalid(&frame->trap_scratch); - frame->trap_restart = vm->current; vm->current = (u_char *) njs_vm_traps[trap].code; - - return NXT_OK; } _______________________________________________ nginx-devel mailing list nginx-devel@nginx.org http://mailman.nginx.org/mailman/listinfo/nginx-devel