First step for fixing Issue 9416.

runtime/vm/dart_api_impl.cc

 // Copyright (c) 2013, 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 "platform/assert.h"
 #include "vm/bigint_operations.h"
 #include "vm/class_finalizer.h"
 #include "vm/compiler.h"
@@ skipping 62 matching lines @@
     intptr_t len = (length);                                                   \
     intptr_t max = (max_elements);                                             \
     if (len < 0 || len > max) {                                                \
       return Api::NewError(                                                    \
           "%s expects argument '%s' to be in the range [0..%"Pd"].",           \
           CURRENT_FUNC, #length, max);                                         \
     }                                                                          \
   } while (0)
 
 
-void SetupErrorResult(Isolate* isolate, Dart_Handle* handle) {
-  *handle = Api::NewHandle(
-      isolate, Isolate::Current()->object_store()->sticky_error());
-}
-
-
 Dart_Handle Api::NewHandle(Isolate* isolate, RawObject* raw) {
   LocalHandles* local_handles = Api::TopScope(isolate)->local_handles();
   ASSERT(local_handles != NULL);
   LocalHandle* ref = local_handles->AllocateHandle();
   ref->set_raw(raw);
   return reinterpret_cast<Dart_Handle>(ref);
 }
 
 RawObject* Api::UnwrapHandle(Dart_Handle object) {
 #if defined(DEBUG)
@@ skipping 53 matching lines @@
   ASSERT(state.IsValidPrologueWeakPersistentHandle(object));
   return reinterpret_cast<FinalizablePersistentHandle*>(object);
 }
 
 
 Dart_Handle Api::CheckIsolateState(Isolate* isolate) {
   if (ClassFinalizer::FinalizePendingClasses() &&
       isolate->object_store()->PreallocateObjects()) {
     return Api::Success(isolate);
   }
-  const Object& obj = Object::Handle(isolate->object_store()->sticky_error());
-  ASSERT(obj.IsError());
-  return Api::NewHandle(isolate, obj.raw());
+  ASSERT(isolate->object_store()->sticky_error() != Object::null());
+  return Api::NewHandle(isolate, isolate->object_store()->sticky_error());
 }
 
 
 Dart_Isolate Api::CastIsolate(Isolate* isolate) {
   return reinterpret_cast<Dart_Isolate>(isolate);
 }
 
 
 Dart_Handle Api::Success(Isolate* isolate) {
   ASSERT(isolate != NULL);
@@ skipping 790 matching lines @@
   RunLoopData* data = reinterpret_cast<RunLoopData*>(param);
   ASSERT(data->monitor != NULL);
   MonitorLocker ml(data->monitor);
   data->done = true;
   ml.Notify();
 }
 
 
 DART_EXPORT Dart_Handle Dart_RunLoop() {
   Isolate* isolate = Isolate::Current();
-
-  DARTSCOPE(isolate);
+  CHECK_ISOLATE_SCOPE(isolate);
   CHECK_CALLBACK_STATE(isolate);
   Monitor monitor;
   MonitorLocker ml(&monitor);
   {
     SwitchIsolateScope switch_scope(NULL);
 
     RunLoopData data;
     data.monitor = &monitor;
     data.done = false;
     isolate->message_handler()->Run(
         Dart::thread_pool(),
         NULL, RunLoopDone, reinterpret_cast<uword>(&data));
     while (!data.done) {
       ml.Wait();
     }
   }
-  const Object& obj = Object::Handle(isolate->object_store()->sticky_error());
-  isolate->object_store()->clear_sticky_error();
-  if (obj.IsError()) {
-    return Api::NewHandle(isolate, obj.raw());
+  if (isolate->object_store()->sticky_error() != Object::null()) {
+    Dart_Handle error = Api::NewHandle(isolate,
+                                       isolate->object_store()->sticky_error());
+    isolate->object_store()->clear_sticky_error();
+    return error;
   }
-  ASSERT(obj.IsNull());
   if (FLAG_print_class_table) {
     isolate->class_table()->Print();
   }
   return Api::Success(isolate);
 }
 
 
 DART_EXPORT Dart_Handle Dart_HandleMessage() {
   Isolate* isolate = Isolate::Current();
-  CHECK_ISOLATE(isolate);
+  CHECK_ISOLATE_SCOPE(isolate);
+  CHECK_CALLBACK_STATE(isolate);
   if (!isolate->message_handler()->HandleNextMessage()) {
-    Dart_Handle error =
-        Api::NewHandle(isolate, isolate->object_store()->sticky_error());
+    Dart_Handle error = Api::NewHandle(isolate,
+                                       isolate->object_store()->sticky_error());
     isolate->object_store()->clear_sticky_error();
     return error;
   }
   return Api::Success(isolate);
 }
 
 
 DART_EXPORT bool Dart_HasLivePorts() {
   Isolate* isolate = Isolate::Current();
   ASSERT(isolate);
@@ skipping 3793 matching lines @@
   }
   {
     NoGCScope no_gc;
     RawObject* raw_obj = obj.raw();
     isolate->heap()->SetPeer(raw_obj, peer);
   }
   return Api::Success(isolate);
 }
 
 }  // namespace dart