- Ensure that HandleScope is initialized with a thread. (Remove

runtime/vm/dart_api_impl.h

 // 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.
 
 #ifndef VM_DART_API_IMPL_H_
 #define VM_DART_API_IMPL_H_
 
 #include "vm/allocation.h"
 #include "vm/native_arguments.h"
 #include "vm/object.h"
@@ skipping 50 matching lines @@
     Isolate* tmp = (isolate);                                                  \
     CHECK_ISOLATE(tmp);                                                        \
     ApiState* state = tmp->api_state();                                        \
     ASSERT(state);                                                             \
     if (state->top_scope() == NULL) {                                          \
       FATAL1("%s expects to find a current scope. Did you forget to call "     \
            "Dart_EnterScope?", CURRENT_FUNC);                                  \
     }                                                                          \
   } while (0)
 
-#define DARTSCOPE(isolate)                                                     \
-  Isolate* __temp_isolate__ = (isolate);                                       \
-  CHECK_ISOLATE_SCOPE(__temp_isolate__);                                       \
-  HANDLESCOPE(__temp_isolate__);
+#define DARTSCOPE(thread)                                                      \
+  Thread* T = (thread);                                                        \
+  Isolate* I = T->isolate();                                                   \
+  CHECK_ISOLATE_SCOPE(I);                                                      \
+  HANDLESCOPE(T);
 
 
 #define RETURN_TYPE_ERROR(isolate, dart_handle, type)                          \
   do {                                                                         \
     const Object& tmp =                                                        \
         Object::Handle(isolate, Api::UnwrapHandle((dart_handle)));             \
     if (tmp.IsNull()) {                                                        \
       return Api::NewError("%s expects argument '%s' to be non-null.",         \
                            CURRENT_FUNC, #dart_handle);                        \
     } else if (tmp.IsError()) {                                                \
@@ skipping 229 matching lines @@
   if (isolate->no_callback_scope_depth() != 0) {                               \
     return reinterpret_cast<Dart_Handle>(Api::AcquiredError(isolate));         \
   }                                                                            \
 
 #define ASSERT_CALLBACK_STATE(isolate)                                         \
   ASSERT(isolate->no_callback_scope_depth() == 0)
 
 }  // namespace dart.
 
 #endif  // VM_DART_API_IMPL_H_