Skip to content
Open
Changes from all commits
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
8 changes: 8 additions & 0 deletions bolt/lib/Core/BinaryFunction.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4658,10 +4658,18 @@ MCInst *BinaryFunction::getInstructionAtOffset(uint64_t Offset) {
if (!BB)
return nullptr;

MCInst preInst;
for (MCInst &Inst : *BB) {
constexpr uint32_t InvalidOffset = std::numeric_limits<uint32_t>::max();
if (Offset == BC.MIB->getOffsetWithDefault(Inst, InvalidOffset))
return &Inst;
// If it's a RISCV PseudoCALL - fix it
if (BC.isRISCV() &&
Offset == BC.MIB->getOffsetWithDefault(Inst, InvalidOffset) - 4) {
if (BC.MIB->isRISCVCall(preInst, Inst))
return &Inst;
}
preInst = Inst;
}

if (MCInst *LastInstr = BB->getLastNonPseudoInstr()) {
Expand Down
Loading