Skip to content
This repository has been archived by the owner on Feb 2, 2023. It is now read-only.

Commit

Permalink
8297027: Fix broken aarch64 build of 13u/15u after bad backport of 82…
Browse files Browse the repository at this point in the history
…93044

Reviewed-by: bae
  • Loading branch information
Yuri Nesterenko committed Nov 15, 2022
1 parent 28bd3a8 commit a38104e
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions src/hotspot/share/c1/c1_Runtime1.cpp
Expand Up @@ -1257,8 +1257,6 @@ JRT_END

#else // DEOPTIMIZE_WHEN_PATCHING

<<<<<<< HEAD
=======
static bool is_patching_needed(JavaThread* current, Runtime1::StubID stub_id) {
if (stub_id == Runtime1::load_klass_patching_id ||
stub_id == Runtime1::load_mirror_patching_id) {
Expand Down Expand Up @@ -1301,7 +1299,7 @@ JRT_ENTRY(void, Runtime1::patch_code(JavaThread* thread, Runtime1::StubID stub_i
frame runtime_frame = thread->last_frame();
frame caller_frame = runtime_frame.sender(&reg_map);

if (is_patching_needed(current, stub_id)) {
if (is_patching_needed(thread, stub_id)) {
// Make sure the nmethod is invalidated, i.e. made not entrant.
nmethod* nm = CodeCache::find_nmethod(caller_frame.pc());
if (nm != NULL) {
Expand Down

1 comment on commit a38104e

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.