[llvm] 233cca1 - [ARM, Hexagon] Ignore IsVerboseAsm parameter in favor of MCStreamer::isVerboseAsm()

[Fangrui Song via llvm-commits]

Author: Fangrui Song
Date: 2024-07-21T10:02:47-07:00
New Revision: 233cca169237b91d16092c82bd55ee6a283afe98

URL: https://github.com/llvm/llvm-project/commit/233cca169237b91d16092c82bd55ee6a283afe98
DIFF: https://github.com/llvm/llvm-project/commit/233cca169237b91d16092c82bd55ee6a283afe98.diff

LOG: [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().

Added: 
    

Modified: 
    llvm/lib/Target/ARM/MCTargetDesc/ARMELFStreamer.cpp
    llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCTargetDesc.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/lib/Target/ARM/MCTargetDesc/ARMELFStreamer.cpp b/llvm/lib/Target/ARM/MCTargetDesc/ARMELFStreamer.cpp
index 31b577b9c301f..948bf8f762d82 100644
--- a/llvm/lib/Target/ARM/MCTargetDesc/ARMELFStreamer.cpp
+++ b/llvm/lib/Target/ARM/MCTargetDesc/ARMELFStreamer.cpp
@@ -114,15 +114,14 @@ class ARMTargetAsmStreamer : public ARMTargetStreamer {
 
 public:
   ARMTargetAsmStreamer(MCStreamer &S, formatted_raw_ostream &OS,
-                       MCInstPrinter &InstPrinter, bool VerboseAsm);
+                       MCInstPrinter &InstPrinter);
 };
 
 ARMTargetAsmStreamer::ARMTargetAsmStreamer(MCStreamer &S,
                                            formatted_raw_ostream &OS,
-                                           MCInstPrinter &InstPrinter,
-                                           bool VerboseAsm)
+                                           MCInstPrinter &InstPrinter)
     : ARMTargetStreamer(S), OS(OS), InstPrinter(InstPrinter),
-      IsVerboseAsm(VerboseAsm) {}
+      IsVerboseAsm(S.isVerboseAsm()) {}
 
 void ARMTargetAsmStreamer::emitFnStart() { OS << "\t.fnstart\n"; }
 void ARMTargetAsmStreamer::emitFnEnd() { OS << "\t.fnend\n"; }
@@ -1464,7 +1463,7 @@ MCTargetStreamer *createARMTargetAsmStreamer(MCStreamer &S,
                                              formatted_raw_ostream &OS,
                                              MCInstPrinter *InstPrint,
                                              bool isVerboseAsm) {
-  return new ARMTargetAsmStreamer(S, OS, *InstPrint, isVerboseAsm);
+  return new ARMTargetAsmStreamer(S, OS, *InstPrint);
 }
 
 MCTargetStreamer *createARMNullTargetStreamer(MCStreamer &S) {

diff  --git a/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCTargetDesc.cpp b/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCTargetDesc.cpp
index eab7647e633bc..d16b70f439696 100644
--- a/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCTargetDesc.cpp
+++ b/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCTargetDesc.cpp
@@ -226,12 +226,11 @@ namespace {
 
 class HexagonTargetAsmStreamer : public HexagonTargetStreamer {
   formatted_raw_ostream &OS;
-  bool IsVerboseAsm;
 
 public:
   HexagonTargetAsmStreamer(MCStreamer &S, formatted_raw_ostream &OS,
-                           bool IsVerboseAsm, MCInstPrinter &IP)
-      : HexagonTargetStreamer(S), OS(OS), IsVerboseAsm(IsVerboseAsm) {}
+                           MCInstPrinter &IP)
+      : HexagonTargetStreamer(S), OS(OS) {}
 
   void prettyPrintAsm(MCInstPrinter &InstPrinter, uint64_t Address,
                       const MCInst &Inst, const MCSubtargetInfo &STI,
@@ -275,7 +274,7 @@ class HexagonTargetAsmStreamer : public HexagonTargetStreamer {
 
   void emitAttribute(unsigned Attribute, unsigned Value) override {
     OS << "\t.attribute\t" << Attribute << ", " << Twine(Value);
-    if (IsVerboseAsm) {
+    if (getStreamer().isVerboseAsm()) {
       StringRef Name = ELFAttrs::attrTypeAsString(
           Attribute, HexagonAttrs::getHexagonAttributeTags());
       if (!Name.empty())
@@ -379,7 +378,7 @@ static MCInstPrinter *createHexagonMCInstPrinter(const Triple &T,
 static MCTargetStreamer *
 createMCAsmTargetStreamer(MCStreamer &S, formatted_raw_ostream &OS,
                           MCInstPrinter *IP, bool IsVerboseAsm) {
-  return new HexagonTargetAsmStreamer(S, OS, IsVerboseAsm, *IP);
+  return new HexagonTargetAsmStreamer(S, OS, *IP);
 }
 
 static MCStreamer *createMCStreamer(Triple const &T, MCContext &Context,