Skip to content

Commit 4607f38

Browse files
committed
[RISCV] Use hasStdExtCOrZca instead of FeatureStdExtC to determine NOP size in RISCVAsmPrinter.cpp.
Found while auditing places where we only check C and not Zca.
1 parent 672fb27 commit 4607f38

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

llvm/lib/Target/RISCV/RISCVAsmPrinter.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ class RISCVAsmPrinter : public AsmPrinter {
110110

111111
void RISCVAsmPrinter::LowerSTACKMAP(MCStreamer &OutStreamer, StackMaps &SM,
112112
const MachineInstr &MI) {
113-
unsigned NOPBytes = STI->getFeatureBits()[RISCV::FeatureStdExtC] ? 2 : 4;
113+
unsigned NOPBytes = STI->hasStdExtCOrZca() ? 2 : 4;
114114
unsigned NumNOPBytes = StackMapOpers(&MI).getNumPatchBytes();
115115

116116
auto &Ctx = OutStreamer.getContext();
@@ -143,7 +143,7 @@ void RISCVAsmPrinter::LowerSTACKMAP(MCStreamer &OutStreamer, StackMaps &SM,
143143
// [<def>], <id>, <numBytes>, <target>, <numArgs>
144144
void RISCVAsmPrinter::LowerPATCHPOINT(MCStreamer &OutStreamer, StackMaps &SM,
145145
const MachineInstr &MI) {
146-
unsigned NOPBytes = STI->getFeatureBits()[RISCV::FeatureStdExtC] ? 2 : 4;
146+
unsigned NOPBytes = STI->hasStdExtCOrZca() ? 2 : 4;
147147

148148
auto &Ctx = OutStreamer.getContext();
149149
MCSymbol *MILabel = Ctx.createTempSymbol();
@@ -165,7 +165,7 @@ void RISCVAsmPrinter::LowerPATCHPOINT(MCStreamer &OutStreamer, StackMaps &SM,
165165

166166
void RISCVAsmPrinter::LowerSTATEPOINT(MCStreamer &OutStreamer, StackMaps &SM,
167167
const MachineInstr &MI) {
168-
unsigned NOPBytes = STI->getFeatureBits()[RISCV::FeatureStdExtC] ? 2 : 4;
168+
unsigned NOPBytes = STI->hasStdExtCOrZca() ? 2 : 4;
169169

170170
StatepointOpers SOpers(&MI);
171171
if (unsigned PatchBytes = SOpers.getNumPatchBytes()) {

0 commit comments

Comments
 (0)