--- a/hotspot/src/share/vm/code/compiledMethod.cpp	Mon Jun 20 09:32:44 2016 +0200
+++ b/hotspot/src/share/vm/code/compiledMethod.cpp	Wed Jun 15 09:46:15 2016 +0200
@@ -63,7 +63,7 @@
 bool CompiledMethod::is_deopt_entry(address pc) {
   return pc == deopt_handler_begin()
 #if INCLUDE_JVMCI
-    || pc == (deopt_handler_begin() + NativeCall::instruction_size)
+    || (is_compiled_by_jvmci() && pc == (deopt_handler_begin() + NativeCall::instruction_size))
 #endif
     ;
 }