Never return a Dart_Handle on a dart::Class from the embedding API.

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"
 #include "vm/dart_api_state.h"
 #include "vm/dart_entry.h"
 #include "vm/exceptions.h"
 #include "vm/growable_array.h"
 #include "vm/object.h"
 #include "vm/resolver.h"
 #include "vm/stack_frame.h"
 #include "vm/symbols.h"
 
 namespace dart {
 
 
 // --- Classes and Interfaces Reflection ---
 
-DART_EXPORT Dart_Handle Dart_ClassName(Dart_Handle object) {
+DART_EXPORT Dart_Handle Dart_TypeName(Dart_Handle object) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   const Object& obj = Object::Handle(isolate, Api::UnwrapHandle(object));
-  if (obj.IsType() || obj.IsClass()) {
-    const Class& cls = (obj.IsType()) ?
-        Class::Handle(Type::Cast(obj).type_class()) : Class::Cast(obj);
+  if (obj.IsType()) {
+    const Class& cls = Class::Handle(Type::Cast(obj).type_class());
     return Api::NewHandle(isolate, cls.UserVisibleName());
   } else {
     RETURN_TYPE_ERROR(isolate, object, Class/Type);
   }
 }
 
-DART_EXPORT Dart_Handle Dart_QualifiedClassName(Dart_Handle object) {
+DART_EXPORT Dart_Handle Dart_ClassName(Dart_Handle object) {
+  return Dart_TypeName(object);
+}
+
+DART_EXPORT Dart_Handle Dart_QualifiedTypeName(Dart_Handle object) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   const Object& obj = Object::Handle(isolate, Api::UnwrapHandle(object));
   if (obj.IsType() || obj.IsClass()) {
     const Class& cls = (obj.IsType()) ?
         Class::Handle(Type::Cast(obj).type_class()) : Class::Cast(obj);
     return Dart_NewStringFromCString(cls.ToCString());
   } else {
     RETURN_TYPE_ERROR(isolate, object, Class/Type);
   }
 }
 
+DART_EXPORT Dart_Handle Dart_QualifiedClassName(Dart_Handle object) {
+  return Dart_QualifiedTypeName(object);
+}
+
 // --- Function and Variable Reflection ---
 
 // Outside of the vm, we expose setter names with a trailing '='.
 static bool HasExternalSetterSuffix(const String& name) {
   return name.CharAt(name.Length() - 1) == '=';
 }
 
 
 static RawString* RemoveExternalSetterSuffix(const String& name) {
   ASSERT(HasExternalSetterSuffix(name));
   return String::SubString(name, 0, name.Length() - 1);
 }
 
 
 DART_EXPORT Dart_Handle Dart_GetFunctionNames(Dart_Handle target) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   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.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);
+  if (obj.IsType()) {
+    const Class& cls = Class::Handle(Type::Cast(obj).type_class());
     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.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);
+  if (obj.IsType()) {
+    const Class& cls = Class::Handle(Type::Cast(obj).type_class());
 
     // 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 213 matching lines @@
     RETURN_TYPE_ERROR(isolate, closure, Instance);
   }
 
   ASSERT(ClassFinalizer::AllClassesFinalized());
 
   RawFunction* rf = Closure::function(closure_obj);
   return Api::NewHandle(isolate, rf);
 }
 
 }  // namespace dart