# HG changeset patch # User bharadwaj # Date 1396638778 14400 # Node ID 9c995f1e7b73cda36d420eb8efc1e7f9a10b803e # Parent 35f998f35ed70bca8fb6352b2603b501e0573d90# Parent 4be81d917c8498292ba22f1864269efc02006b33 Merge diff -r 35f998f35ed7 -r 9c995f1e7b73 hotspot/src/share/vm/runtime/sharedRuntime.cpp --- a/hotspot/src/share/vm/runtime/sharedRuntime.cpp Fri Apr 04 10:24:48 2014 +0200 +++ b/hotspot/src/share/vm/runtime/sharedRuntime.cpp Fri Apr 04 15:12:58 2014 -0400 @@ -1268,8 +1268,6 @@ } #endif if (is_virtual) { - nmethod* nm = callee_nm; - if (nm == NULL) CodeCache::find_blob(caller_frame.pc()); CompiledIC* inline_cache = CompiledIC_before(caller_nm, caller_frame.pc()); if (inline_cache->is_clean()) { inline_cache->set_to_monomorphic(virtual_call_info);