[llvm] 4781a8e - MCValue: add setSpecifier to simplify code
Fangrui Song via llvm-commits
llvm-commits at lists.llvm.org
Sun Mar 23 12:36:51 PDT 2025
Author: Fangrui Song
Date: 2025-03-23T12:36:46-07:00
New Revision: 4781a8ebd0f3c0807adcbf5d8d6c72fd5839eb85
URL: https://github.com/llvm/llvm-project/commit/4781a8ebd0f3c0807adcbf5d8d6c72fd5839eb85
DIFF: https://github.com/llvm/llvm-project/commit/4781a8ebd0f3c0807adcbf5d8d6c72fd5839eb85.diff
LOG: MCValue: add setSpecifier to simplify code
This primarily simplifies backend evaluateAsRelocatableImpl.
Added:
Modified:
llvm/include/llvm/MC/MCValue.h
llvm/lib/Target/AArch64/MCTargetDesc/AArch64MCExpr.cpp
llvm/lib/Target/AArch64/MCTargetDesc/AArch64MCExpr.h
llvm/lib/Target/CSKY/MCTargetDesc/CSKYMCExpr.cpp
llvm/lib/Target/Lanai/MCTargetDesc/LanaiMCExpr.cpp
llvm/lib/Target/Lanai/MCTargetDesc/LanaiMCExpr.h
llvm/lib/Target/LoongArch/MCTargetDesc/LoongArchMCExpr.cpp
llvm/lib/Target/RISCV/MCTargetDesc/RISCVMCExpr.cpp
llvm/lib/Target/Sparc/MCTargetDesc/SparcMCExpr.cpp
llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCExpr.cpp
llvm/lib/Target/VE/MCTargetDesc/VEMCExpr.cpp
llvm/lib/Target/VE/MCTargetDesc/VEMCExpr.h
llvm/lib/Target/Xtensa/MCTargetDesc/XtensaMCExpr.cpp
Removed:
################################################################################
diff --git a/llvm/include/llvm/MC/MCValue.h b/llvm/include/llvm/MC/MCValue.h
index 16ce6602a9e8b..4b789412325e4 100644
--- a/llvm/include/llvm/MC/MCValue.h
+++ b/llvm/include/llvm/MC/MCValue.h
@@ -44,6 +44,7 @@ class MCValue {
const MCSymbolRefExpr *getSymA() const { return SymA; }
const MCSymbolRefExpr *getSymB() const { return SymB; }
uint32_t getRefKind() const { return RefKind; }
+ void setSpecifier(uint32_t S) { RefKind = S; }
const MCSymbol *getAddSym() const {
return SymA ? &SymA->getSymbol() : nullptr;
diff --git a/llvm/lib/Target/AArch64/MCTargetDesc/AArch64MCExpr.cpp b/llvm/lib/Target/AArch64/MCTargetDesc/AArch64MCExpr.cpp
index c9f68c33dd2d2..072b77b376bde 100644
--- a/llvm/lib/Target/AArch64/MCTargetDesc/AArch64MCExpr.cpp
+++ b/llvm/lib/Target/AArch64/MCTargetDesc/AArch64MCExpr.cpp
@@ -112,10 +112,7 @@ bool AArch64MCExpr::evaluateAsRelocatableImpl(MCValue &Res,
const MCAssembler *Asm) const {
if (!getSubExpr()->evaluateAsRelocatable(Res, Asm))
return false;
-
- Res =
- MCValue::get(Res.getSymA(), Res.getSymB(), Res.getConstant(), getKind());
-
+ Res.setSpecifier(getSpecifier());
return true;
}
diff --git a/llvm/lib/Target/AArch64/MCTargetDesc/AArch64MCExpr.h b/llvm/lib/Target/AArch64/MCTargetDesc/AArch64MCExpr.h
index 3deb65c826664..57fecb9cfe16a 100644
--- a/llvm/lib/Target/AArch64/MCTargetDesc/AArch64MCExpr.h
+++ b/llvm/lib/Target/AArch64/MCTargetDesc/AArch64MCExpr.h
@@ -145,6 +145,7 @@ class AArch64MCExpr : public MCTargetExpr {
/// Get the kind of this expression.
VariantKind getKind() const { return Kind; }
+ VariantKind getSpecifier() const { return Kind; }
/// Get the expression this modifier applies to.
const MCExpr *getSubExpr() const { return Expr; }
diff --git a/llvm/lib/Target/CSKY/MCTargetDesc/CSKYMCExpr.cpp b/llvm/lib/Target/CSKY/MCTargetDesc/CSKYMCExpr.cpp
index 7c35f35385d85..338ac63d88241 100644
--- a/llvm/lib/Target/CSKY/MCTargetDesc/CSKYMCExpr.cpp
+++ b/llvm/lib/Target/CSKY/MCTargetDesc/CSKYMCExpr.cpp
@@ -71,8 +71,6 @@ bool CSKYMCExpr::evaluateAsRelocatableImpl(MCValue &Res,
const MCAssembler *Asm) const {
if (!getSubExpr()->evaluateAsRelocatable(Res, Asm))
return false;
-
- Res =
- MCValue::get(Res.getSymA(), Res.getSymB(), Res.getConstant(), specifier);
+ Res.setSpecifier(specifier);
return !Res.getSymB();
}
diff --git a/llvm/lib/Target/Lanai/MCTargetDesc/LanaiMCExpr.cpp b/llvm/lib/Target/Lanai/MCTargetDesc/LanaiMCExpr.cpp
index 5772a17cfc4f5..fced12328628e 100644
--- a/llvm/lib/Target/Lanai/MCTargetDesc/LanaiMCExpr.cpp
+++ b/llvm/lib/Target/Lanai/MCTargetDesc/LanaiMCExpr.cpp
@@ -20,12 +20,12 @@ const LanaiMCExpr *LanaiMCExpr::create(VariantKind Kind, const MCExpr *Expr,
}
void LanaiMCExpr::printImpl(raw_ostream &OS, const MCAsmInfo *MAI) const {
- if (Kind == VK_Lanai_None) {
+ if (specifier == VK_Lanai_None) {
Expr->print(OS, MAI);
return;
}
- switch (Kind) {
+ switch (specifier) {
default:
llvm_unreachable("Invalid kind!");
case VK_Lanai_ABS_HI:
@@ -50,9 +50,6 @@ bool LanaiMCExpr::evaluateAsRelocatableImpl(MCValue &Res,
const MCAssembler *Asm) const {
if (!getSubExpr()->evaluateAsRelocatable(Res, Asm))
return false;
-
- Res =
- MCValue::get(Res.getSymA(), Res.getSymB(), Res.getConstant(), getKind());
-
+ Res.setSpecifier(specifier);
return true;
}
diff --git a/llvm/lib/Target/Lanai/MCTargetDesc/LanaiMCExpr.h b/llvm/lib/Target/Lanai/MCTargetDesc/LanaiMCExpr.h
index d7a1c95b2747b..3543fe020f816 100644
--- a/llvm/lib/Target/Lanai/MCTargetDesc/LanaiMCExpr.h
+++ b/llvm/lib/Target/Lanai/MCTargetDesc/LanaiMCExpr.h
@@ -19,18 +19,18 @@ class LanaiMCExpr : public MCTargetExpr {
enum VariantKind { VK_Lanai_None, VK_Lanai_ABS_HI, VK_Lanai_ABS_LO };
private:
- const VariantKind Kind;
+ const VariantKind specifier;
const MCExpr *Expr;
explicit LanaiMCExpr(VariantKind Kind, const MCExpr *Expr)
- : Kind(Kind), Expr(Expr) {}
+ : specifier(Kind), Expr(Expr) {}
public:
static const LanaiMCExpr *create(VariantKind Kind, const MCExpr *Expr,
MCContext &Ctx);
// Returns the kind of this expression.
- VariantKind getKind() const { return Kind; }
+ VariantKind getKind() const { return specifier; }
// Returns the child of this expression.
const MCExpr *getSubExpr() const { return Expr; }
diff --git a/llvm/lib/Target/LoongArch/MCTargetDesc/LoongArchMCExpr.cpp b/llvm/lib/Target/LoongArch/MCTargetDesc/LoongArchMCExpr.cpp
index 2504ef8520a5c..ca3e401d542da 100644
--- a/llvm/lib/Target/LoongArch/MCTargetDesc/LoongArchMCExpr.cpp
+++ b/llvm/lib/Target/LoongArch/MCTargetDesc/LoongArchMCExpr.cpp
@@ -49,8 +49,7 @@ bool LoongArchMCExpr::evaluateAsRelocatableImpl(
if (!getSubExpr()->evaluateAsRelocatable(Res, nullptr))
return false;
- Res =
- MCValue::get(Res.getSymA(), Res.getSymB(), Res.getConstant(), specifier);
+ Res.setSpecifier(specifier);
// Custom fixup types are not valid with symbol
diff erence expressions.
return Res.getSymB() ? specifier == VK_None : true;
}
diff --git a/llvm/lib/Target/RISCV/MCTargetDesc/RISCVMCExpr.cpp b/llvm/lib/Target/RISCV/MCTargetDesc/RISCVMCExpr.cpp
index 7de53e6d3f479..b73496beba7e0 100644
--- a/llvm/lib/Target/RISCV/MCTargetDesc/RISCVMCExpr.cpp
+++ b/llvm/lib/Target/RISCV/MCTargetDesc/RISCVMCExpr.cpp
@@ -91,9 +91,8 @@ bool RISCVMCExpr::evaluateAsRelocatableImpl(MCValue &Res,
const MCAssembler *Asm) const {
if (!getSubExpr()->evaluateAsRelocatable(Res, Asm))
return false;
+ Res.setSpecifier(specifier);
- Res = MCValue::get(Res.getSymA(), Res.getSymB(), Res.getConstant(),
- getSpecifier());
// Custom fixup types are not valid with symbol
diff erence expressions.
return Res.getSymB() ? getSpecifier() == VK_None : true;
}
diff --git a/llvm/lib/Target/Sparc/MCTargetDesc/SparcMCExpr.cpp b/llvm/lib/Target/Sparc/MCTargetDesc/SparcMCExpr.cpp
index 574b9c46658ae..fa05622ad75b1 100644
--- a/llvm/lib/Target/Sparc/MCTargetDesc/SparcMCExpr.cpp
+++ b/llvm/lib/Target/Sparc/MCTargetDesc/SparcMCExpr.cpp
@@ -186,8 +186,7 @@ bool SparcMCExpr::evaluateAsRelocatableImpl(MCValue &Res,
const MCAssembler *Asm) const {
if (!getSubExpr()->evaluateAsRelocatable(Res, Asm))
return false;
- Res = MCValue::get(Res.getSymA(), Res.getSymB(), Res.getConstant(),
- getSpecifier());
+ Res.setSpecifier(specifier);
return true;
}
diff --git a/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCExpr.cpp b/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCExpr.cpp
index e7bc2652428e0..41e41a1a7b66a 100644
--- a/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCExpr.cpp
+++ b/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCExpr.cpp
@@ -40,9 +40,6 @@ bool SystemZMCExpr::evaluateAsRelocatableImpl(MCValue &Res,
const MCAssembler *Asm) const {
if (!getSubExpr()->evaluateAsRelocatable(Res, Asm))
return false;
-
- Res = MCValue::get(Res.getSymA(), Res.getSymB(), Res.getConstant(),
- getSpecifier());
-
+ Res.setSpecifier(specifier);
return true;
}
diff --git a/llvm/lib/Target/VE/MCTargetDesc/VEMCExpr.cpp b/llvm/lib/Target/VE/MCTargetDesc/VEMCExpr.cpp
index 9e5e1519a3efe..b8587cdf22205 100644
--- a/llvm/lib/Target/VE/MCTargetDesc/VEMCExpr.cpp
+++ b/llvm/lib/Target/VE/MCTargetDesc/VEMCExpr.cpp
@@ -34,8 +34,8 @@ void VEMCExpr::printImpl(raw_ostream &OS, const MCAsmInfo *MAI) const {
const MCExpr *Expr = getSubExpr();
Expr->print(OS, MAI);
- if (Kind != VK_None && Kind != VK_REFLONG)
- OS << '@' << MAI->getSpecifierName(Kind);
+ if (specifier != VK_None && specifier != VK_REFLONG)
+ OS << '@' << MAI->getSpecifierName(specifier);
}
VE::Fixups VEMCExpr::getFixupKind(VEMCExpr::Specifier S) {
@@ -79,10 +79,7 @@ bool VEMCExpr::evaluateAsRelocatableImpl(MCValue &Res,
const MCAssembler *Asm) const {
if (!getSubExpr()->evaluateAsRelocatable(Res, Asm))
return false;
-
- Res = MCValue::get(Res.getSymA(), Res.getSymB(), Res.getConstant(),
- getSpecifier());
-
+ Res.setSpecifier(specifier);
return true;
}
diff --git a/llvm/lib/Target/VE/MCTargetDesc/VEMCExpr.h b/llvm/lib/Target/VE/MCTargetDesc/VEMCExpr.h
index c878a3a117849..a176cd3f09710 100644
--- a/llvm/lib/Target/VE/MCTargetDesc/VEMCExpr.h
+++ b/llvm/lib/Target/VE/MCTargetDesc/VEMCExpr.h
@@ -43,11 +43,11 @@ class VEMCExpr : public MCTargetExpr {
};
private:
- const Specifier Kind;
+ const Specifier specifier;
const MCExpr *Expr;
- explicit VEMCExpr(Specifier Kind, const MCExpr *Expr)
- : Kind(Kind), Expr(Expr) {}
+ explicit VEMCExpr(Specifier S, const MCExpr *Expr)
+ : specifier(S), Expr(Expr) {}
public:
/// @name Construction
@@ -60,13 +60,13 @@ class VEMCExpr : public MCTargetExpr {
/// @{
/// getOpcode - Get the kind of this expression.
- Specifier getSpecifier() const { return Kind; }
+ Specifier getSpecifier() const { return specifier; }
/// getSubExpr - Get the child of this expression.
const MCExpr *getSubExpr() const { return Expr; }
/// getFixupKind - Get the fixup kind of this expression.
- VE::Fixups getFixupKind() const { return getFixupKind(Kind); }
+ VE::Fixups getFixupKind() const { return getFixupKind(specifier); }
/// @}
void printImpl(raw_ostream &OS, const MCAsmInfo *MAI) const override;
diff --git a/llvm/lib/Target/Xtensa/MCTargetDesc/XtensaMCExpr.cpp b/llvm/lib/Target/Xtensa/MCTargetDesc/XtensaMCExpr.cpp
index 848a8398e8d72..107e0714b026e 100644
--- a/llvm/lib/Target/Xtensa/MCTargetDesc/XtensaMCExpr.cpp
+++ b/llvm/lib/Target/Xtensa/MCTargetDesc/XtensaMCExpr.cpp
@@ -44,9 +44,7 @@ bool XtensaMCExpr::evaluateAsRelocatableImpl(MCValue &Res,
const MCAssembler *Asm) const {
if (!getSubExpr()->evaluateAsRelocatable(Res, Asm))
return false;
-
- Res =
- MCValue::get(Res.getSymA(), Res.getSymB(), Res.getConstant(), specifier);
+ Res.setSpecifier(specifier);
return !Res.getSymB();
}
More information about the llvm-commits
mailing list