--- old/src/cpu/x86/vm/frame_x86.inline.hpp	2015-10-08 07:23:16.000000000 -1000
+++ new/src/cpu/x86/vm/frame_x86.inline.hpp	2015-10-08 07:23:16.000000000 -1000
@@ -78,7 +78,11 @@
     assert(((nmethod*)_cb)->insts_contains(_pc), "original PC must be in nmethod");
     _deopt_state = is_deoptimized;
   } else {
-    _deopt_state = not_deoptimized;
+    if (_cb->is_deoptimization_stub()) {
+      _deopt_state = is_deoptimized;
+    } else {
+      _deopt_state = not_deoptimized;
+    }
   }
 }