[llvm] 78804f8 - [MC] Remove the evaluateAsAbsolute overload that takes a MCAsmLayout parameter
Fangrui Song via llvm-commits
llvm-commits at lists.llvm.org
Mon Jul 1 15:38:22 PDT 2024
Author: Fangrui Song
Date: 2024-07-01T15:38:18-07:00
New Revision: 78804f891c052c2f8eefb2845cc4a4e4e1d68075
URL: https://github.com/llvm/llvm-project/commit/78804f891c052c2f8eefb2845cc4a4e4e1d68075
DIFF: https://github.com/llvm/llvm-project/commit/78804f891c052c2f8eefb2845cc4a4e4e1d68075.diff
LOG: [MC] Remove the evaluateAsAbsolute overload that takes a MCAsmLayout parameter
Continue the MCAsmLayout removal work started by 67957a45ee1ec42ae1671cdbfa0d73127346cc95.
Added:
Modified:
llvm/include/llvm/MC/MCExpr.h
llvm/lib/MC/MCAssembler.cpp
llvm/lib/MC/MCExpr.cpp
llvm/lib/MC/WasmObjectWriter.cpp
llvm/lib/Target/LoongArch/MCTargetDesc/LoongArchAsmBackend.cpp
llvm/lib/Target/RISCV/MCTargetDesc/RISCVAsmBackend.cpp
Removed:
################################################################################
diff --git a/llvm/include/llvm/MC/MCExpr.h b/llvm/include/llvm/MC/MCExpr.h
index 40319dcc8ee79..3c051b5ff63c5 100644
--- a/llvm/include/llvm/MC/MCExpr.h
+++ b/llvm/include/llvm/MC/MCExpr.h
@@ -54,7 +54,6 @@ class MCExpr {
SMLoc Loc;
bool evaluateAsAbsolute(int64_t &Res, const MCAssembler *Asm,
- const MCAsmLayout *Layout,
const SectionAddrMap *Addrs, bool InSet) const;
protected:
@@ -101,7 +100,6 @@ class MCExpr {
bool evaluateAsAbsolute(int64_t &Res) const;
bool evaluateAsAbsolute(int64_t &Res, const MCAssembler &Asm) const;
bool evaluateAsAbsolute(int64_t &Res, const MCAssembler *Asm) const;
- bool evaluateAsAbsolute(int64_t &Res, const MCAsmLayout &Layout) const;
bool evaluateKnownAbsolute(int64_t &Res, const MCAsmLayout &Layout) const;
diff --git a/llvm/lib/MC/MCAssembler.cpp b/llvm/lib/MC/MCAssembler.cpp
index 53bebdcd0447c..e8a7eae01971f 100644
--- a/llvm/lib/MC/MCAssembler.cpp
+++ b/llvm/lib/MC/MCAssembler.cpp
@@ -1151,7 +1151,7 @@ bool MCAssembler::relaxLEB(MCLEBFragment &LF) {
// fragments. This is used by __gcc_except_table.
bool Abs = getSubsectionsViaSymbols()
? LF.getValue().evaluateKnownAbsolute(Value, *Layout)
- : LF.getValue().evaluateAsAbsolute(Value, *Layout);
+ : LF.getValue().evaluateAsAbsolute(Value, *this);
if (!Abs) {
bool Relaxed, UseZeroPad;
std::tie(Relaxed, UseZeroPad) = getBackend().relaxLEB128(*this, LF, Value);
@@ -1269,7 +1269,7 @@ bool MCAssembler::relaxDwarfCallFrameFragment(MCDwarfCallFrameFragment &DF) {
MCContext &Context = getContext();
int64_t Value;
- bool Abs = DF.getAddrDelta().evaluateAsAbsolute(Value, *Layout);
+ bool Abs = DF.getAddrDelta().evaluateAsAbsolute(Value, *this);
if (!Abs) {
getContext().reportError(DF.getAddrDelta().getLoc(),
"invalid CFI advance_loc expression");
diff --git a/llvm/lib/MC/MCExpr.cpp b/llvm/lib/MC/MCExpr.cpp
index af9dcffdfdb29..4b778e9f80b2d 100644
--- a/llvm/lib/MC/MCExpr.cpp
+++ b/llvm/lib/MC/MCExpr.cpp
@@ -545,37 +545,30 @@ void MCTargetExpr::anchor() {}
/* *** */
bool MCExpr::evaluateAsAbsolute(int64_t &Res) const {
- return evaluateAsAbsolute(Res, nullptr, nullptr, nullptr, false);
-}
-
-bool MCExpr::evaluateAsAbsolute(int64_t &Res,
- const MCAsmLayout &Layout) const {
- return evaluateAsAbsolute(Res, &Layout.getAssembler(), &Layout, nullptr, false);
+ return evaluateAsAbsolute(Res, nullptr, nullptr, false);
}
bool MCExpr::evaluateAsAbsolute(int64_t &Res, const MCAssembler &Asm,
const SectionAddrMap &Addrs) const {
// Setting InSet causes us to absolutize
diff erences across sections and that
// is what the MachO writer uses Addrs for.
- return evaluateAsAbsolute(Res, &Asm, Asm.getLayout(), &Addrs, true);
+ return evaluateAsAbsolute(Res, &Asm, &Addrs, true);
}
bool MCExpr::evaluateAsAbsolute(int64_t &Res, const MCAssembler &Asm) const {
- return evaluateAsAbsolute(Res, &Asm, nullptr, nullptr, false);
+ return evaluateAsAbsolute(Res, &Asm, nullptr, false);
}
bool MCExpr::evaluateAsAbsolute(int64_t &Res, const MCAssembler *Asm) const {
- return evaluateAsAbsolute(Res, Asm, nullptr, nullptr, false);
+ return evaluateAsAbsolute(Res, Asm, nullptr, false);
}
bool MCExpr::evaluateKnownAbsolute(int64_t &Res,
const MCAsmLayout &Layout) const {
- return evaluateAsAbsolute(Res, &Layout.getAssembler(), &Layout, nullptr,
- true);
+ return evaluateAsAbsolute(Res, &Layout.getAssembler(), nullptr, true);
}
bool MCExpr::evaluateAsAbsolute(int64_t &Res, const MCAssembler *Asm,
- const MCAsmLayout *Layout,
const SectionAddrMap *Addrs, bool InSet) const {
MCValue Value;
diff --git a/llvm/lib/MC/WasmObjectWriter.cpp b/llvm/lib/MC/WasmObjectWriter.cpp
index 5602c9b406f13..187851bb693d8 100644
--- a/llvm/lib/MC/WasmObjectWriter.cpp
+++ b/llvm/lib/MC/WasmObjectWriter.cpp
@@ -1633,7 +1633,7 @@ uint64_t WasmObjectWriter::writeOneObject(MCAssembler &Asm,
WS.getName());
int64_t Size = 0;
- if (!WS.getSize()->evaluateAsAbsolute(Size, Layout))
+ if (!WS.getSize()->evaluateAsAbsolute(Size, Asm))
report_fatal_error(".size expression must be evaluatable");
auto &DataSection = static_cast<MCSectionWasm &>(WS.getSection());
@@ -1752,7 +1752,7 @@ uint64_t WasmObjectWriter::writeOneObject(MCAssembler &Asm,
// size of the alias. When an offset from the base is involved this
// can result in a offset + size goes past the end of the data section
// which out object format doesn't support. So we must clamp it.
- if (!Base->getSize()->evaluateAsAbsolute(Size, Layout))
+ if (!Base->getSize()->evaluateAsAbsolute(Size, Asm))
report_fatal_error(".size expression must be evaluatable");
const WasmDataSegment &Segment =
DataSegments[DataSection.getSegmentIndex()];
diff --git a/llvm/lib/Target/LoongArch/MCTargetDesc/LoongArchAsmBackend.cpp b/llvm/lib/Target/LoongArch/MCTargetDesc/LoongArchAsmBackend.cpp
index e3200b04c673a..eb059d312de1f 100644
--- a/llvm/lib/Target/LoongArch/MCTargetDesc/LoongArchAsmBackend.cpp
+++ b/llvm/lib/Target/LoongArch/MCTargetDesc/LoongArchAsmBackend.cpp
@@ -323,7 +323,7 @@ bool LoongArchAsmBackend::relaxDwarfLineAddr(const MCAssembler &Asm,
size_t OldSize = Data.size();
int64_t Value;
- if (AddrDelta.evaluateAsAbsolute(Value, Layout))
+ if (AddrDelta.evaluateAsAbsolute(Value, Asm))
return false;
bool IsAbsolute = AddrDelta.evaluateKnownAbsolute(Value, Layout);
assert(IsAbsolute && "CFA with invalid expression");
@@ -389,7 +389,7 @@ bool LoongArchAsmBackend::relaxDwarfCFA(const MCAssembler &Asm,
auto &Layout = *Asm.getLayout();
int64_t Value;
- if (AddrDelta.evaluateAsAbsolute(Value, Layout))
+ if (AddrDelta.evaluateAsAbsolute(Value, Asm))
return false;
bool IsAbsolute = AddrDelta.evaluateKnownAbsolute(Value, Layout);
assert(IsAbsolute && "CFA with invalid expression");
diff --git a/llvm/lib/Target/RISCV/MCTargetDesc/RISCVAsmBackend.cpp b/llvm/lib/Target/RISCV/MCTargetDesc/RISCVAsmBackend.cpp
index 445e5892b598d..e8d7fdc7e6b2d 100644
--- a/llvm/lib/Target/RISCV/MCTargetDesc/RISCVAsmBackend.cpp
+++ b/llvm/lib/Target/RISCV/MCTargetDesc/RISCVAsmBackend.cpp
@@ -278,7 +278,7 @@ bool RISCVAsmBackend::relaxDwarfCFA(const MCAssembler &Asm,
size_t OldSize = Data.size();
int64_t Value;
- if (AddrDelta.evaluateAsAbsolute(Value, Layout))
+ if (AddrDelta.evaluateAsAbsolute(Value, Asm))
return false;
[[maybe_unused]] bool IsAbsolute =
AddrDelta.evaluateKnownAbsolute(Value, Layout);
More information about the llvm-commits
mailing list