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

Unified Diff: runtime/vm/debugger.cc

Issue 10544159: Fix issue 3636, break on exception (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 8 years, 6 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 | « no previous file | runtime/vm/exceptions.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/debugger.cc
===================================================================
--- runtime/vm/debugger.cc (revision 8665)
+++ runtime/vm/debugger.cc (working copy)
@@ -653,7 +653,7 @@
void Debugger::SignalExceptionThrown(const Object& exc) {
- if (ignore_breakpoints_) {
+ if (ignore_breakpoints_ || (event_handler_ == NULL)) {
return;
}
DebuggerStackTrace* stack_trace = CollectStackTrace();
@@ -662,18 +662,17 @@
}
// No single-stepping possible after this pause event.
last_bpt_line_ = -1;
- if (event_handler_ != NULL) {
- ASSERT(stack_trace_ == NULL);
- stack_trace_ = stack_trace;
- ASSERT(obj_cache_ == NULL);
- obj_cache_ = new RemoteObjectCache(64);
- DebuggerEvent event;
- event.type = kExceptionThrown;
- event.exception = &exc;
- (*event_handler_)(&event);
- stack_trace_ = NULL;
- obj_cache_ = NULL; // Remote object cache is zone allocated.
- }
+ ASSERT(stack_trace_ == NULL);
+ stack_trace_ = stack_trace;
+ ASSERT(obj_cache_ == NULL);
+ obj_cache_ = new RemoteObjectCache(64);
+ DebuggerEvent event;
+ event.type = kExceptionThrown;
+ event.exception = &exc;
+ ASSERT(event_handler_ != NULL);
+ (*event_handler_)(&event);
+ stack_trace_ = NULL;
+ obj_cache_ = NULL; // Remote object cache is zone allocated.
}
« no previous file with comments | « no previous file | runtime/vm/exceptions.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698