1.1 --- a/src/share/vm/services/heapDumper.cpp Wed Oct 09 22:01:59 2013 -0400
1.2 +++ b/src/share/vm/services/heapDumper.cpp Fri Oct 11 14:08:02 2013 +0200
1.3 @@ -1545,7 +1545,9 @@
1.4
1.5 // writes a HPROF_GC_CLASS_DUMP record for the given class
1.6 void VM_HeapDumper::do_class_dump(Klass* k) {
1.7 - DumperSupport::dump_class_and_array_classes(writer(), k);
1.8 + if (k->oop_is_instance()) {
1.9 + DumperSupport::dump_class_and_array_classes(writer(), k);
1.10 + }
1.11 }
1.12
1.13 // writes a HPROF_GC_CLASS_DUMP records for a given basic type
1.14 @@ -1722,7 +1724,7 @@
1.15 SymbolTable::symbols_do(&sym_dumper);
1.16
1.17 // write HPROF_LOAD_CLASS records
1.18 - SystemDictionary::classes_do(&do_load_class);
1.19 + ClassLoaderDataGraph::classes_do(&do_load_class);
1.20 Universe::basic_type_classes_do(&do_load_class);
1.21
1.22 // write HPROF_FRAME and HPROF_TRACE records
1.23 @@ -1733,7 +1735,7 @@
1.24 write_dump_header();
1.25
1.26 // Writes HPROF_GC_CLASS_DUMP records
1.27 - SystemDictionary::classes_do(&do_class_dump);
1.28 + ClassLoaderDataGraph::classes_do(&do_class_dump);
1.29 Universe::basic_type_classes_do(&do_basic_type_array_class_dump);
1.30 check_segment_length();
1.31
