# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1466516461 -7200
# Node ID 8a7b88cb7f225053a1f0e9c01cbe674724bd6baa
# Parent  9ac04c6047c87a641f5637f5f1e7764bfc8812f3
back port of JDK-8139379

diff -r 9ac04c6047c8 -r 8a7b88cb7f22 src/share/vm/code/nmethod.cpp
--- a/src/share/vm/code/nmethod.cpp	Tue Jun 21 09:48:02 2016 +0200
+++ b/src/share/vm/code/nmethod.cpp	Tue Jun 21 15:41:01 2016 +0200
@@ -2622,7 +2622,7 @@
 bool nmethod::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
     ;
 }