Mercurial > hg > graal-jvmci-8
comparison src/share/vm/classfile/systemDictionary.cpp @ 20806:6ee9b878902b
Fix merge mess-ups
author | Gilles Duboscq <gilles.m.duboscq@oracle.com> |
---|---|
date | Tue, 07 Apr 2015 18:57:02 +0200 |
parents | 7848fc12602b |
children | be896a1983c0 |
comparison
equal
deleted
inserted
replaced
20805:379471b334cb | 20806:6ee9b878902b |
---|---|
1726 | 1726 |
1727 void SystemDictionary::roots_oops_do(OopClosure* strong, OopClosure* weak) { | 1727 void SystemDictionary::roots_oops_do(OopClosure* strong, OopClosure* weak) { |
1728 strong->do_oop(&_java_system_loader); | 1728 strong->do_oop(&_java_system_loader); |
1729 strong->do_oop(&_system_loader_lock_obj); | 1729 strong->do_oop(&_system_loader_lock_obj); |
1730 CDS_ONLY(SystemDictionaryShared::roots_oops_do(strong);) | 1730 CDS_ONLY(SystemDictionaryShared::roots_oops_do(strong);) |
1731 GRAAL_ONLY(blk->do_oop(&_graal_loader);) | 1731 GRAAL_ONLY(strong->do_oop(&_graal_loader);) |
1732 | 1732 |
1733 // Adjust dictionary | 1733 // Adjust dictionary |
1734 dictionary()->roots_oops_do(strong, weak); | 1734 dictionary()->roots_oops_do(strong, weak); |
1735 | 1735 |
1736 // Visit extra methods | 1736 // Visit extra methods |