Subzero: Make Ice::Ostream a typedef for llvm::raw_ostream.

src/IceDefs.h

 //===- subzero/src/IceDefs.h - Common Subzero declaraions -------*- C++ -*-===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This file declares various useful types and classes that have
@@ skipping 87 matching lines @@
   IceV_Liveness = 1 << 5,
   IceV_RegManager = 1 << 6,
   IceV_RegOrigins = 1 << 7,
   IceV_LinearScan = 1 << 8,
   IceV_Frame = 1 << 9,
   IceV_Timing = 1 << 10,
   IceV_All = ~IceV_None
 };
 typedef uint32_t VerboseMask;
 
-// The Ostream class wraps an output stream and a Cfg pointer, so
-// that dump routines have access to the Cfg object and can print
-// labels and variable names.
-
-class Ostream {
-public:
-  Ostream(llvm::raw_ostream *Stream) : Stream(Stream) {}
-
-  llvm::raw_ostream *Stream;
-
-private:
-  Ostream(const Ostream &) LLVM_DELETED_FUNCTION;
-  Ostream &operator=(const Ostream &) LLVM_DELETED_FUNCTION;
-};
-
-template <typename T> inline Ostream &operator<<(Ostream &Str, const T &Val) {
-  if (Str.Stream)
-    (*Str.Stream) << Val;
-  return Str;
-}
+typedef llvm::raw_ostream Ostream;
 
 // TODO: Implement in terms of std::chrono after switching to C++11.
 class Timer {
 public:
   Timer() : Start(llvm::TimeRecord::getCurrentTime(false)) {}
   uint64_t getElapsedNs() const { return getElapsedSec() * 1000 * 1000 * 1000; }
   uint64_t getElapsedUs() const { return getElapsedSec() * 1000 * 1000; }
   uint64_t getElapsedMs() const { return getElapsedSec() * 1000; }
   double getElapsedSec() const {
     llvm::TimeRecord End = llvm::TimeRecord::getCurrentTime(false);
     return End.getWallTime() - Start.getWallTime();
   }
   void printElapsedUs(GlobalContext *Ctx, const IceString &Tag) const;
 
 private:
   const llvm::TimeRecord Start;
   Timer(const Timer &) LLVM_DELETED_FUNCTION;
   Timer &operator=(const Timer &) LLVM_DELETED_FUNCTION;
 };
 
 } // end of namespace Ice
 
 #endif // SUBZERO_SRC_ICEDEFS_H