1.1 --- a/src/share/vm/prims/whitebox.cpp Wed Nov 05 08:35:02 2014 +0000 1.2 +++ b/src/share/vm/prims/whitebox.cpp Thu Oct 30 13:03:30 2014 +0100 1.3 @@ -404,19 +404,10 @@ 1.4 CHECK_JNI_EXCEPTION_(env, result); 1.5 MutexLockerEx mu(Compile_lock); 1.6 methodHandle mh(THREAD, Method::checked_resolve_jmethod_id(jmid)); 1.7 - nmethod* code; 1.8 if (is_osr) { 1.9 - int bci = InvocationEntryBci; 1.10 - while ((code = mh->lookup_osr_nmethod_for(bci, CompLevel_none, false)) != NULL) { 1.11 - code->mark_for_deoptimization(); 1.12 - ++result; 1.13 - bci = code->osr_entry_bci() + 1; 1.14 - } 1.15 - } else { 1.16 - code = mh->code(); 1.17 - } 1.18 - if (code != NULL) { 1.19 - code->mark_for_deoptimization(); 1.20 + result += mh->mark_osr_nmethods(); 1.21 + } else if (mh->code() != NULL) { 1.22 + mh->code()->mark_for_deoptimization(); 1.23 ++result; 1.24 } 1.25 result += CodeCache::mark_for_deoptimization(mh());