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
7 changes: 0 additions & 7 deletions src/hotspot/cpu/arm/compiledIC_arm.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -105,13 +105,6 @@ void CompiledDirectCall::set_to_interpreted(const methodHandle& callee, address
address stub = find_stub();
guarantee(stub != nullptr, "stub not found");

Copy link
Member

Choose a reason for hiding this comment

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

The other platforms removed the trace logging here. If the ARM porters still want this in at least update to log the correct class name. s/CompiledDirectStaticCall/CompiledDirectCall/

Choose a reason for hiding this comment

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

fixed by removing the trace logging.

{
ResourceMark rm;
log_trace(inlinecache)("CompiledDirectStaticCall@" INTPTR_FORMAT ": set_to_interpreted %s",
p2i(instruction_address()),
callee->name_and_sig_as_C_string());
}

// Creation also verifies the object.
NativeMovConstReg* method_holder = nativeMovConstReg_at(stub);
NativeJump* jump = nativeJump_at(method_holder->next_instruction_address());
Expand Down
4 changes: 1 addition & 3 deletions src/hotspot/cpu/arm/sharedRuntime_arm.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -625,11 +625,9 @@ AdapterHandlerEntry* SharedRuntime::generate_i2c2i_adapters(MacroAssembler *masm
Label skip_fixup;
const Register receiver = R0;
const Register holder_klass = Rtemp; // XXX should be OK for C2 but not 100% sure
const Register receiver_klass = R4;

__ ic_check(1 /* end_alignment */);
__ ldr(Rmethod, Address(receiver_klass, CompiledICData::speculated_method_offset()));

__ ldr(Rmethod, Address(Ricklass, CompiledICData::speculated_method_offset()));

__ ldr(Rtemp, Address(Rmethod, Method::code_offset()), eq);
__ cmp(Rtemp, 0, eq);
Expand Down