runtime/vm/stub_code_arm.cc - Issue 2357343003: Fix lazy deoptimization in the presence of exceptions

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: runtime/vm/stub_code_arm.cc

Issue 2357343003: Fix lazy deoptimization in the presence of exceptions (Closed)

Patch Set: new test case Created 4 years, 3 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:

Index: runtime/vm/stub_code_arm.cc

diff --git a/runtime/vm/stub_code_arm.cc b/runtime/vm/stub_code_arm.cc

index 82c50a1efc8063ec95d161602081438133cfa4cc..a16ac35fd483e9bcf35434ff0d78e8adb2fb19ea 100644

--- a/runtime/vm/stub_code_arm.cc

+++ b/runtime/vm/stub_code_arm.cc

@@ -1841,6 +1841,9 @@ void StubCode::GenerateJumpToExceptionHandlerStub(Assembler* assembler) {

// Clear top exit frame.

__ LoadImmediate(R2, 0);

__ StoreToOffset(kWord, R2, THR, Thread::top_exit_frame_info_offset());

+ // Restore the pool pointer.

+ __ RestoreCodePointer();

+ __ LoadPoolPointer();

__ bx(LR); // Jump to the exception handler code.

}