Make the "sticky error" an Error instead of a String.

runtime/vm/dart_api_impl.cc

 // Copyright (c) 2011, 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 "include/dart_api.h"
 
 #include "vm/bigint_operations.h"
 #include "vm/class_finalizer.h"
 #include "vm/compiler.h"
 #include "vm/dart.h"
@@ skipping 49 matching lines @@
         ClassFinalizer::FinalizePendingClasses();
   }
   if (success && !generating_snapshot) {
     success = isolate->object_store()->PreallocateObjects();
   }
   if (success) {
     return NULL;
   } else {
     // Make a copy of the error message as the original message string
     // may get deallocated when we return back from the Dart API call.
-    const String& err =
-    String::Handle(isolate->object_store()->sticky_error());
-    const char* errmsg = err.ToCString();
+    const Error& err =
+        Error::Handle(isolate->object_store()->sticky_error());
+    const char* errmsg = err.ToErrorCString();
     intptr_t errlen = strlen(errmsg) + 1;
     char* msg = reinterpret_cast<char*>(Api::Allocate(errlen));
     OS::SNPrint(msg, errlen, "%s", errmsg);
     return msg;
   }
 }
 
 
 void SetupErrorResult(Dart_Handle* handle) {
-  // Make a copy of the error message as the original message string
-  // may get deallocated when we return back from the Dart API call.
-  const String& error = String::Handle(
+  const Error& error = Error::Handle(
       Isolate::Current()->object_store()->sticky_error());
-  const Object& obj = Object::Handle(LanguageError::New(error));
-  *handle = Api::NewLocalHandle(obj);
+  *handle = Api::NewLocalHandle(error);
 }
 
 
 // NOTE: Need to pass 'result' as a parameter here in order to avoid
 // warning: variable 'result' might be clobbered by 'longjmp' or 'vfork'
 // which shows up because of the use of setjmp.
 static void InvokeStatic(Isolate* isolate,
                          const Function& function,
                          GrowableArray<const Object*>& args,
                          Dart_Handle* result) {
@@ skipping 411 matching lines @@
   LongJump jump;
   isolate->set_long_jump_base(&jump);
   if (setjmp(*jump.Set()) == 0) {
     Dart::InitializeIsolate(snapshot, callback_data);
     START_TIMER(time_total_runtime);
     isolate->set_long_jump_base(base);
     return reinterpret_cast<Dart_Isolate>(isolate);
   } else {
     {
       DARTSCOPE_NOCHECKS(isolate);
-      const String& errmsg =
-          String::Handle(isolate->object_store()->sticky_error());
-      *error = strdup(errmsg.ToCString());
+      const Error& error_obj =
+          Error::Handle(isolate->object_store()->sticky_error());
+      *error = strdup(error_obj.ToErrorCString());
     }
     Dart::ShutdownIsolate();
   }
   return reinterpret_cast<Dart_Isolate>(NULL);
 }
 
 
 DART_EXPORT void Dart_ShutdownIsolate() {
   CHECK_ISOLATE(Isolate::Current());
   STOP_TIMER(time_total_runtime);
@@ skipping 1935 matching lines @@
     }
     delete debug_region;
   } else {
     *buffer = NULL;
     *buffer_size = 0;
   }
 }
 
 
 }  // namespace dart