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

runtime/vm/debugger_api_impl.cc

 // Copyright (c) 2012, 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_debugger_api.h"
 
 #include "vm/class_finalizer.h"
 #include "vm/compiler.h"
 #include "vm/dart_api_impl.h"
 #include "vm/dart_api_state.h"
@@ skipping 441 matching lines @@
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   UNWRAP_AND_CHECK_PARAM(Instance, obj, object_in);
   return Api::NewHandle(isolate, isolate->debugger()->GetInstanceFields(obj));
 }
 
 
 DART_EXPORT Dart_Handle Dart_GetStaticFields(Dart_Handle target) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
-  const Object& obj = Object::Handle(isolate, Api::UnwrapHandle(target));
-  // 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 is removed.
-  Class& cls = Class::Handle();
-  if (obj.IsType()) {
-    cls = Type::Cast(obj).type_class();
-  } else if (obj.IsClass()) {
-    cls = Class::Cast(obj).raw();
-  } else {
+  const Type& type_obj = Api::UnwrapTypeHandle(isolate, target);
+  if (type_obj.IsNull()) {
     return Api::NewError("%s expects argument 'target' to be a type",
                          CURRENT_FUNC);
   }
+  const Class& cls = Class::Handle(isolate, type_obj.type_class());
   return Api::NewHandle(isolate, isolate->debugger()->GetStaticFields(cls));
 }
 
 
 DART_EXPORT Dart_Handle Dart_GetLibraryFields(intptr_t library_id) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   const Library& lib =
       Library::Handle(isolate, Library::GetLibrary(library_id));
   if (lib.IsNull()) {
@@ skipping 22 matching lines @@
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
 
   const Object& target = Object::Handle(isolate, Api::UnwrapHandle(target_in));
   if (target.IsError()) return target_in;
   if (target.IsNull()) {
     return Api::NewError("%s expects argument 'target' to be non-null",
                          CURRENT_FUNC);
   }
   UNWRAP_AND_CHECK_PARAM(String, expr, expr_in);
-  if (target.IsInstance()) {
+  if (target.IsType()) {
+    const Class& cls = Class::Handle(isolate, Type::Cast(target).type_class());
+    return Api::NewHandle(isolate, cls.Evaluate(expr));
+  } else if (target.IsInstance()) {
     return Api::NewHandle(isolate, Instance::Cast(target).Evaluate(expr));
-  } else if (target.IsClass()) {
-    return Api::NewHandle(isolate, Class::Cast(target).Evaluate(expr));
   } else if (target.IsLibrary()) {
     return Api::NewHandle(isolate, Library::Cast(target).Evaluate(expr));
   }
   return Api::NewError("%s: unsupported target type", CURRENT_FUNC);
 }
 
 
 DART_EXPORT Dart_Handle Dart_GetObjClass(Dart_Handle object_in) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   UNWRAP_AND_CHECK_PARAM(Instance, obj, object_in);
-  return Api::NewHandle(isolate, obj.clazz());
+  return Api::NewHandle(isolate, obj.GetType());
 }
 
 
 DART_EXPORT Dart_Handle Dart_GetObjClassId(Dart_Handle object_in,
                                            intptr_t* class_id) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   UNWRAP_AND_CHECK_PARAM(Instance, obj, object_in);
   CHECK_NOT_NULL(class_id);
   *class_id = obj.GetClassId();
   return Api::Success();
 }
 
 
 DART_EXPORT Dart_Handle Dart_GetClassFromId(intptr_t class_id) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   if (!isolate->class_table()->IsValidIndex(class_id)) {
     return Api::NewError("%s: %" Pd " is not a valid class id",
                          CURRENT_FUNC, class_id);
   }
   return Api::NewHandle(isolate, isolate->class_table()->At(class_id));
 }
 
 
-DART_EXPORT Dart_Handle Dart_GetSuperclass(Dart_Handle cls_in) {
-  Isolate* isolate = Isolate::Current();
-  DARTSCOPE(isolate);
-  UNWRAP_AND_CHECK_PARAM(Class, cls, cls_in);
-  return Api::NewHandle(isolate, cls.SuperClass());
-}
-
-
 DART_EXPORT Dart_Handle Dart_GetSupertype(Dart_Handle type_in) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
 
   UNWRAP_AND_CHECK_PARAM(Type, type, type_in);
   if (!type.IsFinalized()) {
     return Api::NewError("%s: type in 'type_in' is not a finalized type",
                          CURRENT_FUNC);
   }
   if (!type.IsInstantiated()) {
@@ skipping 321 matching lines @@
 
 
 DART_EXPORT char* Dart_GetVmStatus(const char* request) {
   if (strncmp(request, "/isolate/", 9) == 0) {
     return Isolate::GetStatus(request);
   }
   return NULL;
 }
 
 }  // namespace dart