Skip to content

Commit c30d948

Browse files
tclin914tclin914
committed
Remove unused Modifier
1 parent 42531a6 commit c30d948

File tree

4 files changed

+17
-63
lines changed

4 files changed

+17
-63
lines changed

‎llvm/lib/Target/RISCV/RISCVAsmPrinter.cpp‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -985,15 +985,6 @@ bool RISCVAsmPrinter::lowerToMCInst(const MachineInstr *MI, MCInst &OutMI) {
985985
return false;
986986
}
987987

988-
static MCSymbolRefExpr::VariantKind
989-
getModifierVariantKind(RISCVCP::RISCVCPModifier Modifier) {
990-
switch (Modifier) {
991-
case RISCVCP::None:
992-
return MCSymbolRefExpr::VK_None;
993-
}
994-
llvm_unreachable("Invalid RISCVCPModifier!");
995-
}
996-
997988
void RISCVAsmPrinter::emitMachineConstantPoolValue(
998989
MachineConstantPoolValue *MCPV) {
999990
auto *RCPV = static_cast<RISCVConstantPoolValue *>(MCPV);
@@ -1012,7 +1003,7 @@ void RISCVAsmPrinter::emitMachineConstantPoolValue(
10121003
}
10131004

10141005
const MCExpr *Expr = MCSymbolRefExpr::create(
1015-
MCSym, getModifierVariantKind(RCPV->getModifier()), OutContext);
1006+
MCSym, MCSymbolRefExpr::VK_None, OutContext);
10161007
uint64_t Size = getDataLayout().getTypeAllocSize(RCPV->getType());
10171008
OutStreamer->emitValue(Expr, Size);
10181009
}

‎llvm/lib/Target/RISCV/RISCVConstantPoolValue.cpp‎

Lines changed: 9 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -22,37 +22,22 @@
2222
using namespace llvm;
2323

2424
RISCVConstantPoolValue::RISCVConstantPoolValue(
25-
LLVMContext &C, RISCVCP::RISCVCPKind Kind,
26-
RISCVCP::RISCVCPModifier Modifier)
27-
: MachineConstantPoolValue((Type *)Type::getInt64Ty(C)), Kind(Kind),
28-
Modifier(Modifier) {}
25+
LLVMContext &C, RISCVCP::RISCVCPKind Kind)
26+
: MachineConstantPoolValue((Type *)Type::getInt64Ty(C)), Kind(Kind) {}
2927

3028
RISCVConstantPoolValue::RISCVConstantPoolValue(
31-
Type *Ty, RISCVCP::RISCVCPKind Kind, RISCVCP::RISCVCPModifier Modifier)
32-
: MachineConstantPoolValue(Ty), Kind(Kind), Modifier(Modifier) {}
29+
Type *Ty, RISCVCP::RISCVCPKind Kind)
30+
: MachineConstantPoolValue(Ty), Kind(Kind) {}
3331

3432
int RISCVConstantPoolValue::getExistingMachineCPValue(MachineConstantPool *CP,
3533
Align Alignment) {
3634
llvm_unreachable("Shouldn't be calling this directly!");
3735
}
3836

39-
StringRef RISCVConstantPoolValue::getModifierText() const {
40-
switch (Modifier) {
41-
case RISCVCP::None:
42-
return "";
43-
}
44-
llvm_unreachable("Unknown modifier!");
45-
}
46-
47-
void RISCVConstantPoolValue::print(raw_ostream &O) const {
48-
if (hasModifier())
49-
O << "@" << getModifierText();
50-
}
51-
5237
RISCVConstantPoolConstant::RISCVConstantPoolConstant(Type *Ty,
5338
const Constant *GV,
5439
RISCVCP::RISCVCPKind Kind)
55-
: RISCVConstantPoolValue(Ty, Kind, RISCVCP::None), CVal(GV) {}
40+
: RISCVConstantPoolValue(Ty, Kind), CVal(GV) {}
5641

5742
RISCVConstantPoolConstant *
5843
RISCVConstantPoolConstant::Create(const GlobalValue *GV,
@@ -78,7 +63,6 @@ void RISCVConstantPoolConstant::addSelectionDAGCSEId(FoldingSetNodeID &ID) {
7863

7964
void RISCVConstantPoolConstant::print(raw_ostream &O) const {
8065
O << CVal->getName();
81-
RISCVConstantPoolValue::print(O);
8266
}
8367

8468
const GlobalValue *RISCVConstantPoolConstant::getGlobalValue() const {
@@ -90,13 +74,12 @@ const BlockAddress *RISCVConstantPoolConstant::getBlockAddress() const {
9074
}
9175

9276
RISCVConstantPoolSymbol::RISCVConstantPoolSymbol(
93-
LLVMContext &C, StringRef s, RISCVCP::RISCVCPModifier Modifier)
94-
: RISCVConstantPoolValue(C, RISCVCP::ExtSymbol, Modifier), S(s) {}
77+
LLVMContext &C, StringRef s)
78+
: RISCVConstantPoolValue(C, RISCVCP::ExtSymbol), S(s) {}
9579

9680
RISCVConstantPoolSymbol *
97-
RISCVConstantPoolSymbol::Create(LLVMContext &C, StringRef s,
98-
RISCVCP::RISCVCPModifier Modifier) {
99-
return new RISCVConstantPoolSymbol(C, s, Modifier);
81+
RISCVConstantPoolSymbol::Create(LLVMContext &C, StringRef s) {
82+
return new RISCVConstantPoolSymbol(C, s);
10083
}
10184

10285
int RISCVConstantPoolSymbol::getExistingMachineCPValue(MachineConstantPool *CP,
@@ -110,5 +93,4 @@ void RISCVConstantPoolSymbol::addSelectionDAGCSEId(FoldingSetNodeID &ID) {
11093

11194
void RISCVConstantPoolSymbol::print(raw_ostream &O) const {
11295
O << S;
113-
RISCVConstantPoolValue::print(O);
11496
}

‎llvm/lib/Target/RISCV/RISCVConstantPoolValue.h‎

Lines changed: 6 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -26,23 +26,16 @@ class LLVMContext;
2626
namespace RISCVCP {
2727

2828
enum RISCVCPKind { ExtSymbol, GlobalValue, BlockAddress };
29-
30-
enum RISCVCPModifier {
31-
None,
32-
};
3329
} // end namespace RISCVCP
3430

3531
/// A RISCV-specific constant pool value.
3632
class RISCVConstantPoolValue : public MachineConstantPoolValue {
3733
RISCVCP::RISCVCPKind Kind;
38-
RISCVCP::RISCVCPModifier Modifier;
3934

4035
protected:
41-
RISCVConstantPoolValue(LLVMContext &C, RISCVCP::RISCVCPKind Kind,
42-
RISCVCP::RISCVCPModifier Modifier);
36+
RISCVConstantPoolValue(LLVMContext &C, RISCVCP::RISCVCPKind Kind);
4337

44-
RISCVConstantPoolValue(Type *Ty, RISCVCP::RISCVCPKind Kind,
45-
RISCVCP::RISCVCPModifier Modifier);
38+
RISCVConstantPoolValue(Type *Ty, RISCVCP::RISCVCPKind Kind);
4639

4740
template <typename Derived>
4841
int getExistingMachineCPValueImpl(MachineConstantPool *CP, Align Alignment) {
@@ -64,10 +57,6 @@ class RISCVConstantPoolValue : public MachineConstantPoolValue {
6457
public:
6558
~RISCVConstantPoolValue() = default;
6659

67-
RISCVCP::RISCVCPModifier getModifier() const { return Modifier; }
68-
StringRef getModifierText() const;
69-
bool hasModifier() const { return Modifier != RISCVCP::None; }
70-
7160
bool isExtSymbol() const { return Kind == RISCVCP::ExtSymbol; }
7261
bool isGlobalValue() const { return Kind == RISCVCP::GlobalValue; }
7362
bool isBlockAddress() const { return Kind == RISCVCP::BlockAddress; }
@@ -76,12 +65,6 @@ class RISCVConstantPoolValue : public MachineConstantPoolValue {
7665
Align Alignment) override;
7766

7867
void addSelectionDAGCSEId(FoldingSetNodeID &ID) override {}
79-
80-
bool equals(const RISCVConstantPoolValue *A) const {
81-
return this->Modifier == A->Modifier;
82-
}
83-
84-
void print(raw_ostream &O) const override;
8568
};
8669

8770
class RISCVConstantPoolConstant : public RISCVConstantPoolValue {
@@ -107,7 +90,7 @@ class RISCVConstantPoolConstant : public RISCVConstantPoolValue {
10790
void print(raw_ostream &O) const override;
10891

10992
bool equals(const RISCVConstantPoolConstant *A) const {
110-
return CVal == A->CVal && RISCVConstantPoolValue::equals(A);
93+
return CVal == A->CVal;
11194
}
11295

11396
static bool classof(const RISCVConstantPoolValue *RCPV) {
@@ -118,12 +101,10 @@ class RISCVConstantPoolConstant : public RISCVConstantPoolValue {
118101
class RISCVConstantPoolSymbol : public RISCVConstantPoolValue {
119102
const std::string S;
120103

121-
RISCVConstantPoolSymbol(LLVMContext &C, StringRef s,
122-
RISCVCP::RISCVCPModifier Modifier);
104+
RISCVConstantPoolSymbol(LLVMContext &C, StringRef s);
123105

124106
public:
125-
static RISCVConstantPoolSymbol *Create(LLVMContext &C, StringRef s,
126-
RISCVCP ::RISCVCPModifier Modifier);
107+
static RISCVConstantPoolSymbol *Create(LLVMContext &C, StringRef s);
127108

128109
std::string getSymbol() const { return S; }
129110

@@ -135,7 +116,7 @@ class RISCVConstantPoolSymbol : public RISCVConstantPoolValue {
135116
void print(raw_ostream &O) const override;
136117

137118
bool equals(const RISCVConstantPoolSymbol *A) const {
138-
return S == A->S && RISCVConstantPoolValue::equals(A);
119+
return S == A->S;
139120
}
140121
static bool classof(const RISCVConstantPoolValue *RCPV) {
141122
return RCPV->isExtSymbol();

‎llvm/lib/Target/RISCV/RISCVISelLowering.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6457,7 +6457,7 @@ static SDValue getLargeAddr(NodeTy *N, SDLoc DL, EVT Ty, SelectionDAG &DAG) {
64576457
MachinePointerInfo::getConstantPool(DAG.getMachineFunction()));
64586458
} else if (ExternalSymbolSDNode *S = dyn_cast<ExternalSymbolSDNode>(N)) {
64596459
RISCVConstantPoolSymbol *CPV = RISCVConstantPoolSymbol::Create(
6460-
*DAG.getContext(), S->getSymbol(), RISCVCP::None);
6460+
*DAG.getContext(), S->getSymbol());
64616461
SDValue CPAddr = DAG.getTargetConstantPool(CPV, Ty, Align(8));
64626462
SDValue LC = DAG.getNode(RISCVISD::LLA, DL, Ty, CPAddr);
64636463
return DAG.getLoad(

0 commit comments

Comments
 (0)