Skip to content

Commit d2e8e55

Browse files
committed
CSKY: Replace deprecated MCExpr::print with MCAsmInfo::printExpr
1 parent bdb299a commit d2e8e55

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

llvm/lib/CodeGen/AsmPrinter/DIE.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,7 @@ unsigned DIEExpr::sizeOf(const dwarf::FormParams &FormParams,
474474
LLVM_DUMP_METHOD
475475
void DIEExpr::print(raw_ostream &O) const {
476476
O << "Expr: ";
477-
Expr->print(O, nullptr);
477+
MCAsmInfo().printExpr(O, *Expr);
478478
}
479479

480480
//===----------------------------------------------------------------------===//

llvm/lib/Target/CSKY/MCTargetDesc/CSKYInstPrinter.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ void CSKYInstPrinter::printOperand(const MCInst *MI, unsigned OpNo,
138138
}
139139

140140
assert(MO.isExpr() && "Unknown operand kind in printOperand");
141-
MO.getExpr()->print(O, &MAI);
141+
MAI.printExpr(O, *MO.getExpr());
142142
}
143143

144144
void CSKYInstPrinter::printDataSymbol(const MCInst *MI, unsigned OpNo,
@@ -150,7 +150,7 @@ void CSKYInstPrinter::printDataSymbol(const MCInst *MI, unsigned OpNo,
150150
if (MO.isImm())
151151
O << MO.getImm();
152152
else
153-
MO.getExpr()->print(O, &MAI);
153+
MAI.printExpr(O, *MO.getExpr());
154154
O << "]";
155155
}
156156

@@ -173,7 +173,7 @@ void CSKYInstPrinter::printConstpool(const MCInst *MI, uint64_t Address,
173173
assert(MO.isExpr() && "Unknown operand kind in printConstpool");
174174

175175
O << "[";
176-
MO.getExpr()->print(O, &MAI);
176+
MAI.printExpr(O, *MO.getExpr());
177177
O << "]";
178178
}
179179

llvm/lib/Target/CSKY/MCTargetDesc/CSKYMCExpr.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
#include "CSKYMCExpr.h"
1010
#include "CSKYFixupKinds.h"
11+
#include "MCTargetDesc/CSKYMCAsmInfo.h"
1112
#include "llvm/BinaryFormat/ELF.h"
1213
#include "llvm/MC/MCAssembler.h"
1314
#include "llvm/MC/MCContext.h"
@@ -63,7 +64,8 @@ void CSKYMCExpr::visitUsedExpr(MCStreamer &Streamer) const {
6364
}
6465

6566
void CSKYMCExpr::printImpl(raw_ostream &OS, const MCAsmInfo *MAI) const {
66-
Expr->print(OS, MAI);
67+
if (MAI)
68+
MAI->printExpr(OS, *Expr);
6769
OS << getVariantKindName(getSpecifier());
6870
}
6971

0 commit comments

Comments
 (0)