From 7de5a557103dd689bd9a757720eca72459d86e66 Mon Sep 17 00:00:00 2001 From: Michaël Zasso Date: Fri, 11 Oct 2019 11:42:04 +0200 Subject: deps: patch V8 to 7.8.279.17 Refs: https://github.com/v8/v8/compare/7.8.279.15...7.8.279.17 PR-URL: https://github.com/nodejs/node/pull/29928 Reviewed-By: Jiawen Geng Reviewed-By: Colin Ihrig Reviewed-By: Michael Dawson --- deps/v8/src/execution/isolate.cc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'deps/v8/src/execution/isolate.cc') diff --git a/deps/v8/src/execution/isolate.cc b/deps/v8/src/execution/isolate.cc index d090ed5260..3ba39562b1 100644 --- a/deps/v8/src/execution/isolate.cc +++ b/deps/v8/src/execution/isolate.cc @@ -1680,8 +1680,13 @@ Object Isolate::UnwindAndFindHandler() { int return_offset = static_cast(frame->pc() - instruction_start); int handler_offset = table.LookupReturn(return_offset); DCHECK_NE(-1, handler_offset); + // Compute the stack pointer from the frame pointer. This ensures that + // argument slots on the stack are dropped as returning would. + Address return_sp = frame->fp() + + StandardFrameConstants::kFixedFrameSizeAboveFp - + code.stack_slots() * kSystemPointerSize; return FoundHandler(Context(), instruction_start, handler_offset, - code.constant_pool(), frame->sp(), frame->fp()); + code.constant_pool(), return_sp, frame->fp()); } case StackFrame::WASM_COMPILED: { -- cgit v1.2.3