*** old/src/share/vm/code/nmethod.cpp	Tue Sep 23 14:30:53 2014
--- new/src/share/vm/code/nmethod.cpp	Tue Sep 23 14:30:52 2014

*** 1128,1137 ****
--- 1128,1149 ----
    while (iter.next()) {
      iter.reloc()->clear_inline_cache();
    }
  }
  
+ // Clear ICStubs of all compiled ICs
+ void nmethod::clear_ic_stubs() {
+   assert_locked_or_safepoint(CompiledIC_lock);
+   RelocIterator iter(this);
+   while(iter.next()) {
+     if (iter.type() == relocInfo::virtual_call_type) {
+       CompiledIC* ic = CompiledIC_at(&iter);
+       ic->clear_ic_stub();
+     }
+   }
+ }
+ 
  
  void nmethod::cleanup_inline_caches() {
  
    assert_locked_or_safepoint(CompiledIC_lock);
  

*** 1491,1500 ****
--- 1503,1514 ----
          Universe::heap()->unregister_nmethod(this);
        }
        flush_dependencies(NULL);
      }
  
+ 
+ 
      // zombie only - if a JVMTI agent has enabled the CompiledMethodUnload
      // event and it hasn't already been reported for this nmethod then
      // report it now. The event may have been reported earilier if the GC
      // marked it for unloading). JvmtiDeferredEventQueue support means
      // we no longer go to a safepoint here.