Move ApiLocalScope out of class ApiState into class Thread so that the API local handles and zone e…

runtime/vm/mirrors_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_mirrors_api.h"
 
 #include "platform/assert.h"
 #include "vm/class_finalizer.h"
 #include "vm/dart.h"
 #include "vm/dart_api_impl.h"
@@ skipping 12 matching lines @@
 #define Z (T->zone())
 
 
 // --- Classes and Interfaces Reflection ---
 
 DART_EXPORT Dart_Handle Dart_TypeName(Dart_Handle object) {
   DARTSCOPE(Thread::Current());
   const Object& obj = Object::Handle(Z, Api::UnwrapHandle(object));
   if (obj.IsType()) {
     const Class& cls = Class::Handle(Type::Cast(obj).type_class());
-    return Api::NewHandle(I, cls.UserVisibleName());
+    return Api::NewHandle(T, cls.UserVisibleName());
   } else {
     RETURN_TYPE_ERROR(Z, object, Class/Type);
   }
 }
 
 
 DART_EXPORT Dart_Handle Dart_QualifiedTypeName(Dart_Handle object) {
   DARTSCOPE(Thread::Current());
   const Object& obj = Object::Handle(Z, Api::UnwrapHandle(object));
   if (obj.IsType() || obj.IsClass()) {
     const Class& cls = (obj.IsType()) ?
         Class::Handle(Z, Type::Cast(obj).type_class()) : Class::Cast(obj);
     const char* str = cls.ToCString();
     if (str == NULL) {
       RETURN_NULL_ERROR(str);
     }
     CHECK_CALLBACK_STATE(T);
-    return Api::NewHandle(I, String::New(str));
+    return Api::NewHandle(T, String::New(str));
   } else {
     RETURN_TYPE_ERROR(Z, object, Class/Type);
   }
 }
 
 
 // --- Function and Variable Reflection ---
 
 // Outside of the vm, we expose setter names with a trailing '='.
 static bool HasExternalSetterSuffix(const String& name) {
@@ skipping 16 matching lines @@
 
   const GrowableObjectArray& names =
       GrowableObjectArray::Handle(Z, GrowableObjectArray::New());
   Function& func = Function::Handle(Z);
   String& name = String::Handle(Z);
 
   if (obj.IsType()) {
     const Class& cls = Class::Handle(Z, Type::Cast(obj).type_class());
     const Error& error = Error::Handle(Z, cls.EnsureIsFinalized(T));
     if (!error.IsNull()) {
-      return Api::NewHandle(I, error.raw());
+      return Api::NewHandle(T, error.raw());
     }
     const Array& func_array = Array::Handle(Z, cls.functions());
 
     // Some special types like 'dynamic' have a null functions list.
     if (!func_array.IsNull()) {
       for (intptr_t i = 0; i < func_array.Length(); ++i) {
         func ^= func_array.At(i);
 
         // Skip implicit getters and setters.
         if (func.kind() == RawFunction::kImplicitGetter ||
@@ skipping 18 matching lines @@
         func ^= obj.raw();
         name = func.UserVisibleName();
         names.Add(name);
       }
     }
   } else {
     return Api::NewError(
         "%s expects argument 'target' to be a class or library.",
         CURRENT_FUNC);
   }
-  return Api::NewHandle(I, Array::MakeArray(names));
+  return Api::NewHandle(T, Array::MakeArray(names));
 }
 
 
 DART_EXPORT Dart_Handle Dart_LookupFunction(Dart_Handle target,
                                             Dart_Handle function_name) {
   DARTSCOPE(Thread::Current());
   const Object& obj = Object::Handle(Z, Api::UnwrapHandle(target));
   if (obj.IsError()) {
     return target;
   }
@@ skipping 60 matching lines @@
 #if defined(DEBUG)
   if (!func.IsNull()) {
     // We only provide access to a subset of function kinds.
     RawFunction::Kind func_kind = func.kind();
     ASSERT(func_kind == RawFunction::kRegularFunction ||
            func_kind == RawFunction::kGetterFunction ||
            func_kind == RawFunction::kSetterFunction ||
            func_kind == RawFunction::kConstructor);
   }
 #endif
-  return Api::NewHandle(I, func.raw());
+  return Api::NewHandle(T, func.raw());
 }
 
 
 DART_EXPORT Dart_Handle Dart_FunctionName(Dart_Handle function) {
   DARTSCOPE(Thread::Current());
   const Function& func = Api::UnwrapFunctionHandle(Z, function);
   if (func.IsNull()) {
     RETURN_TYPE_ERROR(Z, function, Function);
   }
-  return Api::NewHandle(I, func.UserVisibleName());
+  return Api::NewHandle(T, func.UserVisibleName());
 }
 
 
 DART_EXPORT Dart_Handle Dart_FunctionOwner(Dart_Handle function) {
   DARTSCOPE(Thread::Current());
   const Function& func = Api::UnwrapFunctionHandle(Z, function);
   if (func.IsNull()) {
     RETURN_TYPE_ERROR(Z, function, Function);
   }
   if (func.IsNonImplicitClosureFunction()) {
     RawFunction* parent_function = func.parent_function();
-    return Api::NewHandle(I, parent_function);
+    return Api::NewHandle(T, parent_function);
   }
   const Class& owner = Class::Handle(Z, func.Owner());
   ASSERT(!owner.IsNull());
   if (owner.IsTopLevel()) {
     // Top-level functions are implemented as members of a hidden class. We hide
     // that class here and instead answer the library.
 #if defined(DEBUG)
     const Library& lib = Library::Handle(Z, owner.library());
     if (lib.IsNull()) {
       ASSERT(owner.IsDynamicClass() || owner.IsVoidClass());
     }
 #endif
-    return Api::NewHandle(I, owner.library());
+    return Api::NewHandle(T, owner.library());
   } else {
-    return Api::NewHandle(I, owner.RareType());
+    return Api::NewHandle(T, owner.RareType());
   }
 }
 
 
 DART_EXPORT Dart_Handle Dart_FunctionIsStatic(Dart_Handle function,
                                               bool* is_static) {
   DARTSCOPE(Thread::Current());
   if (is_static == NULL) {
     RETURN_NULL_ERROR(is_static);
   }
@@ skipping 54 matching lines @@
 // --- Libraries Reflection ---
 
 DART_EXPORT Dart_Handle Dart_LibraryName(Dart_Handle library) {
   DARTSCOPE(Thread::Current());
   const Library& lib = Api::UnwrapLibraryHandle(Z, library);
   if (lib.IsNull()) {
     RETURN_TYPE_ERROR(Z, library, Library);
   }
   const String& name = String::Handle(Z, lib.name());
   ASSERT(!name.IsNull());
-  return Api::NewHandle(I, name.raw());
+  return Api::NewHandle(T, name.raw());
 }
 
 DART_EXPORT Dart_Handle Dart_LibraryGetClassNames(Dart_Handle library) {
   DARTSCOPE(Thread::Current());
   const Library& lib = Api::UnwrapLibraryHandle(Z, library);
   if (lib.IsNull()) {
     RETURN_TYPE_ERROR(Z, library, Library);
   }
 
   const GrowableObjectArray& names =
       GrowableObjectArray::Handle(Z, GrowableObjectArray::New());
   ClassDictionaryIterator it(lib);
   Class& cls = Class::Handle(Z);
   String& name = String::Handle(Z);
   while (it.HasNext()) {
     cls = it.GetNextClass();
     if (cls.IsSignatureClass()) {
       if (!cls.IsCanonicalSignatureClass()) {
         // This is a typedef.  Add it to the list of class names.
         name = cls.UserVisibleName();
         names.Add(name);
       } else {
         // Skip canonical signature classes.  These are not named.
       }
     } else {
       name = cls.UserVisibleName();
       names.Add(name);
     }
   }
-  return Api::NewHandle(I, Array::MakeArray(names));
+  return Api::NewHandle(T, Array::MakeArray(names));
 }
 
 
 // --- Closures Reflection ---
 
 DART_EXPORT Dart_Handle Dart_ClosureFunction(Dart_Handle closure) {
   DARTSCOPE(Thread::Current());
   const Instance& closure_obj = Api::UnwrapInstanceHandle(Z, closure);
   if (closure_obj.IsNull() || !closure_obj.IsClosure()) {
     RETURN_TYPE_ERROR(Z, closure, Instance);
   }
 
   ASSERT(ClassFinalizer::AllClassesFinalized());
 
   RawFunction* rf = Closure::function(closure_obj);
-  return Api::NewHandle(I, rf);
+  return Api::NewHandle(T, rf);
 }
 
 }  // namespace dart