1.1 --- a/src/share/vm/gc_implementation/g1/heapRegion.cpp Fri Aug 29 13:08:01 2014 +0200 1.2 +++ b/src/share/vm/gc_implementation/g1/heapRegion.cpp Fri Aug 29 13:12:21 2014 +0200 1.3 @@ -549,21 +549,17 @@ 1.4 hrrs->add_strong_code_root(nm); 1.5 } 1.6 1.7 +void HeapRegion::add_strong_code_root_locked(nmethod* nm) { 1.8 + assert_locked_or_safepoint(CodeCache_lock); 1.9 + HeapRegionRemSet* hrrs = rem_set(); 1.10 + hrrs->add_strong_code_root_locked(nm); 1.11 +} 1.12 + 1.13 void HeapRegion::remove_strong_code_root(nmethod* nm) { 1.14 HeapRegionRemSet* hrrs = rem_set(); 1.15 hrrs->remove_strong_code_root(nm); 1.16 } 1.17 1.18 -void HeapRegion::migrate_strong_code_roots() { 1.19 - assert(in_collection_set(), "only collection set regions"); 1.20 - assert(!isHumongous(), 1.21 - err_msg("humongous region "HR_FORMAT" should not have been added to collection set", 1.22 - HR_FORMAT_PARAMS(this))); 1.23 - 1.24 - HeapRegionRemSet* hrrs = rem_set(); 1.25 - hrrs->migrate_strong_code_roots(); 1.26 -} 1.27 - 1.28 void HeapRegion::strong_code_roots_do(CodeBlobClosure* blk) const { 1.29 HeapRegionRemSet* hrrs = rem_set(); 1.30 hrrs->strong_code_roots_do(blk);