Convert implementation in mirrors.cc to use Dart_GetType instead of Dart_GetClass.

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 203 matching lines @@
   const Object& obj = Object::Handle(isolate, Api::UnwrapHandle(target));
   if (obj.IsError()) {
     return target;
   }
 
   const GrowableObjectArray& names =
       GrowableObjectArray::Handle(isolate, GrowableObjectArray::New());
   Function& func = Function::Handle();
   String& name = String::Handle();
 
-  if (obj.IsClass()) {
-    const Class& cls = Class::Cast(obj);
+  if (obj.IsType() || obj.IsClass()) {
+    // For backwards compatibility we allow class objects to be passed in
+    // for now. This needs to be removed once all code that uses class
+    // objects to invoke Dart_Invoke is removed.
+    const Class& cls = (obj.IsType()) ?
+        Class::Handle(Type::Cast(obj).type_class()) : Class::Cast(obj);
     const Error& error = Error::Handle(isolate, cls.EnsureIsFinalized(isolate));
     if (!error.IsNull()) {
       return Api::NewHandle(isolate, error.raw());
     }
     const Array& func_array = Array::Handle(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);
@@ skipping 40 matching lines @@
   if (obj.IsError()) {
     return target;
   }
   const String& func_name = Api::UnwrapStringHandle(isolate, function_name);
   if (func_name.IsNull()) {
     RETURN_TYPE_ERROR(isolate, function_name, String);
   }
 
   Function& func = Function::Handle(isolate);
   String& tmp_name = String::Handle(isolate);
-  if (obj.IsClass()) {
-    const Class& cls = Class::Cast(obj);
+  if (obj.IsType() || obj.IsClass()) {
+    // For backwards compatibility we allow class objects to be passed in
+    // for now. This needs to be removed once all code that uses class
+    // objects to invoke Dart_Invoke is removed.
+    const Class& cls = (obj.IsType()) ?
+        Class::Handle(Type::Cast(obj).type_class()) : Class::Cast(obj);
 
     // Case 1.  Lookup the unmodified function name.
     func = cls.LookupFunctionAllowPrivate(func_name);
 
     // Case 2.  Lookup the function without the external setter suffix
     // '='.  Make sure to do this check after the regular lookup, so
     // that we don't interfere with operator lookups (like ==).
     if (func.IsNull() && HasExternalSetterSuffix(func_name)) {
       tmp_name = RemoveExternalSetterSuffix(func_name);
       tmp_name = Field::SetterName(tmp_name);
@@ skipping 256 matching lines @@
   const Object& obj = Object::Handle(isolate, Api::UnwrapHandle(target));
   if (obj.IsError()) {
     return target;
   }
 
   const GrowableObjectArray& names =
       GrowableObjectArray::Handle(isolate, GrowableObjectArray::New());
   Field& field = Field::Handle(isolate);
   String& name = String::Handle(isolate);
 
-  if (obj.IsClass()) {
-    const Class& cls = Class::Cast(obj);
+  if (obj.IsType() || obj.IsClass()) {
+    // For backwards compatibility we allow class objects to be passed in
+    // for now. This needs to be removed once all code that uses class
+    // objects to invoke Dart_Invoke is removed.
+    const Class& cls = (obj.IsType()) ?
+        Class::Handle(Type::Cast(obj).type_class()) : Class::Cast(obj);
     const Error& error = Error::Handle(isolate, cls.EnsureIsFinalized(isolate));
     if (!error.IsNull()) {
       return Api::NewHandle(isolate, error.raw());
     }
     const Array& field_array = Array::Handle(cls.fields());
 
     // Some special types like 'dynamic' have a null fields list.
     //
     // TODO(turnidge): Fix 'dynamic' so that it does not have a null
     // fields list.  This will have to wait until the empty array is
@@ skipping 31 matching lines @@
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   const Object& obj = Object::Handle(isolate, Api::UnwrapHandle(target));
   if (obj.IsError()) {
     return target;
   }
   const String& var_name = Api::UnwrapStringHandle(isolate, variable_name);
   if (var_name.IsNull()) {
     RETURN_TYPE_ERROR(isolate, variable_name, String);
   }
-  if (obj.IsClass()) {
-    const Class& cls = Class::Cast(obj);
+  if (obj.IsType() || obj.IsClass()) {
+    // For backwards compatibility we allow class objects to be passed in
+    // for now. This needs to be removed once all code that uses class
+    // objects to invoke Dart_Invoke is removed.
+    const Class& cls = (obj.IsType()) ?
+        Class::Handle(Type::Cast(obj).type_class()) : Class::Cast(obj);
     return Api::NewHandle(isolate, cls.LookupField(var_name));
   }
   if (obj.IsLibrary()) {
     const Library& lib = Library::Cast(obj);
     return Api::NewHandle(isolate, lib.LookupFieldAllowPrivate(var_name));
   }
   return Api::NewError(
       "%s expects argument 'target' to be a class or library.",
       CURRENT_FUNC);
 }
@@ skipping 232 matching lines @@
   } else if (obj.IsField()) {
     cls = Field::Cast(obj).origin();
   } else {
     return Api::NewHandle(isolate, Object::empty_array().raw());
   }
   const Library& lib = Library::Handle(cls.library());
   return Api::NewHandle(isolate, lib.GetMetadata(obj));
 }
 
 }  // namespace dart