Fix a bug in raw_ostream::write(char) introduced by the change to

allow underlying stream classes to decline buffering. After
calling SetBuffered(), re-check whether the stream is Unbuffered
in order to handle the case where the underlying stream has
declined buffering.


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

1 files changed, 10 insertions, 3 deletions

diff --git a/lib/Support/raw_ostream.cpp b/lib/Support/raw_ostream.cpp
index a91fe9b536..0c1843c457 100644
--- a/lib/Support/raw_ostream.cpp
+++ b/lib/Support/raw_ostream.cpp
@@ -187,10 +187,17 @@ raw_ostream &raw_ostream::write(unsigned char C) {
       return *this;
     }
     
-    if (!OutBufStart)
-      SetBuffered();
-    else
+    if (OutBufStart)
       flush_nonempty();
+    else {
+      SetBuffered();
+      // It's possible for the underlying stream to decline
+      // buffering, so check this condition again.
+      if (Unbuffered) {
+        write_impl(reinterpret_cast<char*>(&C), 1);
+        return *this;
+      }
+    }
   }
 
   *OutBufCur++ = C;