1.1 --- a/src/share/vm/services/heapDumper.cpp Fri Nov 09 22:22:53 2012 -0800
1.2 +++ b/src/share/vm/services/heapDumper.cpp Mon Nov 12 16:15:05 2012 -0500
1.3 @@ -879,7 +879,7 @@
1.4 writer->write_u4(STACK_TRACE_ID);
1.5
1.6 // class ID
1.7 - writer->write_classID(Klass::cast(k));
1.8 + writer->write_classID(k);
1.9
1.10 // number of bytes that follow
1.11 writer->write_u4(instance_size(k) );
1.12 @@ -891,7 +891,7 @@
1.13 // creates HPROF_GC_CLASS_DUMP record for the given class and each of
1.14 // its array classes
1.15 void DumperSupport::dump_class_and_array_classes(DumpWriter* writer, Klass* k) {
1.16 - Klass* klass = Klass::cast(k);
1.17 + Klass* klass = k;
1.18 assert(klass->oop_is_instance(), "not an InstanceKlass");
1.19 InstanceKlass* ik = (InstanceKlass*)klass;
1.20
1.21 @@ -906,7 +906,7 @@
1.22 if (java_super == NULL) {
1.23 writer->write_objectID(oop(NULL));
1.24 } else {
1.25 - writer->write_classID(Klass::cast(java_super));
1.26 + writer->write_classID(java_super);
1.27 }
1.28
1.29 writer->write_objectID(ik->class_loader());
1.30 @@ -932,7 +932,7 @@
1.31 // array classes
1.32 k = klass->array_klass_or_null();
1.33 while (k != NULL) {
1.34 - Klass* klass = Klass::cast(k);
1.35 + Klass* klass = k;
1.36 assert(klass->oop_is_objArray(), "not an ObjArrayKlass");
1.37
1.38 writer->write_u1(HPROF_GC_CLASS_DUMP);
1.39 @@ -942,7 +942,7 @@
1.40 // super class of array classes is java.lang.Object
1.41 java_super = klass->java_super();
1.42 assert(java_super != NULL, "checking");
1.43 - writer->write_classID(Klass::cast(java_super));
1.44 + writer->write_classID(java_super);
1.45
1.46 writer->write_objectID(ik->class_loader());
1.47 writer->write_objectID(ik->signers());
1.48 @@ -965,7 +965,7 @@
1.49 void DumperSupport::dump_basic_type_array_class(DumpWriter* writer, Klass* k) {
1.50 // array classes
1.51 while (k != NULL) {
1.52 - Klass* klass = Klass::cast(k);
1.53 + Klass* klass = k;
1.54
1.55 writer->write_u1(HPROF_GC_CLASS_DUMP);
1.56 writer->write_classID(klass);
1.57 @@ -974,7 +974,7 @@
1.58 // super class of array classes is java.lang.Object
1.59 Klass* java_super = klass->java_super();
1.60 assert(java_super != NULL, "checking");
1.61 - writer->write_classID(Klass::cast(java_super));
1.62 + writer->write_classID(java_super);
1.63
1.64 writer->write_objectID(oop(NULL)); // loader
1.65 writer->write_objectID(oop(NULL)); // signers
1.66 @@ -1001,7 +1001,7 @@
1.67 writer->write_u4((u4)array->length());
1.68
1.69 // array class ID
1.70 - writer->write_classID(Klass::cast(array->klass()));
1.71 + writer->write_classID(array->klass());
1.72
1.73 // [id]* elements
1.74 for (int index=0; index<array->length(); index++) {
1.75 @@ -1525,7 +1525,7 @@
1.76 writer()->write_u4(++class_serial_num);
1.77
1.78 // class ID
1.79 - Klass* klass = Klass::cast(k);
1.80 + Klass* klass = k;
1.81 writer()->write_classID(klass);
1.82
1.83 // add the Klass* and class serial number pair
1.84 @@ -1796,7 +1796,7 @@
1.85 // write fake frame that makes it look like the thread, which caused OOME,
1.86 // is in the OutOfMemoryError zero-parameter constructor
1.87 if (thread == _oome_thread && _oome_constructor != NULL) {
1.88 - int oome_serial_num = _klass_map->find(Klass::cast(_oome_constructor->method_holder()));
1.89 + int oome_serial_num = _klass_map->find(_oome_constructor->method_holder());
1.90 // the class serial number starts from 1
1.91 assert(oome_serial_num > 0, "OutOfMemoryError class not found");
1.92 DumperSupport::dump_stack_frame(writer(), ++frame_serial_num, oome_serial_num,
1.93 @@ -1806,7 +1806,7 @@
1.94 for (int j=0; j < depth; j++) {
1.95 StackFrameInfo* frame = stack_trace->stack_frame_at(j);
1.96 Method* m = frame->method();
1.97 - int class_serial_num = _klass_map->find(Klass::cast(m->method_holder()));
1.98 + int class_serial_num = _klass_map->find(m->method_holder());
1.99 // the class serial number starts from 1
1.100 assert(class_serial_num > 0, "class not found");
1.101 DumperSupport::dump_stack_frame(writer(), ++frame_serial_num, class_serial_num, m, frame->bci());
