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

Unified Diff: src/ia32/code-stubs-ia32.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/debug.h ('k') | src/liveedit.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/ia32/code-stubs-ia32.cc
diff --git a/src/ia32/code-stubs-ia32.cc b/src/ia32/code-stubs-ia32.cc
index 202d7abd9f480fa612590ed8dfa6ebd110822885..6c24980a3a3f822acac5cb1dac54912b1f138dd6 100644
--- a/src/ia32/code-stubs-ia32.cc
+++ b/src/ia32/code-stubs-ia32.cc
@@ -4595,6 +4595,23 @@ void CEntryStub::Generate(MacroAssembler* masm) {
__ ThrowUncatchable(eax);
__ bind(&throw_normal_exception);
+
+#ifdef ENABLE_DEBUGGER_SUPPORT
+ Label proceed_throwing;
+ ExternalReference c_entry_frame_to_ignore_exception =
+ ExternalReference(Debug_Address::CEntryFrameToIgnoreException(),
+ masm->isolate());
+
+ __ cmp(ebp, Operand::StaticVariable(c_entry_frame_to_ignore_exception));
+ __ j(not_equal, &proceed_throwing, Label::kNear);
+ __ mov(Operand::StaticVariable(c_entry_frame_to_ignore_exception),
+ Immediate(0));
+ __ LeaveExitFrame(save_doubles_ == kSaveFPRegs);
+ __ ret(0);
+
+ __ bind(&proceed_throwing);
+#endif // ENABLE_DEBUGGER_SUPPORT
+
__ Throw(eax);
}
« no previous file with comments | « src/debug.h ('k') | src/liveedit.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698