Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1537,6 +1537,7 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
__ verify_oop(receiver);
__ ic_check(8 /* end_alignment */);

// Verified entry point must be aligned
int vep_offset = ((intptr_t)__ pc()) - start;

// If we have to make this method not-entrant we'll overwrite its
Expand All @@ -1551,8 +1552,6 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
__ clinit_barrier(rscratch2, rscratch1, &L_skip_barrier);
__ far_jump(RuntimeAddress(SharedRuntime::get_handle_wrong_method_stub()));

// Verified entry point must be aligned

__ bind(L_skip_barrier);
}

Expand Down
1 change: 1 addition & 0 deletions src/hotspot/cpu/arm/sharedRuntime_arm.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -820,6 +820,7 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
// Inline cache check
__ ic_check(CodeEntryAlignment /* end_alignment */);

// Verified entry point
int vep_offset = __ pc() - start;
Copy link
Member

Choose a reason for hiding this comment

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

Maybe add back
// Verified entry point
above this line.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sure.


if ((InlineObjectHash && method->intrinsic_id() == vmIntrinsics::_hashCode) || (method->intrinsic_id() == vmIntrinsics::_identityHashCode)) {
Expand Down