Skip to content

8280283: Dead compiler code found during the JDK-8272058 code review #28473

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+2 −21
Open

8280283: Dead compiler code found during the JDK-8272058 code review #28473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1aeaa89
Remove dead code
anton-seoane Nov 21, 2025
749eda7
Remove more dead code
anton-seoane Nov 25, 2025
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/aarch64/macroAssembler_aarch64.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,13 +515,6 @@ int MacroAssembler::patch_narrow_klass(address insn_addr, narrowKlass n) {
return 2 * NativeInstruction::instruction_size;
}

address MacroAssembler::target_addr_for_insn_or_null(address insn_addr) {
if (NativeInstruction::is_ldrw_to_zr(insn_addr)) {
return nullptr;
}
return MacroAssembler::target_addr_for_insn(insn_addr);
}

void MacroAssembler::safepoint_poll(Label& slow_path, bool at_return, bool in_nmethod, Register tmp) {
ldr(tmp, Address(rthread, JavaThread::polling_word_offset()));
if (at_return) {
Expand Down
1 change: 0 additions & 1 deletion src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -678,7 +678,6 @@ class MacroAssembler: public Assembler {
static bool uses_implicit_null_check(void* address);

static address target_addr_for_insn(address insn_addr);
static address target_addr_for_insn_or_null(address insn_addr);

// Required platform-specific helpers for Label::patch_instructions.
// They _shadow_ the declarations in AbstractAssembler, which are undefined.
Expand Down
4 changes: 2 additions & 2 deletions src/hotspot/cpu/aarch64/nativeInst_aarch64.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ void NativeMovRegMem::set_offset(int x) {

void NativeMovRegMem::verify() {
#ifdef ASSERT
address dest = MacroAssembler::target_addr_for_insn_or_null(instruction_address());
address dest = MacroAssembler::target_addr_for_insn(instruction_address());
#endif
}

Expand All @@ -213,7 +213,7 @@ void NativeMovRegMem::verify() {
void NativeJump::verify() { ; }

address NativeJump::jump_destination() const {
address dest = MacroAssembler::target_addr_for_insn_or_null(instruction_address());
address dest = MacroAssembler::target_addr_for_insn(instruction_address());

// We use jump to self as the unresolved address which the inline
// cache code (and relocs) know about
Expand Down
11 changes: 0 additions & 11 deletions src/hotspot/cpu/aarch64/nativeInst_aarch64.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,8 @@ class NativeInstruction {
return (encoding() & 0xff000000) == 0x10000000;
}

inline bool is_nop() const;
bool is_jump();
bool is_general_jump();
inline bool is_jump_or_nop();
inline bool is_cond_jump();
bool is_safepoint_poll();
bool is_movz();
Expand Down Expand Up @@ -395,11 +393,6 @@ class NativeIllegalInstruction: public NativeInstruction {
static void insert(address code_pos);
};

inline bool NativeInstruction::is_nop() const{
uint32_t insn = *(uint32_t*)addr_at(0);
return insn == 0xd503201f;
}

inline bool NativeInstruction::is_jump() {
uint32_t insn = *(uint32_t*)addr_at(0);

Expand All @@ -419,10 +412,6 @@ inline bool NativeInstruction::is_jump() {
return false;
}

inline bool NativeInstruction::is_jump_or_nop() {
return is_nop() || is_jump();
}

// Call trampoline stubs.
class NativeCallTrampolineStub : public NativeInstruction {
public:
Expand Down