[llvm] 4289c42 - [MC] Remove the MCAsmLayout parameter from MCObjectWriter::recordRelocation
Fangrui Song via llvm-commits
llvm-commits at lists.llvm.org
Sun Jun 30 22:13:58 PDT 2024
Author: Fangrui Song
Date: 2024-06-30T22:13:54-07:00
New Revision: 4289c422a8b4caa96a8809d4f4e6d9b7e21824ba
URL: https://github.com/llvm/llvm-project/commit/4289c422a8b4caa96a8809d4f4e6d9b7e21824ba
DIFF: https://github.com/llvm/llvm-project/commit/4289c422a8b4caa96a8809d4f4e6d9b7e21824ba.diff
LOG: [MC] Remove the MCAsmLayout parameter from MCObjectWriter::recordRelocation
Added:
Modified:
llvm/include/llvm/MC/MCMachObjectWriter.h
llvm/include/llvm/MC/MCObjectWriter.h
llvm/lib/MC/ELFObjectWriter.cpp
llvm/lib/MC/GOFFObjectWriter.cpp
llvm/lib/MC/MCAssembler.cpp
llvm/lib/MC/MCDXContainerWriter.cpp
llvm/lib/MC/MachObjectWriter.cpp
llvm/lib/MC/SPIRVObjectWriter.cpp
llvm/lib/MC/WasmObjectWriter.cpp
llvm/lib/MC/WinCOFFObjectWriter.cpp
llvm/lib/MC/XCOFFObjectWriter.cpp
llvm/lib/Target/LoongArch/MCTargetDesc/LoongArchAsmBackend.cpp
llvm/lib/Target/RISCV/MCTargetDesc/RISCVAsmBackend.cpp
Removed:
################################################################################
diff --git a/llvm/include/llvm/MC/MCMachObjectWriter.h b/llvm/include/llvm/MC/MCMachObjectWriter.h
index 9cdeaee7cdafd..4e538ed677fad 100644
--- a/llvm/include/llvm/MC/MCMachObjectWriter.h
+++ b/llvm/include/llvm/MC/MCMachObjectWriter.h
@@ -237,9 +237,9 @@ class MachObjectWriter : public MCObjectWriter {
Relocations[Sec].push_back(P);
}
- void recordRelocation(MCAssembler &Asm, const MCAsmLayout &Layout,
- const MCFragment *Fragment, const MCFixup &Fixup,
- MCValue Target, uint64_t &FixedValue) override;
+ void recordRelocation(MCAssembler &Asm, const MCFragment *Fragment,
+ const MCFixup &Fixup, MCValue Target,
+ uint64_t &FixedValue) override;
void bindIndirectSymbols(MCAssembler &Asm);
diff --git a/llvm/include/llvm/MC/MCObjectWriter.h b/llvm/include/llvm/MC/MCObjectWriter.h
index 0b21853ea85ae..2f5066adf6e1e 100644
--- a/llvm/include/llvm/MC/MCObjectWriter.h
+++ b/llvm/include/llvm/MC/MCObjectWriter.h
@@ -63,8 +63,7 @@ class MCObjectWriter {
/// post layout binding. The implementation is responsible for storing
/// information about the relocation so that it can be emitted during
/// writeObject().
- virtual void recordRelocation(MCAssembler &Asm, const MCAsmLayout &Layout,
- const MCFragment *Fragment,
+ virtual void recordRelocation(MCAssembler &Asm, const MCFragment *Fragment,
const MCFixup &Fixup, MCValue Target,
uint64_t &FixedValue) = 0;
diff --git a/llvm/lib/MC/ELFObjectWriter.cpp b/llvm/lib/MC/ELFObjectWriter.cpp
index e6dbc3e37e67c..5bd453a76232d 100644
--- a/llvm/lib/MC/ELFObjectWriter.cpp
+++ b/llvm/lib/MC/ELFObjectWriter.cpp
@@ -254,9 +254,9 @@ class ELFObjectWriter : public MCObjectWriter {
return true;
}
- void recordRelocation(MCAssembler &Asm, const MCAsmLayout &Layout,
- const MCFragment *Fragment, const MCFixup &Fixup,
- MCValue Target, uint64_t &FixedValue) override;
+ void recordRelocation(MCAssembler &Asm, const MCFragment *Fragment,
+ const MCFixup &Fixup, MCValue Target,
+ uint64_t &FixedValue) override;
bool usesRela(const MCSectionELF &Sec) const;
void executePostLayoutBinding(MCAssembler &Asm,
@@ -1410,7 +1410,6 @@ bool ELFObjectWriter::shouldRelocateWithSymbol(const MCAssembler &Asm,
}
void ELFObjectWriter::recordRelocation(MCAssembler &Asm,
- const MCAsmLayout &Layout,
const MCFragment *Fragment,
const MCFixup &Fixup, MCValue Target,
uint64_t &FixedValue) {
@@ -1419,7 +1418,7 @@ void ELFObjectWriter::recordRelocation(MCAssembler &Asm,
MCFixupKindInfo::FKF_IsPCRel;
const MCSectionELF &FixupSection = cast<MCSectionELF>(*Fragment->getParent());
uint64_t C = Target.getConstant();
- uint64_t FixupOffset = Layout.getFragmentOffset(Fragment) + Fixup.getOffset();
+ uint64_t FixupOffset = Asm.getFragmentOffset(*Fragment) + Fixup.getOffset();
MCContext &Ctx = Asm.getContext();
if (const MCSymbolRefExpr *RefB = Target.getSymB()) {
@@ -1441,7 +1440,7 @@ void ELFObjectWriter::recordRelocation(MCAssembler &Asm,
assert(!IsPCRel && "should have been folded");
IsPCRel = true;
- C += FixupOffset - Layout.getSymbolOffset(SymB);
+ C += FixupOffset - Asm.getSymbolOffset(SymB);
}
// We either rejected the fixup or folded B into C at this point.
@@ -1474,7 +1473,7 @@ void ELFObjectWriter::recordRelocation(MCAssembler &Asm,
uint64_t Addend = 0;
FixedValue = !RelocateWithSymbol && SymA && !SymA->isUndefined()
- ? C + Layout.getSymbolOffset(*SymA)
+ ? C + Asm.getSymbolOffset(*SymA)
: C;
if (usesRela(FixupSection)) {
Addend = FixedValue;
diff --git a/llvm/lib/MC/GOFFObjectWriter.cpp b/llvm/lib/MC/GOFFObjectWriter.cpp
index addeb6db95969..c2f7653600778 100644
--- a/llvm/lib/MC/GOFFObjectWriter.cpp
+++ b/llvm/lib/MC/GOFFObjectWriter.cpp
@@ -236,9 +236,9 @@ class GOFFObjectWriter : public MCObjectWriter {
void writeEnd();
// Implementation of the MCObjectWriter interface.
- void recordRelocation(MCAssembler &Asm, const MCAsmLayout &Layout,
- const MCFragment *Fragment, const MCFixup &Fixup,
- MCValue Target, uint64_t &FixedValue) override {}
+ void recordRelocation(MCAssembler &Asm, const MCFragment *Fragment,
+ const MCFixup &Fixup, MCValue Target,
+ uint64_t &FixedValue) override {}
void executePostLayoutBinding(MCAssembler &Asm,
const MCAsmLayout &Layout) override {}
uint64_t writeObject(MCAssembler &Asm, const MCAsmLayout &Layout) override;
diff --git a/llvm/lib/MC/MCAssembler.cpp b/llvm/lib/MC/MCAssembler.cpp
index c675ba0762664..a49481a938d1f 100644
--- a/llvm/lib/MC/MCAssembler.cpp
+++ b/llvm/lib/MC/MCAssembler.cpp
@@ -957,7 +957,7 @@ MCAssembler::handleFixup(MCFragment &F, const MCFixup &Fixup,
// The fixup was unresolved, we need a relocation. Inform the object
// writer of the relocation, and give it an opportunity to adjust the
// fixup value if need be.
- getWriter().recordRelocation(*this, *Layout, &F, Fixup, Target, FixedValue);
+ getWriter().recordRelocation(*this, &F, Fixup, Target, FixedValue);
}
return std::make_tuple(Target, FixedValue, IsResolved);
}
diff --git a/llvm/lib/MC/MCDXContainerWriter.cpp b/llvm/lib/MC/MCDXContainerWriter.cpp
index 1d82a7ec849fe..26d7146bb832e 100644
--- a/llvm/lib/MC/MCDXContainerWriter.cpp
+++ b/llvm/lib/MC/MCDXContainerWriter.cpp
@@ -35,9 +35,9 @@ class DXContainerObjectWriter : public MCObjectWriter {
~DXContainerObjectWriter() override {}
private:
- void recordRelocation(MCAssembler &Asm, const MCAsmLayout &Layout,
- const MCFragment *Fragment, const MCFixup &Fixup,
- MCValue Target, uint64_t &FixedValue) override {}
+ void recordRelocation(MCAssembler &Asm, const MCFragment *Fragment,
+ const MCFixup &Fixup, MCValue Target,
+ uint64_t &FixedValue) override {}
void executePostLayoutBinding(MCAssembler &Asm,
const MCAsmLayout &Layout) override {}
diff --git a/llvm/lib/MC/MachObjectWriter.cpp b/llvm/lib/MC/MachObjectWriter.cpp
index b3655dee5c190..28eb95ab495b9 100644
--- a/llvm/lib/MC/MachObjectWriter.cpp
+++ b/llvm/lib/MC/MachObjectWriter.cpp
@@ -492,7 +492,6 @@ static bool isFixupTargetValid(const MCValue &Target) {
}
void MachObjectWriter::recordRelocation(MCAssembler &Asm,
- const MCAsmLayout &Layout,
const MCFragment *Fragment,
const MCFixup &Fixup, MCValue Target,
uint64_t &FixedValue) {
diff --git a/llvm/lib/MC/SPIRVObjectWriter.cpp b/llvm/lib/MC/SPIRVObjectWriter.cpp
index 5d85c5de4e4e1..5ad146e3221ce 100644
--- a/llvm/lib/MC/SPIRVObjectWriter.cpp
+++ b/llvm/lib/MC/SPIRVObjectWriter.cpp
@@ -29,9 +29,9 @@ class SPIRVObjectWriter : public MCObjectWriter {
~SPIRVObjectWriter() override {}
private:
- void recordRelocation(MCAssembler &Asm, const MCAsmLayout &Layout,
- const MCFragment *Fragment, const MCFixup &Fixup,
- MCValue Target, uint64_t &FixedValue) override {}
+ void recordRelocation(MCAssembler &Asm, const MCFragment *Fragment,
+ const MCFixup &Fixup, MCValue Target,
+ uint64_t &FixedValue) override {}
void executePostLayoutBinding(MCAssembler &Asm,
const MCAsmLayout &Layout) override {}
diff --git a/llvm/lib/MC/WasmObjectWriter.cpp b/llvm/lib/MC/WasmObjectWriter.cpp
index 186497c664106..8109c83e31950 100644
--- a/llvm/lib/MC/WasmObjectWriter.cpp
+++ b/llvm/lib/MC/WasmObjectWriter.cpp
@@ -293,9 +293,9 @@ class WasmObjectWriter : public MCObjectWriter {
void writeHeader(const MCAssembler &Asm);
- void recordRelocation(MCAssembler &Asm, const MCAsmLayout &Layout,
- const MCFragment *Fragment, const MCFixup &Fixup,
- MCValue Target, uint64_t &FixedValue) override;
+ void recordRelocation(MCAssembler &Asm, const MCFragment *Fragment,
+ const MCFixup &Fixup, MCValue Target,
+ uint64_t &FixedValue) override;
void executePostLayoutBinding(MCAssembler &Asm,
const MCAsmLayout &Layout) override;
@@ -481,7 +481,6 @@ void WasmObjectWriter::executePostLayoutBinding(MCAssembler &Asm,
}
void WasmObjectWriter::recordRelocation(MCAssembler &Asm,
- const MCAsmLayout &Layout,
const MCFragment *Fragment,
const MCFixup &Fixup, MCValue Target,
uint64_t &FixedValue) {
@@ -491,7 +490,7 @@ void WasmObjectWriter::recordRelocation(MCAssembler &Asm,
const auto &FixupSection = cast<MCSectionWasm>(*Fragment->getParent());
uint64_t C = Target.getConstant();
- uint64_t FixupOffset = Layout.getFragmentOffset(Fragment) + Fixup.getOffset();
+ uint64_t FixupOffset = Asm.getFragmentOffset(*Fragment) + Fixup.getOffset();
MCContext &Ctx = Asm.getContext();
bool IsLocRel = false;
@@ -521,7 +520,7 @@ void WasmObjectWriter::recordRelocation(MCAssembler &Asm,
return;
}
IsLocRel = true;
- C += FixupOffset - Layout.getSymbolOffset(SymB);
+ C += FixupOffset - Asm.getSymbolOffset(SymB);
}
// We either rejected the fixup or folded B into C at this point.
@@ -578,7 +577,7 @@ void WasmObjectWriter::recordRelocation(MCAssembler &Asm,
if (!SectionSymbol)
report_fatal_error("section symbol is required for relocation");
- C += Layout.getSymbolOffset(*SymA);
+ C += Asm.getSymbolOffset(*SymA);
SymA = cast<MCSymbolWasm>(SectionSymbol);
}
@@ -1647,7 +1646,7 @@ uint64_t WasmObjectWriter::writeOneObject(MCAssembler &Asm,
// For each data symbol, export it in the symtab as a reference to the
// corresponding Wasm data segment.
wasm::WasmDataReference Ref = wasm::WasmDataReference{
- DataSection.getSegmentIndex(), Layout.getSymbolOffset(WS),
+ DataSection.getSegmentIndex(), Asm.getSymbolOffset(WS),
static_cast<uint64_t>(Size)};
assert(DataLocations.count(&WS) == 0);
DataLocations[&WS] = Ref;
@@ -1749,7 +1748,7 @@ uint64_t WasmObjectWriter::writeOneObject(MCAssembler &Asm,
LLVM_DEBUG(dbgs() << " -> index:" << WasmIndex << "\n");
} else if (Base->isData()) {
auto &DataSection = static_cast<MCSectionWasm &>(WS.getSection());
- uint64_t Offset = Layout.getSymbolOffset(S);
+ uint64_t Offset = Asm.getSymbolOffset(S);
int64_t Size = 0;
// For data symbol alias we use the size of the base symbol as the
// size of the alias. When an offset from the base is involved this
@@ -1763,7 +1762,7 @@ uint64_t WasmObjectWriter::writeOneObject(MCAssembler &Asm,
std::min(static_cast<uint64_t>(Size), Segment.Data.size() - Offset);
wasm::WasmDataReference Ref = wasm::WasmDataReference{
DataSection.getSegmentIndex(),
- static_cast<uint32_t>(Layout.getSymbolOffset(S)),
+ static_cast<uint32_t>(Asm.getSymbolOffset(S)),
static_cast<uint32_t>(Size)};
DataLocations[&WS] = Ref;
LLVM_DEBUG(dbgs() << " -> index:" << Ref.Segment << "\n");
diff --git a/llvm/lib/MC/WinCOFFObjectWriter.cpp b/llvm/lib/MC/WinCOFFObjectWriter.cpp
index 5101cb381cb6d..103dbe5629357 100644
--- a/llvm/lib/MC/WinCOFFObjectWriter.cpp
+++ b/llvm/lib/MC/WinCOFFObjectWriter.cpp
@@ -162,9 +162,9 @@ class WinCOFFWriter {
void reset();
void executePostLayoutBinding(MCAssembler &Asm, const MCAsmLayout &Layout);
- void recordRelocation(MCAssembler &Asm, const MCAsmLayout &Layout,
- const MCFragment *Fragment, const MCFixup &Fixup,
- MCValue Target, uint64_t &FixedValue);
+ void recordRelocation(MCAssembler &Asm, const MCFragment *Fragment,
+ const MCFixup &Fixup, MCValue Target,
+ uint64_t &FixedValue);
uint64_t writeObject(MCAssembler &Asm, const MCAsmLayout &Layout);
private:
@@ -229,9 +229,9 @@ class WinCOFFObjectWriter : public MCObjectWriter {
const MCSymbol &SymA,
const MCFragment &FB, bool InSet,
bool IsPCRel) const override;
- void recordRelocation(MCAssembler &Asm, const MCAsmLayout &Layout,
- const MCFragment *Fragment, const MCFixup &Fixup,
- MCValue Target, uint64_t &FixedValue) override;
+ void recordRelocation(MCAssembler &Asm, const MCFragment *Fragment,
+ const MCFixup &Fixup, MCValue Target,
+ uint64_t &FixedValue) override;
uint64_t writeObject(MCAssembler &Asm, const MCAsmLayout &Layout) override;
};
@@ -854,7 +854,6 @@ void WinCOFFWriter::executePostLayoutBinding(MCAssembler &Asm,
}
void WinCOFFWriter::recordRelocation(MCAssembler &Asm,
- const MCAsmLayout &Layout,
const MCFragment *Fragment,
const MCFixup &Fixup, MCValue Target,
uint64_t &FixedValue) {
@@ -894,11 +893,11 @@ void WinCOFFWriter::recordRelocation(MCAssembler &Asm,
}
// Offset of the symbol in the section
- int64_t OffsetOfB = Layout.getSymbolOffset(*B);
+ int64_t OffsetOfB = Asm.getSymbolOffset(*B);
// Offset of the relocation in the section
int64_t OffsetOfRelocation =
- Layout.getFragmentOffset(Fragment) + Fixup.getOffset();
+ Asm.getFragmentOffset(*Fragment) + Fixup.getOffset();
FixedValue = (OffsetOfRelocation - OffsetOfB) + Target.getConstant();
} else {
@@ -908,7 +907,7 @@ void WinCOFFWriter::recordRelocation(MCAssembler &Asm,
COFFRelocation Reloc;
Reloc.Data.SymbolTableIndex = 0;
- Reloc.Data.VirtualAddress = Layout.getFragmentOffset(Fragment);
+ Reloc.Data.VirtualAddress = Asm.getFragmentOffset(*Fragment);
// Turn relocations for temporary symbols into section relocations.
if (A.isTemporary() && !SymbolMap[&A]) {
@@ -918,7 +917,7 @@ void WinCOFFWriter::recordRelocation(MCAssembler &Asm,
"Section must already have been defined in executePostLayoutBinding!");
COFFSection *Section = SectionMap[TargetSection];
Reloc.Symb = Section->Symbol;
- FixedValue += Layout.getSymbolOffset(A);
+ FixedValue += Asm.getSymbolOffset(A);
// Technically, we should do the final adjustments of FixedValue (below)
// before picking an offset symbol, otherwise we might choose one which
// is slightly too far away. The relocations where it really matters
@@ -1214,13 +1213,12 @@ void WinCOFFObjectWriter::executePostLayoutBinding(MCAssembler &Asm,
}
void WinCOFFObjectWriter::recordRelocation(MCAssembler &Asm,
- const MCAsmLayout &Layout,
const MCFragment *Fragment,
const MCFixup &Fixup, MCValue Target,
uint64_t &FixedValue) {
assert(!isDwoSection(*Fragment->getParent()) &&
"No relocation in Dwo sections");
- ObjWriter->recordRelocation(Asm, Layout, Fragment, Fixup, Target, FixedValue);
+ ObjWriter->recordRelocation(Asm, Fragment, Fixup, Target, FixedValue);
}
uint64_t WinCOFFObjectWriter::writeObject(MCAssembler &Asm,
diff --git a/llvm/lib/MC/XCOFFObjectWriter.cpp b/llvm/lib/MC/XCOFFObjectWriter.cpp
index a7c3818d598b7..070df492ad299 100644
--- a/llvm/lib/MC/XCOFFObjectWriter.cpp
+++ b/llvm/lib/MC/XCOFFObjectWriter.cpp
@@ -353,8 +353,8 @@ class XCOFFObjectWriter : public MCObjectWriter {
void executePostLayoutBinding(MCAssembler &, const MCAsmLayout &) override;
- void recordRelocation(MCAssembler &, const MCAsmLayout &, const MCFragment *,
- const MCFixup &, MCValue, uint64_t &) override;
+ void recordRelocation(MCAssembler &, const MCFragment *, const MCFixup &,
+ MCValue, uint64_t &) override;
uint64_t writeObject(MCAssembler &, const MCAsmLayout &) override;
@@ -660,7 +660,6 @@ void XCOFFObjectWriter::executePostLayoutBinding(MCAssembler &Asm,
}
void XCOFFObjectWriter::recordRelocation(MCAssembler &Asm,
- const MCAsmLayout &Layout,
const MCFragment *Fragment,
const MCFixup &Fixup, MCValue Target,
uint64_t &FixedValue) {
@@ -675,11 +674,11 @@ void XCOFFObjectWriter::recordRelocation(MCAssembler &Asm,
};
auto getVirtualAddress =
- [this, &Layout](const MCSymbol *Sym,
- const MCSectionXCOFF *ContainingSect) -> uint64_t {
+ [this, &Asm](const MCSymbol *Sym,
+ const MCSectionXCOFF *ContainingSect) -> uint64_t {
// A DWARF section.
if (ContainingSect->isDwarfSect())
- return Layout.getSymbolOffset(*Sym);
+ return Asm.getSymbolOffset(*Sym);
// A csect.
if (!Sym->isDefined())
@@ -687,7 +686,7 @@ void XCOFFObjectWriter::recordRelocation(MCAssembler &Asm,
// A label.
assert(Sym->isDefined() && "not a valid object that has address!");
- return SectionMap[ContainingSect]->Address + Layout.getSymbolOffset(*Sym);
+ return SectionMap[ContainingSect]->Address + Asm.getSymbolOffset(*Sym);
};
const MCSymbol *const SymA = &Target.getSymA()->getSymbol();
@@ -706,10 +705,10 @@ void XCOFFObjectWriter::recordRelocation(MCAssembler &Asm,
"Expected containing csect to exist in map.");
assert((Fixup.getOffset() <=
- MaxRawDataSize - Layout.getFragmentOffset(Fragment)) &&
+ MaxRawDataSize - Asm.getFragmentOffset(*Fragment)) &&
"Fragment offset + fixup offset is overflowed.");
uint32_t FixupOffsetInCsect =
- Layout.getFragmentOffset(Fragment) + Fixup.getOffset();
+ Asm.getFragmentOffset(*Fragment) + Fixup.getOffset();
const uint32_t Index = getIndex(SymA, SymASec);
if (Type == XCOFF::RelocationType::R_POS ||
diff --git a/llvm/lib/Target/LoongArch/MCTargetDesc/LoongArchAsmBackend.cpp b/llvm/lib/Target/LoongArch/MCTargetDesc/LoongArchAsmBackend.cpp
index a36632d3fe2b0..32a72d0ef0fdc 100644
--- a/llvm/lib/Target/LoongArch/MCTargetDesc/LoongArchAsmBackend.cpp
+++ b/llvm/lib/Target/LoongArch/MCTargetDesc/LoongArchAsmBackend.cpp
@@ -244,7 +244,7 @@ bool LoongArchAsmBackend::shouldInsertFixupForCodeAlign(
MCValue Value = MaxBytesToEmit >= InsertedNopBytes
? MCValue::get(InsertedNopBytes)
: createExtendedValue();
- Asm.getWriter().recordRelocation(Asm, Layout, &AF, Fixup, Value, FixedValue);
+ Asm.getWriter().recordRelocation(Asm, &AF, Fixup, Value, FixedValue);
return true;
}
@@ -504,8 +504,8 @@ bool LoongArchAsmBackend::handleAddSubRelocations(const MCAsmLayout &Layout,
auto FA = MCFixup::create(Fixup.getOffset(), nullptr, std::get<0>(FK));
auto FB = MCFixup::create(Fixup.getOffset(), nullptr, std::get<1>(FK));
auto &Asm = Layout.getAssembler();
- Asm.getWriter().recordRelocation(Asm, Layout, &F, FA, A, FixedValueA);
- Asm.getWriter().recordRelocation(Asm, Layout, &F, FB, B, FixedValueB);
+ Asm.getWriter().recordRelocation(Asm, &F, FA, A, FixedValueA);
+ Asm.getWriter().recordRelocation(Asm, &F, FB, B, FixedValueB);
FixedValue = FixedValueA - FixedValueB;
return true;
}
diff --git a/llvm/lib/Target/RISCV/MCTargetDesc/RISCVAsmBackend.cpp b/llvm/lib/Target/RISCV/MCTargetDesc/RISCVAsmBackend.cpp
index 23d18e98d43d1..3b5d7c7793928 100644
--- a/llvm/lib/Target/RISCV/MCTargetDesc/RISCVAsmBackend.cpp
+++ b/llvm/lib/Target/RISCV/MCTargetDesc/RISCVAsmBackend.cpp
@@ -624,8 +624,8 @@ bool RISCVAsmBackend::handleAddSubRelocations(const MCAsmLayout &Layout,
Fixup.getOffset(), nullptr,
static_cast<MCFixupKind>(FirstLiteralRelocationKind + TB));
auto &Asm = Layout.getAssembler();
- Asm.getWriter().recordRelocation(Asm, Layout, &F, FA, A, FixedValueA);
- Asm.getWriter().recordRelocation(Asm, Layout, &F, FB, B, FixedValueB);
+ Asm.getWriter().recordRelocation(Asm, &F, FA, A, FixedValueA);
+ Asm.getWriter().recordRelocation(Asm, &F, FB, B, FixedValueB);
FixedValue = FixedValueA - FixedValueB;
return true;
}
@@ -711,8 +711,7 @@ bool RISCVAsmBackend::shouldInsertFixupForCodeAlign(MCAssembler &Asm,
uint64_t FixedValue = 0;
MCValue NopBytes = MCValue::get(Count);
- Asm.getWriter().recordRelocation(Asm, Layout, &AF, Fixup, NopBytes,
- FixedValue);
+ Asm.getWriter().recordRelocation(Asm, &AF, Fixup, NopBytes, FixedValue);
return true;
}
More information about the llvm-commits
mailing list