1.1 --- a/src/share/vm/oops/instanceKlassKlass.cpp Thu Jan 27 13:42:28 2011 -0800
1.2 +++ b/src/share/vm/oops/instanceKlassKlass.cpp Thu Jan 27 16:11:27 2011 -0800
1.3 @@ -37,7 +37,7 @@
1.4 #include "oops/objArrayOop.hpp"
1.5 #include "oops/oop.inline.hpp"
1.6 #include "oops/oop.inline2.hpp"
1.7 -#include "oops/symbolOop.hpp"
1.8 +#include "oops/symbol.hpp"
1.9 #include "oops/typeArrayOop.hpp"
1.10 #include "prims/jvmtiExport.hpp"
1.11 #include "runtime/fieldDescriptor.hpp"
1.12 @@ -101,13 +101,10 @@
1.13 MarkSweep::mark_and_push(ik->adr_fields());
1.14 MarkSweep::mark_and_push(ik->adr_constants());
1.15 MarkSweep::mark_and_push(ik->adr_class_loader());
1.16 - MarkSweep::mark_and_push(ik->adr_source_file_name());
1.17 - MarkSweep::mark_and_push(ik->adr_source_debug_extension());
1.18 MarkSweep::mark_and_push(ik->adr_inner_classes());
1.19 MarkSweep::mark_and_push(ik->adr_protection_domain());
1.20 MarkSweep::mark_and_push(ik->adr_host_klass());
1.21 MarkSweep::mark_and_push(ik->adr_signers());
1.22 - MarkSweep::mark_and_push(ik->adr_generic_signature());
1.23 MarkSweep::mark_and_push(ik->adr_bootstrap_method());
1.24 MarkSweep::mark_and_push(ik->adr_class_annotations());
1.25 MarkSweep::mark_and_push(ik->adr_fields_annotations());
1.26 @@ -142,13 +139,10 @@
1.27 PSParallelCompact::mark_and_push(cm, ik->adr_fields());
1.28 PSParallelCompact::mark_and_push(cm, ik->adr_constants());
1.29 PSParallelCompact::mark_and_push(cm, ik->adr_class_loader());
1.30 - PSParallelCompact::mark_and_push(cm, ik->adr_source_file_name());
1.31 - PSParallelCompact::mark_and_push(cm, ik->adr_source_debug_extension());
1.32 PSParallelCompact::mark_and_push(cm, ik->adr_inner_classes());
1.33 PSParallelCompact::mark_and_push(cm, ik->adr_protection_domain());
1.34 PSParallelCompact::mark_and_push(cm, ik->adr_host_klass());
1.35 PSParallelCompact::mark_and_push(cm, ik->adr_signers());
1.36 - PSParallelCompact::mark_and_push(cm, ik->adr_generic_signature());
1.37 PSParallelCompact::mark_and_push(cm, ik->adr_bootstrap_method());
1.38 PSParallelCompact::mark_and_push(cm, ik->adr_class_annotations());
1.39 PSParallelCompact::mark_and_push(cm, ik->adr_fields_annotations());
1.40 @@ -189,13 +183,10 @@
1.41 blk->do_oop(ik->adr_protection_domain());
1.42 blk->do_oop(ik->adr_host_klass());
1.43 blk->do_oop(ik->adr_signers());
1.44 - blk->do_oop(ik->adr_source_file_name());
1.45 - blk->do_oop(ik->adr_source_debug_extension());
1.46 blk->do_oop(ik->adr_inner_classes());
1.47 for (int i = 0; i < instanceKlass::implementors_limit; i++) {
1.48 blk->do_oop(&ik->adr_implementors()[i]);
1.49 }
1.50 - blk->do_oop(ik->adr_generic_signature());
1.51 blk->do_oop(ik->adr_bootstrap_method());
1.52 blk->do_oop(ik->adr_class_annotations());
1.53 blk->do_oop(ik->adr_fields_annotations());
1.54 @@ -245,18 +236,12 @@
1.55 if (mr.contains(adr)) blk->do_oop(adr);
1.56 adr = ik->adr_signers();
1.57 if (mr.contains(adr)) blk->do_oop(adr);
1.58 - adr = ik->adr_source_file_name();
1.59 - if (mr.contains(adr)) blk->do_oop(adr);
1.60 - adr = ik->adr_source_debug_extension();
1.61 - if (mr.contains(adr)) blk->do_oop(adr);
1.62 adr = ik->adr_inner_classes();
1.63 if (mr.contains(adr)) blk->do_oop(adr);
1.64 adr = ik->adr_implementors();
1.65 for (int i = 0; i < instanceKlass::implementors_limit; i++) {
1.66 if (mr.contains(&adr[i])) blk->do_oop(&adr[i]);
1.67 }
1.68 - adr = ik->adr_generic_signature();
1.69 - if (mr.contains(adr)) blk->do_oop(adr);
1.70 adr = ik->adr_bootstrap_method();
1.71 if (mr.contains(adr)) blk->do_oop(adr);
1.72 adr = ik->adr_class_annotations();
1.73 @@ -296,13 +281,10 @@
1.74 MarkSweep::adjust_pointer(ik->adr_protection_domain());
1.75 MarkSweep::adjust_pointer(ik->adr_host_klass());
1.76 MarkSweep::adjust_pointer(ik->adr_signers());
1.77 - MarkSweep::adjust_pointer(ik->adr_source_file_name());
1.78 - MarkSweep::adjust_pointer(ik->adr_source_debug_extension());
1.79 MarkSweep::adjust_pointer(ik->adr_inner_classes());
1.80 for (int i = 0; i < instanceKlass::implementors_limit; i++) {
1.81 MarkSweep::adjust_pointer(&ik->adr_implementors()[i]);
1.82 }
1.83 - MarkSweep::adjust_pointer(ik->adr_generic_signature());
1.84 MarkSweep::adjust_pointer(ik->adr_bootstrap_method());
1.85 MarkSweep::adjust_pointer(ik->adr_class_annotations());
1.86 MarkSweep::adjust_pointer(ik->adr_fields_annotations());
1.87 @@ -452,6 +434,8 @@
1.88 ik->set_signers(NULL);
1.89 ik->set_source_file_name(NULL);
1.90 ik->set_source_debug_extension(NULL);
1.91 + ik->set_source_debug_extension(NULL);
1.92 + ik->set_array_name(NULL);
1.93 ik->set_inner_classes(NULL);
1.94 ik->set_static_oop_field_size(0);
1.95 ik->set_nonstatic_field_size(0);
1.96 @@ -667,7 +651,7 @@
1.97 #endif
1.98 // Verify that klass is present in SystemDictionary
1.99 if (ik->is_loaded() && !ik->is_anonymous()) {
1.100 - symbolHandle h_name (thread, ik->name());
1.101 + Symbol* h_name = ik->name();
1.102 Handle h_loader (thread, ik->class_loader());
1.103 Handle h_obj(thread, obj);
1.104 SystemDictionary::verify_obj_klass_present(h_obj, h_name, h_loader);
1.105 @@ -793,14 +777,6 @@
1.106 guarantee(ik->constants()->is_constantPool(), "should be constant pool");
1.107 guarantee(ik->inner_classes()->is_perm(), "should be in permspace");
1.108 guarantee(ik->inner_classes()->is_typeArray(), "should be type array");
1.109 - if (ik->source_file_name() != NULL) {
1.110 - guarantee(ik->source_file_name()->is_perm(), "should be in permspace");
1.111 - guarantee(ik->source_file_name()->is_symbol(), "should be symbol");
1.112 - }
1.113 - if (ik->source_debug_extension() != NULL) {
1.114 - guarantee(ik->source_debug_extension()->is_perm(), "should be in permspace");
1.115 - guarantee(ik->source_debug_extension()->is_symbol(), "should be symbol");
1.116 - }
1.117 if (ik->protection_domain() != NULL) {
1.118 guarantee(ik->protection_domain()->is_oop(), "should be oop");
1.119 }
1.120 @@ -810,10 +786,6 @@
1.121 if (ik->signers() != NULL) {
1.122 guarantee(ik->signers()->is_objArray(), "should be obj array");
1.123 }
1.124 - if (ik->generic_signature() != NULL) {
1.125 - guarantee(ik->generic_signature()->is_perm(), "should be in permspace");
1.126 - guarantee(ik->generic_signature()->is_symbol(), "should be symbol");
1.127 - }
1.128 if (ik->class_annotations() != NULL) {
1.129 guarantee(ik->class_annotations()->is_typeArray(), "should be type array");
1.130 }
