Get rid of postInstructionAction and call EmitComments directly.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@75806 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/CodeGen/AsmPrinter.h b/include/llvm/CodeGen/AsmPrinter.h
index ad46013decbb637fa6feb0ae74c99c3b7f28dde6..a9b0b3b0475aa745a388b4dc5196281fa0836278 100644 (file)
--- a/include/llvm/CodeGen/AsmPrinter.h
+++ b/include/llvm/CodeGen/AsmPrinter.h
@@ -333,17 +333,11 @@ namespace llvm {
     /// debug tables.
     void printDeclare(const MachineInstr *MI) const;
 
-    /// postInstructionAction - Handling printing of items after the
-    /// instruction iteself has been printed (e.g. comments)
-    void postInstructionAction(const MachineInstr &MI) const {
-      postInstructionActionImpl(MI);
-      EmitComments(MI);
-    }
-    void postInstructionAction(const MCInst &MI) const {
-      postInstructionActionImpl(MI);
-      EmitComments(MI);
-    }
-    
+    /// EmitComments - Pretty-print comments for instructions
+    void EmitComments(const MachineInstr &MI) const;
+    /// EmitComments - Pretty-print comments for instructions
+    void EmitComments(const MCInst &MI) const;
+
   protected:
     /// EmitZeros - Emit a block of zeros.
     ///
@@ -413,14 +407,6 @@ namespace llvm {
     void EmitGlobalConstantFP(const ConstantFP* CFP, unsigned AddrSpace);
     void EmitGlobalConstantLargeInt(const ConstantInt* CI, unsigned AddrSpace);
     GCMetadataPrinter *GetOrCreateGCPrinter(GCStrategy *C);
-
-    /// EmitComments - Pretty-print comments for instructions
-    void EmitComments(const MachineInstr &MI) const;
-    /// EmitComments - Pretty-print comments for instructions
-    void EmitComments(const MCInst &MI) const;
-
-    virtual void postInstructionActionImpl(const MachineInstr &MI) const {}
-    virtual void postInstructionActionImpl(const MCInst &MI) const {}
   };
 }
 

diff --git a/utils/TableGen/AsmWriterEmitter.cpp b/utils/TableGen/AsmWriterEmitter.cpp
index 92ad96ec948992d073c43cc98a25518823f1d1fa..d1cb7022d06d070acec843bca13334ef697013f1 100644 (file)
--- a/utils/TableGen/AsmWriterEmitter.cpp
+++ b/utils/TableGen/AsmWriterEmitter.cpp
@@ -383,7 +383,7 @@ FindUniqueOperandCommands(std::vector<std::string> &UniqueOperandCommands,
 
     // If this is the last operand, emit a return.
     if (Inst->Operands.size() == 1) {
-      Command += "    postInstructionAction(*MI);\n";
+      Command += "    EmitComments(*MI);\n";
       // Print the final newline
       Command += "    O << \"\\n\";\n";
       Command += "    return true;\n";
@@ -454,7 +454,7 @@ FindUniqueOperandCommands(std::vector<std::string> &UniqueOperandCommands,
       
       // If this is the last operand, emit a return after the code.
       if (FirstInst->Operands.size() == Op+1) {
-        Command += "    postInstructionAction(*MI);\n";
+        Command += "    EmitComments(*MI);\n";
         // Print the final newline
         Command += "    O << \"\\n\";\n";
         Command += "    return true;\n";
@@ -570,7 +570,7 @@ void AsmWriterEmitter::run(raw_ostream &O) {
     // just opcode strings to use.
     if (isFirst) {
       // Do the post instruction processing and print the final newline
-      UniqueOperandCommands.push_back("    postInstructionAction(*MI);\n    O << \"\\n\";\n    return true;\n");
+      UniqueOperandCommands.push_back("    EmitComments(*MI);\n    O << \"\\n\";\n    return true;\n");
       isFirst = false;
     }
 
@@ -745,7 +745,7 @@ void AsmWriterEmitter::run(raw_ostream &O) {
       EmitInstructions(Instructions, O);
 
     O << "  }\n";
-    O << "  postInstructionAction(*MI);\n";
+    O << "  EmitComments(*MI);\n";
     // Print the final newline
     O << "  O << \"\\n\";\n";
     O << "  return true;\n";