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

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: add test Created 7 years, 4 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: src/x64/code-stubs-x64.cc
diff --git a/src/x64/code-stubs-x64.cc b/src/x64/code-stubs-x64.cc
index ad33a8c6319b7a0a5919b7be75458068a1d1f929..636a390ff0a5f66af434e9b16e44632f52e5384d 100644
--- a/src/x64/code-stubs-x64.cc
+++ b/src/x64/code-stubs-x64.cc
@@ -4004,6 +4004,31 @@ 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());
+
+ __ xor_(rcx, rcx);
+
+ Operand c_entry_frame_to_ignore_exception_operand =
+ masm->ExternalOperand(c_entry_frame_to_ignore_exception);
+ __ movq(rdx, c_entry_frame_to_ignore_exception_operand);
+
+ __ Store(c_entry_frame_to_ignore_exception, rcx);
+
+ __ cmpq(rbp, rdx);
Yang 2013/09/13 09:47:56 Similar to ia32.
Peter.Rybin 2013/09/19 15:35:31 Done.
+
+ __ j(not_equal, &proceed_throwing);
+
+ __ LeaveExitFrame(save_doubles_);
+ __ ret(0);
+
+ __ bind(&proceed_throwing);
+#endif // ENABLE_DEBUGGER_SUPPORT
+
__ Throw(rax);
}

Powered by Google App Engine
This is Rietveld 408576698