Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp	Tue Jul 01 09:03:55 2014 +0200
     1.2 +++ b/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp	Mon Jul 07 10:12:40 2014 +0200
     1.3 @@ -929,7 +929,10 @@
     1.4  
     1.5  void HeapRegionRemSet::remove_strong_code_root(nmethod* nm) {
     1.6    assert(nm != NULL, "sanity");
     1.7 -  _code_roots.remove(nm);
     1.8 +  assert_locked_or_safepoint(CodeCache_lock);
     1.9 +
    1.10 +  _code_roots.remove_lock_free(nm);
    1.11 +
    1.12    // Check that there were no duplicates
    1.13    guarantee(!_code_roots.contains(nm), "duplicate entry found");
    1.14  }