Kill service_test.cc tests in favor of dart tests for the service protocol.

runtime/vm/object.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 "vm/object.h"
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "vm/assembler.h"
 #include "vm/cpu.h"
@@ skipping 1583 matching lines @@
   }
 }
 
 
 void Object::PrintJSONImpl(JSONStream* stream, bool ref) const {
   JSONObject jsobj(stream);
   AddTypeProperties(&jsobj, "Object", JSONType(), ref);
   ObjectIdRing* ring = Isolate::Current()->object_id_ring();
   const intptr_t id = ring->GetIdForObject(raw());
   jsobj.AddPropertyF("id", "objects/%" Pd "", id);
+  if (ref) {
+    return;
+  }
+  Class& cls = Class::Handle(this->clazz());
+  jsobj.AddProperty("class", cls);
+  jsobj.AddProperty("size", raw()->Size());
 }
 
 
 RawString* Object::DictionaryName() const {
   return String::null();
 }
 
 
 void Object::InitializeObject(uword address, intptr_t class_id, intptr_t size) {
   // TODO(iposva): Get a proper halt instruction from the assembler which
@@ skipping 1903 matching lines @@
 
 RawType* Class::CanonicalTypeFromIndex(intptr_t idx) const {
   Type& type = Type::Handle();
   if (idx == 0) {
     type = CanonicalType();
     if (!type.IsNull()) {
       return type.raw();
     }
   }
   Object& types = Object::Handle(canonical_types());
-  if (types.IsNull()) {
+  if (types.IsNull() || !types.IsArray()) {
     return Type::null();
   }
   if ((idx < 0) || (idx >= Array::Cast(types).Length())) {
     return Type::null();
   }
   type ^= Array::Cast(types).At(idx);
   ASSERT(!type.IsNull());
   return type.raw();
 }
 
@@ skipping 10398 matching lines @@
                                        bool ref) const {
   Class& cls = Class::Handle(this->clazz());
   jsobj->AddProperty("class", cls);
   // TODO(turnidge): Provide the type arguments here too.
   if (ref) {
     return;
   }
 
   if (raw()->IsHeapObject()) {
     jsobj->AddProperty("size", raw()->Size());
+  } else {
+    jsobj->AddProperty("size", (intptr_t)0);
   }
 
   // Walk the superclass chain, adding all instance fields.
   {
     Instance& fieldValue = Instance::Handle();
     JSONArray jsarr(jsobj, "fields");
     while (!cls.IsNull()) {
       const Array& field_array = Array::Handle(cls.fields());
       Field& field = Field::Handle();
       if (!field_array.IsNull()) {
@@ skipping 1156 matching lines @@
     ObjectIdRing* ring = Isolate::Current()->object_id_ring();
     const intptr_t id = ring->GetIdForObject(raw());
     jsobj.AddPropertyF("id", "objects/%" Pd "", id);
   }
   const String& user_name = String::Handle(PrettyName());
   const String& vm_name = String::Handle(Name());
   AddNameProperties(&jsobj, user_name, vm_name);
   if (ref) {
     return;
   }
-  jsobj.AddProperty("typeArguments", TypeArguments::Handle(arguments()));
+  const TypeArguments& typeArgs = TypeArguments::Handle(arguments());
+  if (!typeArgs.IsNull()) {
+    jsobj.AddProperty("typeArguments", typeArgs);
+  }
 }
 
 
 bool TypeRef::IsInstantiated(GrowableObjectArray* trail) const {
   if (TestAndAddToTrail(&trail)) {
     return true;
   }
   return AbstractType::Handle(type()).IsInstantiated(trail);
 }
 
@@ skipping 5547 matching lines @@
   return tag_label.ToCString();
 }
 
 
 void UserTag::PrintJSONImpl(JSONStream* stream, bool ref) const {
   Instance::PrintJSONImpl(stream, ref);
 }
 
 
 }  // namespace dart