--- a/hotspot/src/share/vm/memory/heapInspection.cpp	Fri Oct 23 14:33:19 2015 +0300
+++ b/hotspot/src/share/vm/memory/heapInspection.cpp	Mon Oct 26 13:11:36 2015 -0400
@@ -348,8 +348,7 @@
 
   for(int i = 0; i < elements.length(); i++) {
     KlassInfoEntry* cie = elements.at(i);
-    const InstanceKlass* k = (InstanceKlass*)cie->klass();
-    Klass* super = ((InstanceKlass*)k)->java_super();
+    Klass* super = cie->klass()->super();
 
     // Set the index for the class.
     cie->set_index(i + 1);