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

Unified Diff: src/x64/code-stubs-x64.cc

Issue 22801003: Patch CEntry stub to swallow exception if liveedit/restart frame needs it. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: follow code review Created 7 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
« no previous file with comments | « src/serialize.cc ('k') | test/mjsunit/debug-liveedit-restart-frame-on-exception.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/x64/code-stubs-x64.cc
diff --git a/src/x64/code-stubs-x64.cc b/src/x64/code-stubs-x64.cc
index 171112fa7d37a37d01a2a22aa2e41ac1322985d1..3fdea902d853644a73d2277a2b53ec37f3fd75ce 100644
--- a/src/x64/code-stubs-x64.cc
+++ b/src/x64/code-stubs-x64.cc
@@ -3727,6 +3727,24 @@ void CEntryStub::Generate(MacroAssembler* masm) {
__ ThrowUncatchable(rax);
__ bind(&throw_normal_exception);
+
+#ifdef ENABLE_DEBUGGER_SUPPORT
+ Label proceed_throwing;
+ ExternalReference c_entry_frame_to_ignore_exception =
+ ExternalReference(Debug_Address::CEntryFrameToIgnoreException(),
+ masm->isolate());
+ Operand c_entry_frame_to_ignore_exception_operand =
+ masm->ExternalOperand(c_entry_frame_to_ignore_exception);
+
+ __ cmpq(rbp, c_entry_frame_to_ignore_exception_operand);
+ __ j(not_equal, &proceed_throwing);
+ __ Set(c_entry_frame_to_ignore_exception_operand, 0);
+ __ LeaveExitFrame(save_doubles_);
+ __ ret(0);
+
+ __ bind(&proceed_throwing);
+#endif // ENABLE_DEBUGGER_SUPPORT
+
__ Throw(rax);
}
« no previous file with comments | « src/serialize.cc ('k') | test/mjsunit/debug-liveedit-restart-frame-on-exception.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698