Rename Closure instance field type_arguments_ to instantiator_.

runtime/vm/object_service.cc

 // Copyright (c) 2016, 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/debugger.h"
 #include "vm/disassembler.h"
 #include "vm/object.h"
 #include "vm/object_store.h"
 #include "vm/stub_code.h"
 #include "vm/symbols.h"
@@ skipping 964 matching lines @@
 
 void Instance::PrintSharedInstanceJSON(JSONObject* jsobj, bool ref) const {
   AddCommonObjectProperties(jsobj, "Instance", ref);
   if (ref) {
     return;
   }
 
   // Add all fields in layout order, from superclass to subclass.
   GrowableArray<Class*> classes;
   Class& cls = Class::Handle(this->clazz());
+  if (IsClosure()) {
+    // Closure fields are not instances. Skip them.
+    cls = cls.SuperClass();
+  }
   do {
     classes.Add(&Class::Handle(cls.raw()));
     cls = cls.SuperClass();
   } while (!cls.IsNull());
 
   Array& field_array = Array::Handle();
   Field& field = Field::Handle();
   Instance& field_value = Instance::Handle();
   {
     JSONArray jsarr(jsobj, "fields");
@@ skipping 36 matching lines @@
     jsobj.AddProperty("valueAsString", "<not initialized>");
     return;
   } else if (raw() == Object::transition_sentinel().raw()) {
     jsobj.AddProperty("type", "Sentinel");
     jsobj.AddProperty("kind", "BeingInitialized");
     jsobj.AddProperty("valueAsString", "<being initialized>");
     return;
   }
 
   PrintSharedInstanceJSON(&jsobj, ref);
+  // TODO(regis): Wouldn't it be simpler to provide a Closure::PrintJSONImpl()?
   if (IsClosure()) {
     jsobj.AddProperty("kind", "Closure");
   } else {
     jsobj.AddProperty("kind", "PlainInstance");
   }
   jsobj.AddServiceId(*this);
   if (IsClosure()) {
+    // TODO(regis): How about closureInstantiator?
     jsobj.AddProperty("closureFunction",
                       Function::Handle(Closure::Cast(*this).function()));
     jsobj.AddProperty("closureContext",
                       Context::Handle(Closure::Cast(*this).context()));
   }
   if (ref) {
     return;
   }
   if (IsClosure()) {
     Debugger* debugger = Isolate::Current()->debugger();
@@ skipping 492 matching lines @@
   jsobj.AddProperty("mirrorReferent", referent_handle);
 }
 
 void UserTag::PrintJSONImpl(JSONStream* stream, bool ref) const {
   Instance::PrintJSONImpl(stream, ref);
 }
 
 #endif
 
 }  // namespace dart