Fix top level parse error reload test

runtime/vm/isolate_reload.cc

 // Copyright (c) 2016, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/isolate_reload.h"
 
 #include "vm/become.h"
 #include "vm/bit_vector.h"
 #include "vm/code_generator.h"
 #include "vm/compiler.h"
@@ skipping 184 matching lines @@
 RawString* ReasonForCancelling::ToString() {
   UNREACHABLE();
   return NULL;
 }
 
 
 void ReasonForCancelling::AppendTo(JSONArray* array) {
   JSONObject jsobj(array);
   jsobj.AddProperty("type", "ReasonForCancelling");
   const String& message = String::Handle(ToString());
-  jsobj.AddProperty("message", message);
+  jsobj.AddProperty("message", message.ToCString());
 }
 
 
 void ClassReasonForCancelling::AppendTo(JSONArray* array) {
   JSONObject jsobj(array);
   jsobj.AddProperty("type", "ReasonForCancelling");
   jsobj.AddProperty("class", from_);
   const String& message = String::Handle(ToString());
-  jsobj.AddProperty("message", message);
+  jsobj.AddProperty("message", message.ToCString());
 }
 
 
 RawError* IsolateReloadContext::error() const {
   ASSERT(reload_aborted());
   // Report the first error to the surroundings.
   const Error& error =
       Error::Handle(reasons_to_cancel_reload_.At(0)->ToError());
   return error.raw();
 }
@@ skipping 254 matching lines @@
 
     Dart_Handle retval =
         (I->library_tag_handler())(Dart_kScriptTag,
                                    Api::NewHandle(thread, Library::null()),
                                    Api::NewHandle(thread, root_lib_url.raw()));
     result = Api::UnwrapHandle(retval);
   }
   if (result.IsError()) {
     const Error& error = Error::Cast(result);
     AddReasonForCancelling(new Aborted(zone_, error));
+    // We call report on JSON here because we won't ever execute
+    // FinalizeLoading.
+    ReportOnJSON(js_);
   }
 }
 
 
 void IsolateReloadContext::RegisterClass(const Class& new_cls) {
   const Class& old_cls = Class::Handle(OldClassOrNull(new_cls));
   if (old_cls.IsNull()) {
     I->class_table()->Register(new_cls);
 
     if (FLAG_identity_reload) {
@@ skipping 31 matching lines @@
   } else {
     ReportReasonsForCancelling();
     Rollback();
   }
   // ValidateReload mutates the direct subclass information and does
   // not remove dead subclasses.  Rebuild the direct subclass
   // information from scratch.
   RebuildDirectSubclasses();
 
   BackgroundCompiler::Enable();
-
-  reload_aborted_ = HasReasonsForCancelling();
-  ReportOnJSON(js_);
 }
 
 
 void IsolateReloadContext::ReportOnJSON(JSONStream* stream) {
   JSONObject jsobj(stream);
   jsobj.AddProperty("type", "ReloadReport");
   jsobj.AddProperty("success", !HasReasonsForCancelling());
   {
     JSONObject details(&jsobj, "details");
     if (HasReasonsForCancelling()) {
@@ skipping 553 matching lines @@
 void IsolateReloadContext::PostCommit() {
   TIMELINE_SCOPE(PostCommit);
   set_saved_root_library(Library::Handle());
   set_saved_libraries(GrowableObjectArray::Handle());
   InvalidateWorld();
   TIR_Print("---- DONE COMMIT\n");
 }
 
 
 void IsolateReloadContext::AddReasonForCancelling(ReasonForCancelling* reason) {
+  reload_aborted_ = true;
   reasons_to_cancel_reload_.Add(reason);
 }
 
 
 void IsolateReloadContext::AddInstanceMorpher(InstanceMorpher* morpher) {
   instance_morphers_.Add(morpher);
   cid_mapper_.Insert(morpher);
 }
 
 
@@ skipping 466 matching lines @@
         ASSERT(!super_cls.IsNull());
         super_cls.AddDirectSubclass(cls);
       }
     }
   }
 }
 
 #endif  // !PRODUCT
 
 }  // namespace dart