*** old/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp	Fri Feb 10 12:58:05 2012
--- new/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp	Fri Feb 10 12:58:05 2012

*** 22,31 ****
--- 22,32 ----
   *
   */
  
  #include "precompiled.hpp"
  #include "classfile/symbolTable.hpp"
+ #include "code/codeCache.hpp"
  #include "gc_implementation/parallelScavenge/cardTableExtension.hpp"
  #include "gc_implementation/parallelScavenge/gcTaskManager.hpp"
  #include "gc_implementation/parallelScavenge/generationSizer.hpp"
  #include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp"
  #include "gc_implementation/parallelScavenge/psAdaptiveSizePolicy.hpp"

*** 98,108 ****
--- 99,109 ----
      assert ((oopDesc::load_decode_heap_oop_not_null(p))->is_oop(),
              "expected an oop while scanning weak refs");
  
      // Weak refs may be visited more than once.
      if (PSScavenge::should_scavenge(p, _to_space)) {
!       PSScavenge::copy_and_push_safe_barrier<T, /*promote_immediately=*/false>(_promotion_manager, p);
      }
    }
    virtual void do_oop(oop* p)       { PSKeepAliveClosure::do_oop_work(p); }
    virtual void do_oop(narrowOop* p) { PSKeepAliveClosure::do_oop_work(p); }
  };

*** 450,460 ****
--- 451,461 ----
  
      if (!JavaObjectsInPerm) {
        // Unlink any dead interned Strings
        StringTable::unlink(&_is_alive_closure);
        // Process the remaining live ones
!       PSScavengeRootsClosure</*promote_immediately=*/false> root_closure(promotion_manager);
        StringTable::oops_do(&root_closure);
      }
  
      // Finally, flush the promotion_manager's labs, and deallocate its stacks.
      PSPromotionManager::post_scavenge();

*** 600,609 ****
--- 601,612 ----
  
      COMPILER2_PRESENT(DerivedPointerTable::update_pointers());
  
      NOT_PRODUCT(reference_processor()->verify_no_references_recorded());
  
+     CodeCache::prune_scavenge_root_nmethods();
+ 
      // Re-verify object start arrays
      if (VerifyObjectStartArray &&
          VerifyAfterGC) {
        old_gen->verify_object_start_array();
        perm_gen->verify_object_start_array();