[llvm] 72de33a - MC: Add MCAsmInfo::evaluateAsRelocatableImpl and replace VEMCExpr with MCSpecifierExpr
Fangrui Song via llvm-commits
llvm-commits at lists.llvm.org
Sun Jun 15 11:52:48 PDT 2025
Author: Fangrui Song
Date: 2025-06-15T11:52:43-07:00
New Revision: 72de33a406383cb8555234c40e7b31db593e164f
URL: https://github.com/llvm/llvm-project/commit/72de33a406383cb8555234c40e7b31db593e164f
DIFF: https://github.com/llvm/llvm-project/commit/72de33a406383cb8555234c40e7b31db593e164f.diff
LOG: MC: Add MCAsmInfo::evaluateAsRelocatableImpl and replace VEMCExpr with MCSpecifierExpr
Expressions with specifier can only be folded during relocation
generatin. At parse time the `MCAssembler *` argument might be null, and
targets should not rely on the evaluateAsRelocatable result.
Therefore, we can move evaluateAsRelocatableImpl from MCSpecifierExpr to
MCAsmInfo, so that targets do not need to inherit from MCSpecifierExpr.
Added:
Modified:
llvm/include/llvm/MC/MCAsmInfo.h
llvm/lib/MC/MCAsmInfo.cpp
llvm/lib/MC/MCExpr.cpp
llvm/lib/Target/VE/AsmParser/VEAsmParser.cpp
llvm/lib/Target/VE/MCTargetDesc/VEELFObjectWriter.cpp
llvm/lib/Target/VE/MCTargetDesc/VEMCAsmInfo.cpp
llvm/lib/Target/VE/MCTargetDesc/VEMCAsmInfo.h
llvm/lib/Target/VE/MCTargetDesc/VEMCCodeEmitter.cpp
llvm/lib/Target/VE/MCTargetDesc/VEMCExpr.cpp
llvm/lib/Target/VE/MCTargetDesc/VEMCExpr.h
llvm/lib/Target/VE/VEAsmPrinter.cpp
llvm/lib/Target/VE/VEMCInstLower.cpp
Removed:
################################################################################
diff --git a/llvm/include/llvm/MC/MCAsmInfo.h b/llvm/include/llvm/MC/MCAsmInfo.h
index 1f2ea0cfaaff0..a7bf1b965bf2d 100644
--- a/llvm/include/llvm/MC/MCAsmInfo.h
+++ b/llvm/include/llvm/MC/MCAsmInfo.h
@@ -25,6 +25,7 @@
namespace llvm {
+class MCAssembler;
class MCContext;
class MCCFIInstruction;
class MCExpr;
@@ -33,6 +34,7 @@ class MCSection;
class MCStreamer;
class MCSubtargetInfo;
class MCSymbol;
+class MCValue;
class raw_ostream;
namespace WinEH {
@@ -714,6 +716,8 @@ class LLVM_ABI MCAsmInfo {
void printExpr(raw_ostream &, const MCExpr &) const;
virtual void printSpecifierExpr(raw_ostream &, const MCSpecifierExpr &) const;
+ virtual bool evaluateAsRelocatableImpl(const MCSpecifierExpr &, MCValue &Res,
+ const MCAssembler *Asm) const;
};
} // end namespace llvm
diff --git a/llvm/lib/MC/MCAsmInfo.cpp b/llvm/lib/MC/MCAsmInfo.cpp
index 13b077349a587..e8eaf4619df51 100644
--- a/llvm/lib/MC/MCAsmInfo.cpp
+++ b/llvm/lib/MC/MCAsmInfo.cpp
@@ -163,3 +163,11 @@ void MCAsmInfo::printSpecifierExpr(raw_ostream &OS,
// migrate to MCAsmInfo::printSpecifierExpr.
Expr.printImpl(OS, this);
}
+
+bool MCAsmInfo::evaluateAsRelocatableImpl(const MCSpecifierExpr &Expr,
+ MCValue &Res,
+ const MCAssembler *Asm) const {
+ // TODO: Remove after all targets that use MCSpecifierExpr migrate to
+ // MCAsmInfo::evaluateAsRelocatableImpl.
+ return Expr.evaluateAsRelocatableImpl(Res, Asm);
+}
diff --git a/llvm/lib/MC/MCExpr.cpp b/llvm/lib/MC/MCExpr.cpp
index e83ce05b37a89..5ccad6d487973 100644
--- a/llvm/lib/MC/MCExpr.cpp
+++ b/llvm/lib/MC/MCExpr.cpp
@@ -680,7 +680,10 @@ bool MCExpr::evaluateAsRelocatableImpl(MCValue &Res, const MCAssembler *Asm,
return true;
}
case Specifier:
- return cast<MCSpecifierExpr>(this)->evaluateAsRelocatableImpl(Res, Asm);
+ // Fold the expression during relocation generation. As parse time Asm might
+ // be null, and targets should not rely on the folding.
+ return Asm && Asm->getContext().getAsmInfo()->evaluateAsRelocatableImpl(
+ cast<MCSpecifierExpr>(*this), Res, Asm);
}
llvm_unreachable("Invalid assembly expression kind!");
diff --git a/llvm/lib/Target/VE/AsmParser/VEAsmParser.cpp b/llvm/lib/Target/VE/AsmParser/VEAsmParser.cpp
index 418587947e1ec..c54ce40de45ff 100644
--- a/llvm/lib/Target/VE/AsmParser/VEAsmParser.cpp
+++ b/llvm/lib/Target/VE/AsmParser/VEAsmParser.cpp
@@ -73,7 +73,7 @@ class VEAsmParser : public MCTargetAsmParser {
ParseStatus parseVEAsmOperand(std::unique_ptr<VEOperand> &Operand);
// Helper function to parse expression with a symbol.
- const MCExpr *extractSpecifier(const MCExpr *E, VEMCExpr::Specifier &Variant);
+ const MCExpr *extractSpecifier(const MCExpr *E, VE::Specifier &Variant);
bool parseExpression(const MCExpr *&EVal);
// Split the mnemonic stripping conditional code and quantifiers
@@ -1036,11 +1036,11 @@ bool VEAsmParser::parseLiteralValues(unsigned Size, SMLoc L) {
/// Extract \code @lo32/@hi32/etc \endcode specifier from expression.
/// Recursively scan the expression and check for VK_HI32/LO32/etc
/// symbol variants. If all symbols with modifier use the same
-/// variant, return the corresponding VEMCExpr::Specifier,
+/// variant, return the corresponding VE::Specifier,
/// and a modified expression using the default symbol variant.
/// Otherwise, return NULL.
const MCExpr *VEAsmParser::extractSpecifier(const MCExpr *E,
- VEMCExpr::Specifier &Variant) {
+ VE::Specifier &Variant) {
MCContext &Context = getParser().getContext();
Variant = VE::S_None;
@@ -1118,7 +1118,7 @@ const MCExpr *VEAsmParser::extractSpecifier(const MCExpr *E,
case MCExpr::Binary: {
const MCBinaryExpr *BE = cast<MCBinaryExpr>(E);
- VEMCExpr::Specifier LHSVariant, RHSVariant;
+ VE::Specifier LHSVariant, RHSVariant;
const MCExpr *LHS = extractSpecifier(BE->getLHS(), LHSVariant);
const MCExpr *RHS = extractSpecifier(BE->getRHS(), RHSVariant);
@@ -1153,11 +1153,11 @@ bool VEAsmParser::parseExpression(const MCExpr *&EVal) {
if (getParser().parseExpression(EVal))
return true;
- // Convert MCSymbolRefExpr with VK_* to MCExpr with VK_*.
- VEMCExpr::Specifier Specifier;
+ // Convert MCSymbolRefExpr with specifier to MCSpecifierExpr.
+ VE::Specifier Specifier;
const MCExpr *E = extractSpecifier(EVal, Specifier);
if (E)
- EVal = VEMCExpr::create(Specifier, E, getParser().getContext());
+ EVal = MCSpecifierExpr::create(E, Specifier, getParser().getContext());
return false;
}
diff --git a/llvm/lib/Target/VE/MCTargetDesc/VEELFObjectWriter.cpp b/llvm/lib/Target/VE/MCTargetDesc/VEELFObjectWriter.cpp
index bdedde505295f..0e3f5d18de07f 100644
--- a/llvm/lib/Target/VE/MCTargetDesc/VEELFObjectWriter.cpp
+++ b/llvm/lib/Target/VE/MCTargetDesc/VEELFObjectWriter.cpp
@@ -50,7 +50,7 @@ unsigned VEELFObjectWriter::getRelocType(const MCFixup &Fixup,
default:
break;
}
- if (const VEMCExpr *SExpr = dyn_cast<VEMCExpr>(Fixup.getValue())) {
+ if (auto *SExpr = dyn_cast<MCSpecifierExpr>(Fixup.getValue())) {
if (SExpr->getSpecifier() == VE::S_PC_LO32)
return ELF::R_VE_PC_LO32;
}
diff --git a/llvm/lib/Target/VE/MCTargetDesc/VEMCAsmInfo.cpp b/llvm/lib/Target/VE/MCTargetDesc/VEMCAsmInfo.cpp
index ac580f79a77b0..8eb3aedd668e4 100644
--- a/llvm/lib/Target/VE/MCTargetDesc/VEMCAsmInfo.cpp
+++ b/llvm/lib/Target/VE/MCTargetDesc/VEMCAsmInfo.cpp
@@ -14,6 +14,7 @@
#include "VEMCExpr.h"
#include "llvm/MC/MCExpr.h"
#include "llvm/MC/MCStreamer.h"
+#include "llvm/MC/MCValue.h"
#include "llvm/TargetParser/Triple.h"
using namespace llvm;
@@ -64,3 +65,12 @@ void VEELFMCAsmInfo::printSpecifierExpr(raw_ostream &OS,
if (specifier && specifier != VE::S_REFLONG)
OS << '@' << getSpecifierName(specifier);
}
+
+bool VEELFMCAsmInfo::evaluateAsRelocatableImpl(const MCSpecifierExpr &Expr,
+ MCValue &Res,
+ const MCAssembler *Asm) const {
+ if (!Expr.getSubExpr()->evaluateAsRelocatable(Res, Asm))
+ return false;
+ Res.setSpecifier(Expr.getSpecifier());
+ return true;
+}
diff --git a/llvm/lib/Target/VE/MCTargetDesc/VEMCAsmInfo.h b/llvm/lib/Target/VE/MCTargetDesc/VEMCAsmInfo.h
index 444f422c7ec12..2d73c94e2113e 100644
--- a/llvm/lib/Target/VE/MCTargetDesc/VEMCAsmInfo.h
+++ b/llvm/lib/Target/VE/MCTargetDesc/VEMCAsmInfo.h
@@ -26,6 +26,8 @@ class VEELFMCAsmInfo : public MCAsmInfoELF {
explicit VEELFMCAsmInfo(const Triple &TheTriple);
void printSpecifierExpr(raw_ostream &OS,
const MCSpecifierExpr &Expr) const override;
+ bool evaluateAsRelocatableImpl(const MCSpecifierExpr &Expr, MCValue &Res,
+ const MCAssembler *Asm) const override;
};
} // namespace llvm
diff --git a/llvm/lib/Target/VE/MCTargetDesc/VEMCCodeEmitter.cpp b/llvm/lib/Target/VE/MCTargetDesc/VEMCCodeEmitter.cpp
index c3fae1a0c77d4..712de5accce51 100644
--- a/llvm/lib/Target/VE/MCTargetDesc/VEMCCodeEmitter.cpp
+++ b/llvm/lib/Target/VE/MCTargetDesc/VEMCCodeEmitter.cpp
@@ -98,7 +98,7 @@ unsigned VEMCCodeEmitter::getMachineOpValue(const MCInst &MI,
assert(MO.isExpr());
const MCExpr *Expr = MO.getExpr();
- if (const VEMCExpr *SExpr = dyn_cast<VEMCExpr>(Expr)) {
+ if (const auto *SExpr = dyn_cast<MCSpecifierExpr>(Expr)) {
auto Kind = VE::getFixupKind(SExpr->getSpecifier());
Fixups.push_back(MCFixup::create(0, Expr, Kind));
return 0;
diff --git a/llvm/lib/Target/VE/MCTargetDesc/VEMCExpr.cpp b/llvm/lib/Target/VE/MCTargetDesc/VEMCExpr.cpp
index ed0eafc75888f..ca13aba095e25 100644
--- a/llvm/lib/Target/VE/MCTargetDesc/VEMCExpr.cpp
+++ b/llvm/lib/Target/VE/MCTargetDesc/VEMCExpr.cpp
@@ -22,11 +22,6 @@ using namespace llvm;
#define DEBUG_TYPE "vemcexpr"
-const VEMCExpr *VEMCExpr::create(Specifier S, const MCExpr *Expr,
- MCContext &Ctx) {
- return new (Ctx) VEMCExpr(Expr, S);
-}
-
VE::Fixups VE::getFixupKind(uint8_t S) {
switch (S) {
default:
@@ -63,11 +58,3 @@ VE::Fixups VE::getFixupKind(uint8_t S) {
return VE::fixup_ve_tpoff_lo32;
}
}
-
-bool VEMCExpr::evaluateAsRelocatableImpl(MCValue &Res,
- const MCAssembler *Asm) const {
- if (!getSubExpr()->evaluateAsRelocatable(Res, Asm))
- return false;
- Res.setSpecifier(specifier);
- return true;
-}
diff --git a/llvm/lib/Target/VE/MCTargetDesc/VEMCExpr.h b/llvm/lib/Target/VE/MCTargetDesc/VEMCExpr.h
index d4e0f77c8ece8..b7913513bd51e 100644
--- a/llvm/lib/Target/VE/MCTargetDesc/VEMCExpr.h
+++ b/llvm/lib/Target/VE/MCTargetDesc/VEMCExpr.h
@@ -20,21 +20,6 @@
namespace llvm {
class StringRef;
-class VEMCExpr : public MCSpecifierExpr {
-public:
- using Specifier = uint8_t;
-
-private:
- explicit VEMCExpr(const MCExpr *Expr, Specifier S)
- : MCSpecifierExpr(Expr, S) {}
-
-public:
- static const VEMCExpr *create(Specifier Kind, const MCExpr *Expr,
- MCContext &Ctx);
-
- bool evaluateAsRelocatableImpl(MCValue &Res,
- const MCAssembler *Asm) const override;
-};
namespace VE {
enum Specifier {
diff --git a/llvm/lib/Target/VE/VEAsmPrinter.cpp b/llvm/lib/Target/VE/VEAsmPrinter.cpp
index f0d6f52268544..af0dc0404d3cc 100644
--- a/llvm/lib/Target/VE/VEAsmPrinter.cpp
+++ b/llvm/lib/Target/VE/VEAsmPrinter.cpp
@@ -67,18 +67,17 @@ class VEAsmPrinter : public AsmPrinter {
};
} // end of anonymous namespace
-static MCOperand createVEMCOperand(VEMCExpr::Specifier Kind, MCSymbol *Sym,
+static MCOperand createVEMCOperand(VE::Specifier Kind, MCSymbol *Sym,
MCContext &OutContext) {
const MCSymbolRefExpr *MCSym = MCSymbolRefExpr::create(Sym, OutContext);
- const VEMCExpr *expr = VEMCExpr::create(Kind, MCSym, OutContext);
- return MCOperand::createExpr(expr);
+ return MCOperand::createExpr(
+ MCSpecifierExpr::create(MCSym, Kind, OutContext));
}
-static MCOperand createGOTRelExprOp(VEMCExpr::Specifier Kind,
- MCSymbol *GOTLabel, MCContext &OutContext) {
+static MCOperand createGOTRelExprOp(VE::Specifier Kind, MCSymbol *GOTLabel,
+ MCContext &OutContext) {
const MCSymbolRefExpr *GOT = MCSymbolRefExpr::create(GOTLabel, OutContext);
- const VEMCExpr *expr = VEMCExpr::create(Kind, GOT, OutContext);
- return MCOperand::createExpr(expr);
+ return MCOperand::createExpr(MCSpecifierExpr::create(GOT, Kind, OutContext));
}
static void emitSIC(MCStreamer &OutStreamer, MCOperand &RD,
@@ -166,9 +165,8 @@ static void emitANDrm(MCStreamer &OutStreamer, MCOperand &RS1, MCOperand &Imm,
}
static void emitHiLo(MCStreamer &OutStreamer, MCSymbol *GOTSym,
- VEMCExpr::Specifier HiKind, VEMCExpr::Specifier LoKind,
- MCOperand &RD, MCContext &OutContext,
- const MCSubtargetInfo &STI) {
+ VE::Specifier HiKind, VE::Specifier LoKind, MCOperand &RD,
+ MCContext &OutContext, const MCSubtargetInfo &STI) {
MCOperand hi = createVEMCOperand(HiKind, GOTSym, OutContext);
MCOperand lo = createVEMCOperand(LoKind, GOTSym, OutContext);
diff --git a/llvm/lib/Target/VE/VEMCInstLower.cpp b/llvm/lib/Target/VE/VEMCInstLower.cpp
index bed71df3921cf..a438d8740cd09 100644
--- a/llvm/lib/Target/VE/VEMCInstLower.cpp
+++ b/llvm/lib/Target/VE/VEMCInstLower.cpp
@@ -28,7 +28,7 @@ using namespace llvm;
static MCOperand LowerSymbolOperand(const MachineInstr *MI,
const MachineOperand &MO,
const MCSymbol *Symbol, AsmPrinter &AP) {
- VEMCExpr::Specifier Kind = (VEMCExpr::Specifier)MO.getTargetFlags();
+ auto Kind = (VE::Specifier)MO.getTargetFlags();
const MCExpr *Expr = MCSymbolRefExpr::create(Symbol, AP.OutContext);
// Add offset iff MO is not jump table info or machine basic block.
@@ -36,7 +36,7 @@ static MCOperand LowerSymbolOperand(const MachineInstr *MI,
Expr = MCBinaryExpr::createAdd(
Expr, MCConstantExpr::create(MO.getOffset(), AP.OutContext),
AP.OutContext);
- Expr = VEMCExpr::create(Kind, Expr, AP.OutContext);
+ Expr = MCSpecifierExpr::create(Expr, Kind, AP.OutContext);
return MCOperand::createExpr(Expr);
}
More information about the llvm-commits
mailing list