Index: runtime/vm/isolate_reload.cc |
diff --git a/runtime/vm/isolate_reload.cc b/runtime/vm/isolate_reload.cc |
index f1744069b084e244b4a4214e5c3873600ae23a55..d53e3f2ada1247b3b5ebf17eb459652f5bee6655 100644 |
--- a/runtime/vm/isolate_reload.cc |
+++ b/runtime/vm/isolate_reload.cc |
@@ -212,12 +212,12 @@ void ClassReasonForCancelling::AppendTo(JSONArray* array) { |
jsobj.AddProperty("message", message); |
} |
+ |
RawError* IsolateReloadContext::error() const { |
ASSERT(has_error()); |
// Report the first error to the surroundings. |
const Error& error = |
Error::Handle(reasons_to_cancel_reload_.At(0)->ToError()); |
- OS::Print("[[%s]]\n", error.ToCString()); |
return error.raw(); |
} |
@@ -355,11 +355,13 @@ bool IsolateReloadContext::IsSameLibrary( |
} |
-IsolateReloadContext::IsolateReloadContext(Isolate* isolate) |
+IsolateReloadContext::IsolateReloadContext(Isolate* isolate, |
+ JSONStream* js) |
: start_time_micros_(OS::GetCurrentMonotonicMicros()), |
reload_timestamp_(OS::GetCurrentTimeMillis()), |
isolate_(isolate), |
reload_skipped_(false), |
+ js_(js), |
saved_num_cids_(-1), |
saved_class_table_(NULL), |
num_saved_libs_(-1), |
@@ -539,11 +541,7 @@ void IsolateReloadContext::FinishReload() { |
BackgroundCompiler::Enable(); |
- if (FLAG_trace_reload) { |
- JSONStream stream; |
- ReportOnJSON(&stream); |
- OS::Print("\nJSON report:\n %s\n", stream.ToCString()); |
- } |
+ ReportOnJSON(js_); |
} |