archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8212585: Clean up CompiledMethod::oops_reloc_begin()

Browse source 
Reviewed-by: kvn, pliden
This commit is contained in:
Erik Österlund 2018-11-05 12:36:23 +01:00
parent b5d2e875f6
commit 364f0784a4
2 changed files with 15 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/hotspot/share/code/compiledMethod.cpp
View file

@ -293,6 +293,20 @@ address CompiledMethod::oops_reloc_begin() const {
// first few bytes. If an oop in the old code was there, that oop
// should not get GC'd. Skip the first few bytes of oops on
// not-entrant methods.
if (frame_complete_offset() != CodeOffsets::frame_never_safe &&
code_begin() + frame_complete_offset() >
verified_entry_point() + NativeJump::instruction_size)
{
// If we have a frame_complete_offset after the native jump, then there
// is no point trying to look for oops before that. This is a requirement
// for being allowed to scan oops concurrently.
return code_begin() + frame_complete_offset();
}
// It is not safe to read oops concurrently using entry barriers, if their
// location depend on whether the nmethod is entrant or not.
assert(BarrierSet::barrier_set()->barrier_set_nmethod() == NULL, "Not safe oop scan");
address low_boundary = verified_entry_point();
if (!is_in_use() && is_nmethod()) {
low_boundary += NativeJump::instruction_size;