vm/code_generator_x64.cc - Issue 10262033: Fix stack pointer reset bug in entry to catch blocks.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: vm/code_generator_x64.cc

Issue 10262033: Fix stack pointer reset bug in entry to catch blocks. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/runtime/

Patch Set: Created 8 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: vm/code_generator_x64.cc

===================================================================

--- vm/code_generator_x64.cc (revision 7165)

+++ vm/code_generator_x64.cc (working copy)

@@ -2582,8 +2582,11 @@

// Restore RSP from RBP as we are coming from a throw and the code for

// popping arguments has not been run.

ASSERT(locals_space_size() >= 0);

- __ movq(RSP, RBP);

- __ subq(RSP, Immediate(locals_space_size()));

+ if (locals_space_size() == 0) {

+ __ movq(RSP, RBP);

+ } else {

+ __ leaq(RSP, Address(RBP, -locals_space_size()));

+ }

// The JumpToExceptionHandler trampoline code sets up

// - the exception object in RAX (kExceptionObjectReg)

« no previous file with comments | « vm/code_generator_ia32.cc ('k') | vm/flow_graph_compiler_x64.cc » ('j') | no next file with comments »