Mercurial > hg > graal-jvmci-8
diff src/share/vm/code/nmethod.cpp @ 23704:8a7b88cb7f22
back port of JDK-8139379
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Tue, 21 Jun 2016 15:41:01 +0200 |
parents | b5f3a471e646 |
children |
line wrap: on
line diff
--- 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 ; }