1.1 --- a/src/share/vm/oops/klassKlass.cpp Thu Jan 27 13:42:28 2011 -0800
1.2 +++ b/src/share/vm/oops/klassKlass.cpp Thu Jan 27 16:11:27 2011 -0800
1.3 @@ -37,8 +37,7 @@
1.4 #include "oops/objArrayKlass.hpp"
1.5 #include "oops/oop.inline.hpp"
1.6 #include "oops/oop.inline2.hpp"
1.7 -#include "oops/symbolKlass.hpp"
1.8 -#include "oops/symbolOop.hpp"
1.9 +#include "oops/symbol.hpp"
1.10 #include "oops/typeArrayKlass.hpp"
1.11 #include "runtime/handles.inline.hpp"
1.12 #ifndef SERIALGC
1.13 @@ -70,7 +69,6 @@
1.14 MarkSweep::mark_and_push(k->adr_secondary_super_cache());
1.15 MarkSweep::mark_and_push(k->adr_secondary_supers());
1.16 MarkSweep::mark_and_push(k->adr_java_mirror());
1.17 - MarkSweep::mark_and_push(k->adr_name());
1.18 // We follow the subklass and sibling links at the end of the
1.19 // marking phase, since otherwise following them will prevent
1.20 // class unloading (all classes are transitively linked from
1.21 @@ -90,7 +88,6 @@
1.22 PSParallelCompact::mark_and_push(cm, k->adr_secondary_super_cache());
1.23 PSParallelCompact::mark_and_push(cm, k->adr_secondary_supers());
1.24 PSParallelCompact::mark_and_push(cm, k->adr_java_mirror());
1.25 - PSParallelCompact::mark_and_push(cm, k->adr_name());
1.26 // We follow the subklass and sibling links at the end of the
1.27 // marking phase, since otherwise following them will prevent
1.28 // class unloading (all classes are transitively linked from
1.29 @@ -110,7 +107,6 @@
1.30 blk->do_oop(k->adr_secondary_super_cache());
1.31 blk->do_oop(k->adr_secondary_supers());
1.32 blk->do_oop(k->adr_java_mirror());
1.33 - blk->do_oop(k->adr_name());
1.34 // The following are in the perm gen and are treated
1.35 // specially in a later phase of a perm gen collection; ...
1.36 assert(oop(k)->is_perm(), "should be in perm");
1.37 @@ -144,8 +140,6 @@
1.38 if (mr.contains(adr)) blk->do_oop(adr);
1.39 adr = k->adr_java_mirror();
1.40 if (mr.contains(adr)) blk->do_oop(adr);
1.41 - adr = k->adr_name();
1.42 - if (mr.contains(adr)) blk->do_oop(adr);
1.43 // The following are "weak links" in the perm gen and are
1.44 // treated specially in a later phase of a perm gen collection.
1.45 assert(oop(k)->is_perm(), "should be in perm");
1.46 @@ -174,7 +168,6 @@
1.47 MarkSweep::adjust_pointer(k->adr_secondary_super_cache());
1.48 MarkSweep::adjust_pointer(k->adr_secondary_supers());
1.49 MarkSweep::adjust_pointer(k->adr_java_mirror());
1.50 - MarkSweep::adjust_pointer(k->adr_name());
1.51 MarkSweep::adjust_pointer(k->adr_subklass());
1.52 MarkSweep::adjust_pointer(k->adr_next_sibling());
1.53 return size;
1.54 @@ -256,9 +249,4 @@
1.55 guarantee(k->java_mirror()->is_perm(), "should be in permspace");
1.56 guarantee(k->java_mirror()->is_instance(), "should be instance");
1.57 }
1.58 - if (k->name() != NULL) {
1.59 - guarantee(Universe::heap()->is_in_permanent(k->name()),
1.60 - "should be in permspace");
1.61 - guarantee(k->name()->is_symbol(), "should be symbol");
1.62 - }
1.63 }
