archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 23:04:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8139379: Tests fail with assert(nm->insts_contains(original_pc)) failed: original PC must be in nmethod

Browse source 
Reviewed-by: mgronlun, neliasso
This commit is contained in:
Rickard Bäckman 2016-06-15 09:46:15 +02:00
parent 6294f0770b
commit 14621ff60c
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hotspot/src/share/vm/code/compiledMethod.cpp
View file

@ -63,7 +63,7 @@ bool CompiledMethod::is_method_handle_return(address return_pc) {
bool CompiledMethod::is_deopt_entry(address pc) { bool CompiledMethod::is_deopt_entry(address pc) {
return pc == deopt_handler_begin() return pc == deopt_handler_begin()
#if INCLUDE_JVMCI #if INCLUDE_JVMCI
|| pc == (deopt_handler_begin() + NativeCall::instruction_size) || (is_compiled_by_jvmci() && pc == (deopt_handler_begin() + NativeCall::instruction_size))
#endif #endif
; ;
} }