1.1 --- a/src/share/vm/oops/klass.hpp Tue Jul 01 09:03:55 2014 +0200
1.2 +++ b/src/share/vm/oops/klass.hpp Mon Jul 07 10:12:40 2014 +0200
1.3 @@ -583,7 +583,10 @@
1.4 // The is_alive closure passed in depends on the Garbage Collector used.
1.5 bool is_loader_alive(BoolObjectClosure* is_alive);
1.6
1.7 - static void clean_weak_klass_links(BoolObjectClosure* is_alive);
1.8 + static void clean_weak_klass_links(BoolObjectClosure* is_alive, bool clean_alive_klasses = true);
1.9 + static void clean_subklass_tree(BoolObjectClosure* is_alive) {
1.10 + clean_weak_klass_links(is_alive, false /* clean_alive_klasses */);
1.11 + }
1.12
1.13 // iterators
1.14 virtual int oop_oop_iterate(oop obj, ExtendedOopClosure* blk) = 0;
1.15 @@ -690,7 +693,7 @@
1.16 private:
1.17 // barriers used by klass_oop_store
1.18 void klass_update_barrier_set(oop v);
1.19 - void klass_update_barrier_set_pre(void* p, oop v);
1.20 + void klass_update_barrier_set_pre(oop* p, oop v);
1.21 };
1.22
1.23 #endif // SHARE_VM_OOPS_KLASS_HPP
