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

Unified Diff: runtime/vm/isolate.cc

Issue 1701383002: VM service fixes for noopt/precompiled. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 4 years, 10 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/service.cc » ('j') | runtime/vm/service.cc » ('J')
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 32b50e86084612a75e4ec366b283bc6a694b6384..27aa77b74f2503e2e1be72b6d40ecaf4628670db 100644
--- a/runtime/vm/isolate.cc
+++ b/runtime/vm/isolate.cc
@@ -1951,30 +1951,32 @@ void Isolate::PrintJSON(JSONStream* stream, bool ref) {
jsobj.AddProperty("livePorts", message_handler()->live_ports());
jsobj.AddProperty("pauseOnExit", message_handler()->should_pause_on_exit());
- if (message_handler()->is_paused_on_start()) {
- ASSERT(debugger()->PauseEvent() == NULL);
- ServiceEvent pause_event(this, ServiceEvent::kPauseStart);
- jsobj.AddProperty("pauseEvent", &pause_event);
- } else if (message_handler()->is_paused_on_exit()) {
- ASSERT(debugger()->PauseEvent() == NULL);
- ServiceEvent pause_event(this, ServiceEvent::kPauseExit);
- jsobj.AddProperty("pauseEvent", &pause_event);
- } else if (debugger()->PauseEvent() != NULL && !resume_request_) {
- ServiceEvent pause_event(debugger()->PauseEvent());
- jsobj.AddProperty("pauseEvent", &pause_event);
- } else {
- ServiceEvent pause_event(this, ServiceEvent::kResume);
+ if (debugger() != NULL) {
+ if (message_handler()->is_paused_on_start()) {
+ ASSERT(debugger()->PauseEvent() == NULL);
+ ServiceEvent pause_event(this, ServiceEvent::kPauseStart);
+ jsobj.AddProperty("pauseEvent", &pause_event);
+ } else if (message_handler()->is_paused_on_exit()) {
+ ASSERT(debugger()->PauseEvent() == NULL);
+ ServiceEvent pause_event(this, ServiceEvent::kPauseExit);
+ jsobj.AddProperty("pauseEvent", &pause_event);
+ } else if (debugger()->PauseEvent() != NULL && !resume_request_) {
+ ServiceEvent pause_event(debugger()->PauseEvent());
+ jsobj.AddProperty("pauseEvent", &pause_event);
+ } else {
+ ServiceEvent pause_event(this, ServiceEvent::kResume);
- // TODO(turnidge): Don't compute a full stack trace.
- DebuggerStackTrace* stack = debugger()->StackTrace();
- if (stack->Length() > 0) {
- pause_event.set_top_frame(stack->FrameAt(0));
+ // TODO(turnidge): Don't compute a full stack trace.
+ DebuggerStackTrace* stack = debugger()->StackTrace();
+ if (stack->Length() > 0) {
+ pause_event.set_top_frame(stack->FrameAt(0));
+ }
+ jsobj.AddProperty("pauseEvent", &pause_event);
}
- jsobj.AddProperty("pauseEvent", &pause_event);
- }
- jsobj.AddProperty("exceptionPauseMode",
- ExceptionPauseInfoToServiceEnum(debugger()->GetExceptionPauseInfo()));
+ jsobj.AddProperty("exceptionPauseMode",
+ ExceptionPauseInfoToServiceEnum(debugger()->GetExceptionPauseInfo()));
+ }
const Library& lib =
Library::Handle(object_store()->root_library());
@@ -2005,14 +2007,17 @@ void Isolate::PrintJSON(JSONStream* stream, bool ref) {
lib_array.AddValue(lib);
}
}
- {
- JSONArray breakpoints(&jsobj, "breakpoints");
- debugger()->PrintBreakpointsToJSONArray(&breakpoints);
- }
- {
- JSONObject jssettings(&jsobj, "_debuggerSettings");
- debugger()->PrintSettingsToJSONObject(&jssettings);
+ if (debugger() != NULL) {
+ {
+ JSONArray breakpoints(&jsobj, "breakpoints");
+ debugger()->PrintBreakpointsToJSONArray(&breakpoints);
+ }
+
+ {
+ JSONObject jssettings(&jsobj, "_debuggerSettings");
+ debugger()->PrintSettingsToJSONObject(&jssettings);
+ }
}
{
« no previous file with comments | « no previous file | runtime/vm/service.cc » ('j') | runtime/vm/service.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698