remove dead PrefixPrinter class.

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

diff --git a/include/llvm/CodeGen/Dump.h b/include/llvm/CodeGen/Dump.h
deleted file mode 100644 (file)
index 439141c..0000000
--- a/include/llvm/CodeGen/Dump.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//===- llvm/Support/Dump.h - Easy way to tailor dump output -----*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// This file provides the PrefixPrinter interface to pass to MachineFunction
-// and MachineBasicBlock print methods to output additional information before
-// blocks and instructions are printed.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_CODEGEN_DUMP_H
-#define LLVM_CODEGEN_DUMP_H
-
-#include <iosfwd>
-
-namespace llvm {
-
-class MachineBasicBlock;
-class MachineInstr;
-class raw_ostream;
-
-/// PrefixPrinter - Print some additional information before printing
-/// basic blocks and instructions.
-class PrefixPrinter {
-public:
-  virtual ~PrefixPrinter();
-
-  /// operator() - Print a prefix before each MachineBasicBlock
-  virtual raw_ostream &operator()(raw_ostream &out,
-                                  const MachineBasicBlock &) const {
-    return out; 
-  }
-
-  /// operator() - Print a prefix before each MachineInstr
-  virtual raw_ostream &operator()(raw_ostream &out,
-                                  const MachineInstr &) const {
-    return out; 
-  }
-
-  /// operator() - Print a prefix before each MachineBasicBlock
-  virtual std::ostream &operator()(std::ostream &out,
-                                   const MachineBasicBlock &) const {
-    return out; 
-  }
-
-  /// operator() - Print a prefix before each MachineInstr
-  virtual std::ostream &operator()(std::ostream &out,
-                                   const MachineInstr &) const {
-    return out; 
-  }
-};
- 
-} // End llvm namespace
-
-#endif

diff --git a/include/llvm/CodeGen/MachineBasicBlock.h b/include/llvm/CodeGen/MachineBasicBlock.h
index 51b2bbf66b69f5f82f91c1b8b6724127f1527e23..787b33bc382c62a23f99b0bd867f76f1cac40301 100644 (file)
--- a/include/llvm/CodeGen/MachineBasicBlock.h
+++ b/include/llvm/CodeGen/MachineBasicBlock.h
@@ -16,7 +16,6 @@
 
 #include "llvm/CodeGen/MachineInstr.h"
 #include "llvm/ADT/GraphTraits.h"
-#include "llvm/CodeGen/Dump.h"
 
 namespace llvm {
 
@@ -311,17 +310,13 @@ public:
 
   // Debugging methods.
   void dump() const;
-  void print(std::ostream &OS,
-             const PrefixPrinter &prefix = PrefixPrinter()) const;
-  void print(std::ostream *OS,
-             const PrefixPrinter &prefix = PrefixPrinter()) const {
-    if (OS) print(*OS, prefix); 
+  void print(std::ostream &OS) const;
+  void print(std::ostream *OS) const {
+    if (OS) print(*OS); 
   }
-  void print(raw_ostream &OS,
-             const PrefixPrinter &prefix = PrefixPrinter()) const;
-  void print(raw_ostream *OS,
-             const PrefixPrinter &prefix = PrefixPrinter()) const {
-    if (OS) print(*OS, prefix);
+  void print(raw_ostream &OS) const;
+  void print(raw_ostream *OS) const {
+    if (OS) print(*OS);
   }
 
   /// getNumber - MachineBasicBlocks are uniquely numbered at the function

diff --git a/include/llvm/CodeGen/MachineFunction.h b/include/llvm/CodeGen/MachineFunction.h
index 0d15a95979137a55f8fa6dafebeaeb0d426a4eab..e4681d9292b6a723227d8f400807f7c39420b854 100644 (file)
--- a/include/llvm/CodeGen/MachineFunction.h
+++ b/include/llvm/CodeGen/MachineFunction.h
@@ -18,13 +18,12 @@
 #ifndef LLVM_CODEGEN_MACHINEFUNCTION_H
 #define LLVM_CODEGEN_MACHINEFUNCTION_H
 
-#include <map>
+#include "llvm/CodeGen/MachineBasicBlock.h"
 #include "llvm/ADT/ilist.h"
 #include "llvm/Support/DebugLoc.h"
-#include "llvm/CodeGen/Dump.h"
-#include "llvm/CodeGen/MachineBasicBlock.h"
 #include "llvm/Support/Allocator.h"
 #include "llvm/Support/Recycler.h"
+#include <map>
 
 namespace llvm {
 
@@ -208,11 +207,9 @@ public:
   /// print - Print out the MachineFunction in a format suitable for debugging
   /// to the specified stream.
   ///
-  void print(std::ostream &OS, 
-             const PrefixPrinter &prefix = PrefixPrinter()) const;
-  void print(std::ostream *OS,
-             const PrefixPrinter &prefix = PrefixPrinter()) const {
-    if (OS) print(*OS, prefix); 
+  void print(std::ostream &OS) const;
+  void print(std::ostream *OS) const {
+    if (OS) print(*OS); 
   }
 
   /// viewCFG - This function is meant for use from the debugger.  You can just

diff --git a/lib/CodeGen/Dump.cpp b/lib/CodeGen/Dump.cpp
deleted file mode 100644 (file)
index 2e70d5f..0000000
--- a/lib/CodeGen/Dump.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-//===- lib/Support/Dump.h - Virtual function homes --------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// This file provides the PrefixPrinter virtual function homes.
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/CodeGen/Dump.h"
-
-using namespace llvm;
-
-PrefixPrinter::~PrefixPrinter() {}

diff --git a/lib/CodeGen/MachineBasicBlock.cpp b/lib/CodeGen/MachineBasicBlock.cpp
index 777aa85c4c9bc5cdc608549cbe5cb26d8349ff17..7ec9aab8c2cc39c7c2e476de32d9a11e2f1dfe97 100644 (file)
--- a/lib/CodeGen/MachineBasicBlock.cpp
+++ b/lib/CodeGen/MachineBasicBlock.cpp
@@ -173,14 +173,12 @@ static inline void OutputReg(raw_ostream &os, unsigned RegNo,
     os << " %reg" << RegNo;
 }
 
-void MachineBasicBlock::print(std::ostream &OS,
-                              const PrefixPrinter &prefix) const {
+void MachineBasicBlock::print(std::ostream &OS) const {
   raw_os_ostream RawOS(OS);
-  print(RawOS, prefix);
+  print(RawOS);
 }
 
-void MachineBasicBlock::print(raw_ostream &OS,
-                              const PrefixPrinter &prefix) const {
+void MachineBasicBlock::print(raw_ostream &OS) const {
   const MachineFunction *MF = getParent();
   if (!MF) {
     OS << "Can't print out MachineBasicBlock because parent MachineFunction"
@@ -213,7 +211,7 @@ void MachineBasicBlock::print(raw_ostream &OS,
   }
   
   for (const_iterator I = begin(); I != end(); ++I) {
-    prefix(OS, *I) << '\t';
+    OS << '\t';
     I->print(OS, &getParent()->getTarget());
   }
 

diff --git a/lib/CodeGen/MachineFunction.cpp b/lib/CodeGen/MachineFunction.cpp
index 340f12f7e5add0a995357640f72dc75103990fdc..93a8feeea7550a5061e2f362276b23636952cc05 100644 (file)
--- a/lib/CodeGen/MachineFunction.cpp
+++ b/lib/CodeGen/MachineFunction.cpp
@@ -220,9 +220,8 @@ void MachineFunction::dump() const {
   print(*cerr.stream());
 }
 
-void MachineFunction::print(std::ostream &OS,
-                            const PrefixPrinter &prefix) const {
-  OS << "# Machine code for " << Fn->getNameStr () << "():\n";
+void MachineFunction::print(std::ostream &OS) const {
+  OS << "# Machine code for " << Fn->getNameStr() << "():\n";
 
   // Print Frame Information
   FrameInfo->print(*this, OS);
@@ -263,12 +262,10 @@ void MachineFunction::print(std::ostream &OS,
     OS << "\n";
   }
   
-  for (const_iterator BB = begin(); BB != end(); ++BB) {
-    prefix(OS, *BB);
-    BB->print(OS, prefix);
-  }
+  for (const_iterator BB = begin(), E = end(); BB != E; ++BB)
+    BB->print(OS);
 
-  OS << "\n# End machine code for " << Fn->getNameStr () << "().\n\n";
+  OS << "\n# End machine code for " << Fn->getNameStr() << "().\n\n";
 }
 
 namespace llvm {