diff --git a/llvm/include/llvm/Support/InterleavedRange.h b/llvm/include/llvm/Support/InterleavedRange.h
index ce7cac98bcdd4..2c7b87036f4d1 100644
--- a/llvm/include/llvm/Support/InterleavedRange.h
+++ b/llvm/include/llvm/Support/InterleavedRange.h
@@ -44,11 +44,9 @@ template <typename Range> class InterleavedRange {
 
   template <typename OStream>
   friend OStream &operator<<(OStream &OS, const InterleavedRange &Interleaved) {
-    if (!Interleaved.Prefix.empty())
-      OS << Interleaved.Prefix;
+    OS << Interleaved.Prefix;
     llvm::interleave(Interleaved.TheRange, OS, Interleaved.Separator);
-    if (!Interleaved.Suffix.empty())
-      OS << Interleaved.Suffix;
+    OS << Interleaved.Suffix;
     return OS;
   }
 
@@ -56,7 +54,6 @@ template <typename Range> class InterleavedRange {
     std::string Result;
     raw_string_ostream Stream(Result);
     Stream << *this;
-    Stream.flush();
     return Result;
   }