src/share/vm/gc/shared/vmGCOperations.cpp

*** 28,37 ****
--- 28,38 ----
  #include "gc/shared/allocTracer.hpp"
  #include "gc/shared/gcId.hpp"
  #include "gc/shared/gcLocker.inline.hpp"
  #include "gc/shared/genCollectedHeap.hpp"
  #include "gc/shared/vmGCOperations.hpp"
+ #include "interpreter/oopMapCache.hpp"
  #include "logging/log.hpp"
  #include "memory/oopFactory.hpp"
  #include "runtime/handles.inline.hpp"
  #include "runtime/init.hpp"
  #include "runtime/interfaceSupport.hpp"
*** 109,118 ****
--- 110,122 ----
  }
  
  
  void VM_GC_Operation::doit_epilogue() {
    assert(Thread::current()->is_Java_thread(), "just checking");
+   // Clean up old interpreter OopMap entries that were replaced
+   // during the GC thread root traversal.
+   OopMapCache::cleanup_old_entries();
    if (Universe::has_reference_pending_list()) {
      Heap_lock->notify_all();
    }
    Heap_lock->unlock();
  }