Changed OStream templates to functions on raw_ostream, removed the unused "renderWarnings" function.

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

1 files changed, 13 insertions, 26 deletions

diff --git a/lib/CodeGen/RenderMachineFunction.h b/lib/CodeGen/RenderMachineFunction.h
index 090b03ecd6..4d22b34d55 100644
--- a/lib/CodeGen/RenderMachineFunction.h
+++ b/lib/CodeGen/RenderMachineFunction.h
@@ -31,6 +31,7 @@ namespace llvm {
   class TargetRegisterClass;
   class TargetRegisterInfo;
   class VirtRegMap;
+  class raw_ostream;
 
   /// \brief Provide extra information about the physical and virtual registers
   ///        in the function being compiled.
@@ -225,8 +226,7 @@ namespace llvm {
   private:
     class Spacer;
 
-    template <typename OStream>
-    friend OStream& operator<<(OStream &os, const Spacer &s);
+    friend raw_ostream& operator<<(raw_ostream &os, const Spacer &s);
 
 
     std::string fqn;
@@ -256,7 +256,7 @@ namespace llvm {
     public:
       explicit Spacer(unsigned numSpaces) : ns(numSpaces) {}
       Spacer operator+(const Spacer &o) const { return Spacer(ns + o.ns); }
-      template <typename OStream> void print(OStream &os) const;
+      void print(raw_ostream &os) const;
     private:
       unsigned ns;
     };
@@ -267,57 +267,44 @@ namespace llvm {
     std::string escapeChars(Iterator sBegin, Iterator sEnd) const;
 
     /// \brief Render a machine instruction.
-    template <typename OStream>
-    void renderMachineInstr(OStream &os,
+    void renderMachineInstr(raw_ostream &os,
                             const MachineInstr *mi) const;
 
     /// \brief Render vertical text.
-    template <typename OStream, typename T>
+    template <typename T>
     void renderVertical(const Spacer &indent,
-                        OStream &os,
+                        raw_ostream &os,
                         const T &t) const;
 
     /// \brief Insert CSS layout info.
-    template <typename OStream>
     void insertCSS(const Spacer &indent,
-                   OStream &os) const;
+                   raw_ostream &os) const;
 
     /// \brief Render a brief summary of the function (including rendering
     ///        context).
-    template <typename OStream>
     void renderFunctionSummary(const Spacer &indent,
-                               OStream &os,
+                               raw_ostream &os,
                                const char * const renderContextStr) const;
 
     /// \brief Render a legend for the pressure table.
-    template <typename OStream>
     void renderPressureTableLegend(const Spacer &indent,
-                                   OStream &os) const;
+                                   raw_ostream &os) const;
 
     /// \brief Render a consecutive set of HTML cells of the same class using
     /// the colspan attribute for run-length encoding.
-    template <typename OStream, typename CellType>
+    template <typename CellType>
     void renderCellsWithRLE(
-                     const Spacer &indent, OStream &os,
+                     const Spacer &indent, raw_ostream &os,
                      const std::pair<CellType, unsigned> &rleAccumulator,
                      const std::map<CellType, std::string> &cellTypeStrs) const;
 
     /// \brief Render code listing, potentially with register pressure
     ///        and live intervals shown alongside.
-    template <typename OStream>
     void renderCodeTablePlusPI(const Spacer &indent,
-                               OStream &os) const;
-
-    /// \brief Render warnings about the machine function, or weird rendering
-    ///        parameter combinations (e.g. rendering specified live intervals
-    ///        over more than one machine function).
-    template <typename OStream>
-    void renderWarnings(const Spacer &indent,
-                        OStream &os) const;
+                               raw_ostream &os) const;
 
     /// \brief Render the HTML page representing the MachineFunction.
-    template <typename OStream>
-    void renderFunctionPage(OStream &os,
+    void renderFunctionPage(raw_ostream &os,
                             const char * const renderContextStr) const;
 
     std::string escapeChars(const std::string &s) const;