Revert "Introduce a string_ostream string builder facilty"

Temporarily back out commits r211749, r211752 and r211754.

llvm-svn: 211814

Author: atoker

llvm/include/llvm/Analysis/CFGPrinter.h

@@ -36,15 +36,18 @@ struct DOTGraphTraits<const Function*> : public DefaultDOTGraphTraits {
     if (!Node->getName().empty())
       return Node->getName().str();
 
-    string_ostream OS;
+    std::string Str;
+    raw_string_ostream OS(Str);
+
     Node->printAsOperand(OS, false);
     return OS.str();
   }
 
   static std::string getCompleteNodeLabel(const BasicBlock *Node,
                                           const Function *) {
     enum { MaxColumns = 80 };
-    string_ostream OS;
+    std::string Str;
+    raw_string_ostream OS(Str);
 
     if (Node->getName().empty()) {
       Node->printAsOperand(OS, false);
@@ -106,7 +109,8 @@ struct DOTGraphTraits<const Function*> : public DefaultDOTGraphTraits {
 
       if (SuccNo == 0) return "def";
 
-      string_ostream OS;
+      std::string Str;
+      raw_string_ostream OS(Str);
       SwitchInst::ConstCaseIt Case =
           SwitchInst::ConstCaseIt::fromSuccessorIndex(SI, SuccNo);
       OS << Case.getCaseValue()->getValue();

llvm/include/llvm/ExecutionEngine/ObjectBuffer.h

@@ -58,18 +58,23 @@ class ObjectBuffer {
 class ObjectBufferStream : public ObjectBuffer {
   void anchor() override;
 public:
-  ObjectBufferStream() {}
+  ObjectBufferStream() : OS(SV) {}
   virtual ~ObjectBufferStream() {}
 
   raw_ostream &getOStream() { return OS; }
   void flush()
   {
+    OS.flush();
+
     // Make the data accessible via the ObjectBuffer::Buffer
-    Buffer.reset(MemoryBuffer::getMemBuffer(OS.str(), "", false));
+    Buffer.reset(MemoryBuffer::getMemBuffer(StringRef(SV.data(), SV.size()),
+                                            "",
+                                            false));
   }
 
 protected:
-  small_string_ostream<4096> OS; // Working buffer into which we JIT.
+  SmallVector<char, 4096> SV; // Working buffer into which we JIT.
+  raw_svector_ostream     OS; // streaming wrapper
 };
 
 } // namespace llvm

llvm/include/llvm/Support/GraphWriter.h

@@ -184,7 +184,8 @@ class GraphWriter {
         O << "|" << DOT::EscapeString(NodeDesc);
     }
 
-    string_ostream EdgeSourceLabels;
+    std::string edgeSourceLabels;
+    raw_string_ostream EdgeSourceLabels(edgeSourceLabels);
     bool hasEdgeSourceLabels = getEdgeSourceLabels(EdgeSourceLabels, Node);
 
     if (hasEdgeSourceLabels) {

llvm/include/llvm/Support/YAMLTraits.h

@@ -612,7 +612,8 @@ template<typename T>
 typename std::enable_if<has_ScalarTraits<T>::value,void>::type
 yamlize(IO &io, T &Val, bool) {
   if ( io.outputting() ) {
-    llvm::string_ostream Buffer;
+    std::string Storage;
+    llvm::raw_string_ostream Buffer(Storage);
     ScalarTraits<T>::output(Val, io.getContext(), Buffer);
     StringRef Str = Buffer.str();
     io.scalarString(Str, ScalarTraits<T>::mustQuote(Str));

llvm/include/llvm/Support/raw_ostream.h

@@ -15,12 +15,13 @@
 #define LLVM_SUPPORT_RAW_OSTREAM_H
 
 #include "llvm/ADT/StringRef.h"
-#include "llvm/ADT/SmallVector.h"
 #include "llvm/Support/Compiler.h"
 #include "llvm/Support/DataTypes.h"
 
 namespace llvm {
   class format_object_base;
+  template <typename T>
+  class SmallVectorImpl;
 
   namespace sys {
     namespace fs {
@@ -460,14 +461,6 @@ class raw_svector_ostream : public raw_ostream {
   /// current_pos - Return the current position within the stream, not
   /// counting the bytes currently in the buffer.
   uint64_t current_pos() const override;
-
-protected:
-  // This constructor is specified not to access \p O provided for storage as it
-  // may not yet be initialized at construction time.
-  explicit raw_svector_ostream(SmallVectorImpl<char> &O, std::nullptr_t)
-      : OS(O){};
-  void init();
-
 public:
   /// Construct a new raw_svector_ostream.
   ///
@@ -500,25 +493,6 @@ class raw_null_ostream : public raw_ostream {
   ~raw_null_ostream();
 };
 
-/// string_ostream - A raw_ostream that builds a string.  This is a
-/// raw_svector_ostream with storage.
-template <unsigned InternalLen>
-class small_string_ostream : public raw_svector_ostream {
-  SmallVector<char, InternalLen> Buffer;
-  // There's no need to flush explicitly.
-  using raw_svector_ostream::flush;
-
-public:
-  small_string_ostream() : raw_svector_ostream(Buffer, nullptr) { init(); }
-
-  void clear() {
-    flush();
-    Buffer.clear();
-  }
-};
-
-typedef small_string_ostream<128> string_ostream;
-
 } // end llvm namespace
 
 #endif

llvm/include/llvm/TableGen/StringToOffsetTable.h

@@ -42,8 +42,8 @@ class StringToOffsetTable {
 
   void EmitString(raw_ostream &O) {
     // Escape the string.
-    small_string_ostream<256> Str;
-    Str.write_escaped(AggregateString);
+    SmallString<256> Str;
+    raw_svector_ostream(Str).write_escaped(AggregateString);
     AggregateString = Str.str();
 
     O << "    \"";

llvm/lib/Analysis/Analysis.cpp

@@ -75,7 +75,8 @@ void LLVMInitializeAnalysis(LLVMPassRegistryRef R) {
 LLVMBool LLVMVerifyModule(LLVMModuleRef M, LLVMVerifierFailureAction Action,
                           char **OutMessages) {
   raw_ostream *DebugOS = Action != LLVMReturnStatusAction ? &errs() : nullptr;
-  string_ostream MsgsOS;
+  std::string Messages;
+  raw_string_ostream MsgsOS(Messages);
 
   LLVMBool Result = verifyModule(*unwrap(M), OutMessages ? &MsgsOS : DebugOS);
 
@@ -86,10 +87,8 @@ LLVMBool LLVMVerifyModule(LLVMModuleRef M, LLVMVerifierFailureAction Action,
   if (Action == LLVMAbortProcessAction && Result)
     report_fatal_error("Broken module found, compilation aborted!");
 
-  if (OutMessages) {
-    MsgsOS << '\0';
-    *OutMessages = strdup(MsgsOS.str().data());
-  }
+  if (OutMessages)
+    *OutMessages = strdup(MsgsOS.str().c_str());
 
   return Result;
 }

llvm/lib/Analysis/BlockFrequencyInfo.cpp

@@ -82,9 +82,10 @@ struct DOTGraphTraits<BlockFrequencyInfo*> : public DefaultDOTGraphTraits {
 
   std::string getNodeLabel(const BasicBlock *Node,
                            const BlockFrequencyInfo *Graph) {
-    string_ostream OS;
+    std::string Result;
+    raw_string_ostream OS(Result);
 
-    OS << Node->getName() << ":";
+    OS << Node->getName().str() << ":";
     switch (ViewBlockFreqPropagationDAG) {
     case GVDT_Fraction:
       Graph->printBlockFreq(OS, Node);
@@ -97,7 +98,7 @@ struct DOTGraphTraits<BlockFrequencyInfo*> : public DefaultDOTGraphTraits {
                        "never reach this point.");
     }
 
-    return OS.str();
+    return Result;
   }
 };
 

llvm/lib/Analysis/Lint.cpp

@@ -105,10 +105,11 @@ namespace {
     const DataLayout *DL;
     TargetLibraryInfo *TLI;
 
-    string_ostream MessagesStr;
+    std::string Messages;
+    raw_string_ostream MessagesStr;
 
     static char ID; // Pass identification, replacement for typeid
-    Lint() : FunctionPass(ID) {
+    Lint() : FunctionPass(ID), MessagesStr(Messages) {
       initializeLintPass(*PassRegistry::getPassRegistry());
     }
 
@@ -180,7 +181,7 @@ bool Lint::runOnFunction(Function &F) {
   TLI = &getAnalysis<TargetLibraryInfo>();
   visit(F);
   dbgs() << MessagesStr.str();
-  MessagesStr.clear();
+  Messages.clear();
   return false;
 }
 

llvm/lib/AsmParser/LLParser.cpp

@@ -28,9 +28,10 @@
 using namespace llvm;
 
 static std::string getTypeString(Type *T) {
-  string_ostream Result;
-  Result << *T;
-  return Result.str();
+  std::string Result;
+  raw_string_ostream Tmp(Result);
+  Tmp << *T;
+  return Tmp.str();
 }
 
 /// Run: module ::= toplevelentity*