Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(725)

Unified Diff: runtime/vm/stub_code_x64.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:
View side-by-side diff with in-line comments
Download patch
Index: runtime/vm/stub_code_x64.cc
diff --git a/runtime/vm/stub_code_x64.cc b/runtime/vm/stub_code_x64.cc
index daf1e5e411f763e6ace4e93af824902ea351cf13..bac0744fee49607bb85b3aa51006581f2c0c3bd5 100644
--- a/runtime/vm/stub_code_x64.cc
+++ b/runtime/vm/stub_code_x64.cc
@@ -1874,6 +1874,9 @@ void StubCode::GenerateJumpToExceptionHandlerStub(Assembler* assembler) {
// Clear top exit frame.
__ movq(Address(THR, Thread::top_exit_frame_info_offset()),
Immediate(0));
+ // Restore the pool pointer.
+ __ RestoreCodePointer();
+ __ LoadPoolPointer(PP);
__ jmp(CallingConventions::kArg1Reg); // Jump to the exception handler code.
}

Powered by Google App Engine
This is Rietveld 408576698