# HG changeset patch
# User coleenp
# Date 1381518293 14400
# Node ID 26ae62bc26c43ed1b357a1df6cc0197237be27b4
# Parent  301ece1880ad30a3401e9f667684a8d16eb37d49# Parent  28ca974cc21a65ef10a5ba157d8b523f56e23968
Merge

diff -r 28ca974cc21a -r 26ae62bc26c4 src/share/vm/services/heapDumper.cpp
--- a/src/share/vm/services/heapDumper.cpp	Fri Oct 11 11:23:49 2013 -0400
+++ b/src/share/vm/services/heapDumper.cpp	Fri Oct 11 15:04:53 2013 -0400
@@ -1545,7 +1545,9 @@
 
 // writes a HPROF_GC_CLASS_DUMP record for the given class
 void VM_HeapDumper::do_class_dump(Klass* k) {
-  DumperSupport::dump_class_and_array_classes(writer(), k);
+  if (k->oop_is_instance()) {
+    DumperSupport::dump_class_and_array_classes(writer(), k);
+  }
 }
 
 // writes a HPROF_GC_CLASS_DUMP records for a given basic type
@@ -1722,7 +1724,7 @@
   SymbolTable::symbols_do(&sym_dumper);
 
   // write HPROF_LOAD_CLASS records
-  SystemDictionary::classes_do(&do_load_class);
+  ClassLoaderDataGraph::classes_do(&do_load_class);
   Universe::basic_type_classes_do(&do_load_class);
 
   // write HPROF_FRAME and HPROF_TRACE records
@@ -1733,7 +1735,7 @@
   write_dump_header();
 
   // Writes HPROF_GC_CLASS_DUMP records
-  SystemDictionary::classes_do(&do_class_dump);
+  ClassLoaderDataGraph::classes_do(&do_class_dump);
   Universe::basic_type_classes_do(&do_basic_type_array_class_dump);
   check_segment_length();