src/share/vm/code/codeCache.cpp

*** 344,354 ****
  
  // Walk the list of methods which might contain non-perm oops.
  void CodeCache::scavenge_root_nmethods_do(CodeBlobToOopClosure* f) {
    assert_locked_or_safepoint(CodeCache_lock);
  
!   if (UseG1GC) {
      return;
    }
  
    const bool fix_relocations = f->fix_relocations();
    debug_only(mark_scavenge_root_nmethods());
--- 344,354 ----
  
  // Walk the list of methods which might contain non-perm oops.
  void CodeCache::scavenge_root_nmethods_do(CodeBlobToOopClosure* f) {
    assert_locked_or_safepoint(CodeCache_lock);
  
!   if (UseG1GC || UseShenandoahGC) {
      return;
    }
  
    const bool fix_relocations = f->fix_relocations();
    debug_only(mark_scavenge_root_nmethods());
*** 389,399 ****
  }
  
  void CodeCache::add_scavenge_root_nmethod(nmethod* nm) {
    assert_locked_or_safepoint(CodeCache_lock);
  
!   if (UseG1GC) {
      return;
    }
  
    nm->set_on_scavenge_root_list();
    nm->set_scavenge_root_link(_scavenge_root_nmethods);
--- 389,399 ----
  }
  
  void CodeCache::add_scavenge_root_nmethod(nmethod* nm) {
    assert_locked_or_safepoint(CodeCache_lock);
  
!   if (UseG1GC || UseShenandoahGC) {
      return;
    }
  
    nm->set_on_scavenge_root_list();
    nm->set_scavenge_root_link(_scavenge_root_nmethods);
*** 420,430 ****
  }
  
  void CodeCache::drop_scavenge_root_nmethod(nmethod* nm) {
    assert_locked_or_safepoint(CodeCache_lock);
  
!   if (UseG1GC) {
      return;
    }
  
    print_trace("drop_scavenge_root", nm);
    nmethod* prev = NULL;
--- 420,430 ----
  }
  
  void CodeCache::drop_scavenge_root_nmethod(nmethod* nm) {
    assert_locked_or_safepoint(CodeCache_lock);
  
!   if (UseG1GC || UseShenandoahGC) {
      return;
    }
  
    print_trace("drop_scavenge_root", nm);
    nmethod* prev = NULL;
*** 439,449 ****
  }
  
  void CodeCache::prune_scavenge_root_nmethods() {
    assert_locked_or_safepoint(CodeCache_lock);
  
!   if (UseG1GC) {
      return;
    }
  
    debug_only(mark_scavenge_root_nmethods());
  
--- 439,449 ----
  }
  
  void CodeCache::prune_scavenge_root_nmethods() {
    assert_locked_or_safepoint(CodeCache_lock);
  
!   if (UseG1GC || UseShenandoahGC) {
      return;
    }
  
    debug_only(mark_scavenge_root_nmethods());
  
*** 471,481 ****
    debug_only(verify_perm_nmethods(NULL));
  }
  
  #ifndef PRODUCT
  void CodeCache::asserted_non_scavengable_nmethods_do(CodeBlobClosure* f) {
!   if (UseG1GC) {
      return;
    }
  
    // While we are here, verify the integrity of the list.
    mark_scavenge_root_nmethods();
--- 471,481 ----
    debug_only(verify_perm_nmethods(NULL));
  }
  
  #ifndef PRODUCT
  void CodeCache::asserted_non_scavengable_nmethods_do(CodeBlobClosure* f) {
!   if (UseG1GC || UseShenandoahGC) {
      return;
    }
  
    // While we are here, verify the integrity of the list.
    mark_scavenge_root_nmethods();
*** 1003,1008 ****
    st->print(" total_blobs='" UINT32_FORMAT "' nmethods='" UINT32_FORMAT "'"
              " adapters='" UINT32_FORMAT "' free_code_cache='" SIZE_FORMAT "'",
              nof_blobs(), nof_nmethods(), nof_adapters(),
              unallocated_capacity());
  }
- 
--- 1003,1007 ----