--- old/src/share/vm/prims/whitebox.cpp	2014-10-24 13:42:10.070562019 +0200
+++ new/src/share/vm/prims/whitebox.cpp	2014-10-24 13:42:09.934562024 +0200
@@ -388,11 +388,10 @@
   methodHandle mh(THREAD, Method::checked_resolve_jmethod_id(jmid));
   nmethod* code;
   if (is_osr) {
-    int bci = InvocationEntryBci;
-    while ((code = mh->lookup_osr_nmethod_for(bci, CompLevel_none, false)) != NULL) {
+    // Mark all OSR compiled versions for deoptimization
+    while ((code = mh->lookup_osr_nmethod_for(InvocationEntryBci, CompLevel_none, false, true)) != NULL) {
       code->mark_for_deoptimization();
       ++result;
-      bci = code->osr_entry_bci() + 1;
     }
   } else {
     code = mh->code();