--- old/src/share/vm/memory/heapInspection.hpp	2015-01-07 15:16:51.000000000 -0800
+++ new/src/share/vm/memory/heapInspection.hpp	2015-01-07 15:16:51.000000000 -0800
@@ -188,11 +188,15 @@
   long            _instance_count;
   size_t          _instance_words;
   long            _index;
+  long            _super_index;
+  GrowableArray<KlassInfoEntry*>* _subclasses;
 
  public:
   KlassInfoEntry(Klass* k, KlassInfoEntry* next) :
-    _klass(k), _instance_count(0), _instance_words(0), _next(next), _index(-1)
+    _klass(k), _instance_count(0), _instance_words(0), _next(next), _index(-1),
+    _super_index(-1), _subclasses(NULL)
   {}
+  ~KlassInfoEntry();
   KlassInfoEntry* next() const   { return _next; }
   bool is_equal(const Klass* k)  { return k == _klass; }
   Klass* klass()  const      { return _klass; }
@@ -202,11 +206,28 @@
   void set_words(size_t wds) { _instance_words = wds; }
   void set_index(long index) { _index = index; }
   long index()    const      { return _index; }
+  void set_super_index(long index) { _super_index = index; }
+  long super_index() const   { return _super_index; }
+  GrowableArray<KlassInfoEntry*>* subclasses() const { return _subclasses; }
+  void add_subclass(KlassInfoEntry* cie);
   int compare(KlassInfoEntry* e1, KlassInfoEntry* e2);
   void print_on(outputStream* st) const;
   const char* name() const;
 };
 
+inline void KlassInfoEntry::add_subclass(KlassInfoEntry* cie) {
+  if (_subclasses == NULL) {
+    _subclasses = new  (ResourceObj::C_HEAP, mtInternal) GrowableArray<KlassInfoEntry*>(4, true);
+  }
+  _subclasses->append(cie);
+}
+
+inline KlassInfoEntry::~KlassInfoEntry() {
+  if (_subclasses != NULL) {
+    delete _subclasses;
+  }
+}
+
 class KlassInfoClosure : public StackObj {
  public:
   // Called for each KlassInfoEntry.
@@ -248,7 +269,7 @@
   };
 
  public:
-  KlassInfoTable(bool need_class_stats);
+  KlassInfoTable(bool add_all_classes);
   ~KlassInfoTable();
   bool record_instance(const oop obj);
   void iterate(KlassInfoClosure* cic);
@@ -256,6 +277,18 @@
   size_t size_of_instances_in_words() const;
 
   friend class KlassInfoHisto;
+  friend class KlassHierarchy;
+};
+
+class KlassHierarchy : public StackObj {
+ public:
+  KlassHierarchy(KlassInfoTable* cit, const char* title);
+  ~KlassHierarchy();
+  static void print_class_hierarchy(outputStream* st);
+
+private:
+  static void print_class(outputStream* st, KlassInfoEntry* cie,
+			  Stack <KlassInfoEntry*, mtClass> *super_stack);
 };
 
 class KlassInfoHisto : public StackObj {