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

Unified Diff: runtime/vm/isolate.cc

Issue 302933003: Fix crash in ProfileInterrupt (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 6 years, 7 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/isolate.cc
diff --git a/runtime/vm/isolate.cc b/runtime/vm/isolate.cc
index 2a9f10e56afb72662a0b29fbdee9367d42589502..a0226edef9fd262d2163b475a422ece793cc3567 100644
--- a/runtime/vm/isolate.cc
+++ b/runtime/vm/isolate.cc
@@ -1015,10 +1015,14 @@ intptr_t Isolate::ProfileInterrupt() {
// Profiler blocked for this isolate.
return 0;
}
- if (message_handler()->paused_on_start() ||
- message_handler()->paused_on_exit() ||
- debugger()->IsPaused()) {
- // Paused at start / exit / breakpoint. Don't tick.
+ if ((debugger() != NULL) && debugger()->IsPaused()) {
+ // Paused at breakpoint. Don't tick.
+ return 0;
+ }
+ if ((message_handler() != NULL) &&
+ (message_handler()->paused_on_start() ||
+ message_handler()->paused_on_exit())) {
+ // Paused at start / exit . Don't tick.
return 0;
}
InterruptableThreadState* state = thread_state();
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698