Decorate ObjectPool dumps with offsets to match disassembly and names for most external labels.

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 10984 matching lines @@
         jsarr.AddValueF("0x%" Px, imm);
         break;
       default:
         UNREACHABLE();
       }
     }
   }
 }
 
 
+static const char* DescribeExternalLabel(uword addr) {
+  const char* stub_name = StubCode::NameOfStub(addr);
+  if (stub_name != NULL) {
+    return stub_name;
+  }
+
+  RuntimeFunctionId rt_id = RuntimeEntry::RuntimeFunctionIdFromAddress(addr);
+  if (rt_id != kNoRuntimeFunctionId) {
+    return "runtime entry";
+  }
+
+  if (addr == NativeEntry::LinkNativeCallLabel().address()) {
+    return "link native";
+  }
+
+  if (addr == reinterpret_cast<uword>(Symbols::PredefinedAddress())) {
+    return "predefined symbols";
+  }
+
+  return "UNKNOWN";
+}
+
+
 void ObjectPool::DebugPrint() const {
   ISL_Print("Object Pool: {\n");
   for (intptr_t i = 0; i < Length(); i++) {
+    intptr_t offset = OffsetFromIndex(i);
+    ISL_Print("  %" Pd " PP+0x%" Px ": ", i, offset);
     if (InfoAt(i) == kTaggedObject) {
-      ISL_Print("  %" Pd ": 0x%" Px " %s (obj)\n", i,
-          reinterpret_cast<uword>(ObjectAt(i)),
-          Object::Handle(ObjectAt(i)).ToCString());
+      RawObject* obj = ObjectAt(i);
+      ISL_Print("0x%" Px " %s (obj)\n",
+          reinterpret_cast<uword>(obj),
+          Object::Handle(obj).ToCString());
     } else if (InfoAt(i) == kExternalLabel) {
-      ISL_Print("  %" Pd ": 0x%" Px " (external label)\n", i, RawValueAt(i));
+      uword addr = RawValueAt(i);
+      ISL_Print("0x%" Px " (external label: %s)\n",
+                addr, DescribeExternalLabel(addr));
     } else {
-      ISL_Print("  %" Pd ": 0x%" Px " (raw)\n", i, RawValueAt(i));
+      ISL_Print("0x%" Px " (raw)\n", RawValueAt(i));
     }
   }
   ISL_Print("}\n");
 }
 
 
 intptr_t PcDescriptors::Length() const {
   return raw_ptr()->length_;
 }
 
@@ skipping 10407 matching lines @@
   return tag_label.ToCString();
 }
 
 
 void UserTag::PrintJSONImpl(JSONStream* stream, bool ref) const {
   Instance::PrintJSONImpl(stream, ref);
 }
 
 
 }  // namespace dart