src/hotspot/share/code/relocInfo.cpp

   assert(m != NULL || _method_index == 0, "should be non-null for non-zero index");
   assert(m == NULL || m->is_method(), "not a method");
   return (Method*)m;
 }
 
+template<typename CompiledICorStaticCall>
+static bool set_to_clean_no_ic_refill(CompiledICorStaticCall* ic) {
+  guarantee(ic->set_to_clean(), "Should not need transition stubs");
+  return true;
+}
+
 bool opt_virtual_call_Relocation::clear_inline_cache() {
   // No stubs for ICs
   // Clean IC
   ResourceMark rm;
   CompiledIC* icache = CompiledIC_at(this);
-  guarantee(icache->set_to_clean(),
-            "Should not need transition stubs");
-  return true;
+  return set_to_clean_no_ic_refill(icache);
 }
 
-
 address opt_virtual_call_Relocation::static_stub(bool is_aot) {
   // search for the static stub who points back to this static call
   address static_call_addr = addr();
   RelocIterator iter(code());
   while (iter.next()) {

@@ -718,13 +721,11
 }
 
 bool static_call_Relocation::clear_inline_cache() {
   // Safe call site info
   CompiledStaticCall* handler = this->code()->compiledStaticCall_at(this);
-  guarantee(handler->set_to_clean(),
-            "Should not need transition stubs");
-  return true;
+  return set_to_clean_no_ic_refill(handler);
 }
 
 
 address static_call_Relocation::static_stub(bool is_aot) {
   // search for the static stub who points back to this static call