Skip to content

Commit 233cca1

Browse files
committed
[ARM,Hexagon] Ignore IsVerboseAsm parameter in favor of MCStreamer::isVerboseAsm()
... to improve consistency. Most targets don't use VerboseAsm. When they do (X86, SystemZ), they use MCStreamer::isVerboseAsm().
1 parent 867faee commit 233cca1

File tree

2 files changed

+8
-10
lines changed

2 files changed

+8
-10
lines changed

llvm/lib/Target/ARM/MCTargetDesc/ARMELFStreamer.cpp

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -114,15 +114,14 @@ class ARMTargetAsmStreamer : public ARMTargetStreamer {
114114

115115
public:
116116
ARMTargetAsmStreamer(MCStreamer &S, formatted_raw_ostream &OS,
117-
MCInstPrinter &InstPrinter, bool VerboseAsm);
117+
MCInstPrinter &InstPrinter);
118118
};
119119

120120
ARMTargetAsmStreamer::ARMTargetAsmStreamer(MCStreamer &S,
121121
formatted_raw_ostream &OS,
122-
MCInstPrinter &InstPrinter,
123-
bool VerboseAsm)
122+
MCInstPrinter &InstPrinter)
124123
: ARMTargetStreamer(S), OS(OS), InstPrinter(InstPrinter),
125-
IsVerboseAsm(VerboseAsm) {}
124+
IsVerboseAsm(S.isVerboseAsm()) {}
126125

127126
void ARMTargetAsmStreamer::emitFnStart() { OS << "\t.fnstart\n"; }
128127
void ARMTargetAsmStreamer::emitFnEnd() { OS << "\t.fnend\n"; }
@@ -1464,7 +1463,7 @@ MCTargetStreamer *createARMTargetAsmStreamer(MCStreamer &S,
14641463
formatted_raw_ostream &OS,
14651464
MCInstPrinter *InstPrint,
14661465
bool isVerboseAsm) {
1467-
return new ARMTargetAsmStreamer(S, OS, *InstPrint, isVerboseAsm);
1466+
return new ARMTargetAsmStreamer(S, OS, *InstPrint);
14681467
}
14691468

14701469
MCTargetStreamer *createARMNullTargetStreamer(MCStreamer &S) {

llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCTargetDesc.cpp

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -226,12 +226,11 @@ namespace {
226226

227227
class HexagonTargetAsmStreamer : public HexagonTargetStreamer {
228228
formatted_raw_ostream &OS;
229-
bool IsVerboseAsm;
230229

231230
public:
232231
HexagonTargetAsmStreamer(MCStreamer &S, formatted_raw_ostream &OS,
233-
bool IsVerboseAsm, MCInstPrinter &IP)
234-
: HexagonTargetStreamer(S), OS(OS), IsVerboseAsm(IsVerboseAsm) {}
232+
MCInstPrinter &IP)
233+
: HexagonTargetStreamer(S), OS(OS) {}
235234

236235
void prettyPrintAsm(MCInstPrinter &InstPrinter, uint64_t Address,
237236
const MCInst &Inst, const MCSubtargetInfo &STI,
@@ -275,7 +274,7 @@ class HexagonTargetAsmStreamer : public HexagonTargetStreamer {
275274

276275
void emitAttribute(unsigned Attribute, unsigned Value) override {
277276
OS << "\t.attribute\t" << Attribute << ", " << Twine(Value);
278-
if (IsVerboseAsm) {
277+
if (getStreamer().isVerboseAsm()) {
279278
StringRef Name = ELFAttrs::attrTypeAsString(
280279
Attribute, HexagonAttrs::getHexagonAttributeTags());
281280
if (!Name.empty())
@@ -379,7 +378,7 @@ static MCInstPrinter *createHexagonMCInstPrinter(const Triple &T,
379378
static MCTargetStreamer *
380379
createMCAsmTargetStreamer(MCStreamer &S, formatted_raw_ostream &OS,
381380
MCInstPrinter *IP, bool IsVerboseAsm) {
382-
return new HexagonTargetAsmStreamer(S, OS, IsVerboseAsm, *IP);
381+
return new HexagonTargetAsmStreamer(S, OS, *IP);
383382
}
384383

385384
static MCStreamer *createMCStreamer(Triple const &T, MCContext &Context,

0 commit comments

Comments
 (0)