Mercurial > hg > truffle
diff src/share/vm/classfile/systemDictionary.cpp @ 20278:2c6ef90f030a
8049421: G1 Class Unloading after completing a concurrent mark cycle
Reviewed-by: tschatzl, ehelin, brutisso, coleenp, roland, iveresov
Contributed-by: stefan.karlsson@oracle.com, mikael.gerdin@oracle.com
| author | stefank |
|---|---|
| date | Mon, 07 Jul 2014 10:12:40 +0200 |
| parents | ce8f6bb717c9 |
| children | c3990b8c710e |
line wrap: on
line diff
--- a/src/share/vm/classfile/systemDictionary.cpp Tue Jul 01 09:03:55 2014 +0200 +++ b/src/share/vm/classfile/systemDictionary.cpp Mon Jul 07 10:12:40 2014 +0200 @@ -1613,13 +1613,7 @@ // system dictionary and follows the remaining classes' contents. void SystemDictionary::always_strong_oops_do(OopClosure* blk) { - blk->do_oop(&_java_system_loader); - blk->do_oop(&_system_loader_lock_obj); - - dictionary()->always_strong_oops_do(blk); - - // Visit extra methods - invoke_method_table()->oops_do(blk); + roots_oops_do(blk, NULL); } void SystemDictionary::always_strong_classes_do(KlassClosure* closure) { @@ -1686,6 +1680,17 @@ return unloading_occurred; } +void SystemDictionary::roots_oops_do(OopClosure* strong, OopClosure* weak) { + strong->do_oop(&_java_system_loader); + strong->do_oop(&_system_loader_lock_obj); + + // Adjust dictionary + dictionary()->roots_oops_do(strong, weak); + + // Visit extra methods + invoke_method_table()->oops_do(strong); +} + void SystemDictionary::oops_do(OopClosure* f) { f->do_oop(&_java_system_loader); f->do_oop(&_system_loader_lock_obj);