Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8139379: Tests fail with assert(nm->insts_contains(original_pc)) failed: original PC must be in nmethod
authorrbackman
Wed, 15 Jun 2016 09:46:15 +0200
changeset 39430 ab7acda033f4
parent 39429 2c9cde29cd3f
child 39431 cb1b2538c4b2
8139379: Tests fail with assert(nm->insts_contains(original_pc)) failed: original PC must be in nmethod Reviewed-by: mgronlun, neliasso
hotspot/src/share/vm/code/compiledMethod.cpp file | annotate | diff | comparison | revisions 
--- 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
     ;
 }
jdk-sandbox