Skip to content

[BOLT][AArch64] Check Last Element Instead of Returning nullptr in lookupStubFromGroup #114015

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

Merged
merged 2 commits into from
Dec 16, 2024
Merged

[BOLT][AArch64] Check Last Element Instead of Returning nullptr in lookupStubFromGroup #114015

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
2acb507
[BOLT] Fix bug in `lookupStubFromGroup`
liusy58 Oct 29, 2024
ea8821e
Merge branch 'main' into bug_fix
liusy58 Dec 12, 2024
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
6 changes: 3 additions & 3 deletions bolt/lib/Passes/LongJmp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,9 @@ BinaryBasicBlock *LongJmpPass::lookupStubFromGroup(
const std::pair<uint64_t, BinaryBasicBlock *> &RHS) {
return LHS.first < RHS.first;
});
if (Cand == Candidates.end())
return nullptr;
if (Cand != Candidates.begin()) {
if (Cand == Candidates.end()) {
Cand = std::prev(Cand);
} else if (Cand != Candidates.begin()) {
const StubTy *LeftCand = std::prev(Cand);
if (Cand->first - DotAddress > DotAddress - LeftCand->first)
Cand = LeftCand;
Expand Down
32 changes: 32 additions & 0 deletions bolt/test/AArch64/long-jmp-one-stub.s
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
## This test verifies that no unnecessary stubs are inserted when each DotAddress increases during a lookup.

# REQUIRES: system-linux, asserts

# RUN: llvm-mc -filetype=obj -triple aarch64-unknown-unknown %s -o %t.o
# RUN: %clang %cflags -O0 %t.o -o %t.exe -Wl,-q
# RUN: link_fdata %s %t.o %t.fdata
# RUN: llvm-bolt %t.exe -o %t.bolt \
# RUN: --data %t.fdata | FileCheck %s

# CHECK: BOLT-INFO: Inserted 1 stubs in the hot area and 0 stubs in the cold area.

.section .text
.global _start
.global far_away_func

.align 4
.global _start
.type _start, %function
_start:
# FDATA: 0 [unknown] 0 1 _start 0 0 100
bl far_away_func
bl far_away_func
ret
.space 0x8000000
.global far_away_func
.type far_away_func, %function
far_away_func:
add x0, x0, #1
ret

.reloc 0, R_AARCH64_NONE
Loading