From 35979c021e4789b915cd569145bd9fb9ae0d8d8b Mon Sep 17 00:00:00 2001
From: Daniel Dunbar <daniel@zuster.org>
Date: Tue, 18 Aug 2009 20:07:36 +0000
Subject: [PATCH] Revert r78924, disabling buffering defeats all the fast paths
 in raw_ostream.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@79361 91177308-0d34-0410-b5e6-96231b3b80d8
---
 include/llvm/Support/raw_ostream.h | 10 ++++++----
 lib/Support/raw_ostream.cpp        | 12 ++++++++++++
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/include/llvm/Support/raw_ostream.h b/include/llvm/Support/raw_ostream.h
index d9110dd31d8..b1b96f23169 100644
--- a/include/llvm/Support/raw_ostream.h
+++ b/include/llvm/Support/raw_ostream.h
@@ -376,7 +376,8 @@ class raw_os_ostream : public raw_ostream {
   virtual uint64_t current_pos();
 
 public:
-  raw_os_ostream(std::ostream &O) : raw_ostream(true), OS(O) {}
+  raw_os_ostream(std::ostream &O) : OS(O) {}
+  ~raw_os_ostream();
 
   /// tell - Return the current offset with the stream.
   uint64_t tell();
@@ -394,7 +395,8 @@ class raw_string_ostream : public raw_ostream {
   /// counting the bytes currently in the buffer.
   virtual uint64_t current_pos() { return OS.size(); }
 public:
-  explicit raw_string_ostream(std::string &O) : raw_ostream(true), OS(O) {}
+  explicit raw_string_ostream(std::string &O) : OS(O) {}
+  ~raw_string_ostream();
 
   /// tell - Return the current offset with the stream.
   uint64_t tell() { return OS.size() + GetNumBytesInBuffer(); }
@@ -420,8 +422,8 @@ class raw_svector_ostream : public raw_ostream {
   /// counting the bytes currently in the buffer.
   virtual uint64_t current_pos();
 public:
-  explicit raw_svector_ostream(SmallVectorImpl<char> &O)
-    : raw_ostream(true), OS(O) {}
+  explicit raw_svector_ostream(SmallVectorImpl<char> &O) : OS(O) {}
+  ~raw_svector_ostream();
 
   /// tell - Return the current offset with the stream.
   uint64_t tell();
diff --git a/lib/Support/raw_ostream.cpp b/lib/Support/raw_ostream.cpp
index ea9b801f182..a91fe9b5364 100644
--- a/lib/Support/raw_ostream.cpp
+++ b/lib/Support/raw_ostream.cpp
@@ -456,6 +456,10 @@ raw_ostream &llvm::nulls() {
 //  raw_os_ostream
 //===----------------------------------------------------------------------===//
 
+raw_os_ostream::~raw_os_ostream() {
+  flush();
+}
+
 void raw_os_ostream::write_impl(const char *Ptr, size_t Size) {
   OS.write(Ptr, Size);
 }
@@ -470,6 +474,10 @@ uint64_t raw_os_ostream::tell() {
 //  raw_string_ostream
 //===----------------------------------------------------------------------===//
 
+raw_string_ostream::~raw_string_ostream() {
+  flush();
+}
+
 void raw_string_ostream::write_impl(const char *Ptr, size_t Size) {
   OS.append(Ptr, Size);
 }
@@ -478,6 +486,10 @@ void raw_string_ostream::write_impl(const char *Ptr, size_t Size) {
 //  raw_svector_ostream
 //===----------------------------------------------------------------------===//
 
+raw_svector_ostream::~raw_svector_ostream() {
+  flush();
+}
+
 void raw_svector_ostream::write_impl(const char *Ptr, size_t Size) {
   OS.append(Ptr, Ptr + Size);
 }