From 8dd8d5c2b2ad0f9dd1ca01c0a7d8ebac57b8537d Mon Sep 17 00:00:00 2001 From: Alp Toker Date: Thu, 26 Jun 2014 22:52:05 +0000 Subject: Revert "Introduce a string_ostream string builder facilty" Temporarily back out commits r211749, r211752 and r211754. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@211814 91177308-0d34-0410-b5e6-96231b3b80d8 --- utils/FileCheck/FileCheck.cpp | 3 ++- utils/TableGen/CodeEmitterGen.cpp | 3 ++- utils/yaml-bench/YAMLBench.cpp | 28 +++++++++++++++------------- 3 files changed, 19 insertions(+), 15 deletions(-) (limited to 'utils') diff --git a/utils/FileCheck/FileCheck.cpp b/utils/FileCheck/FileCheck.cpp index 2c33e6896b..978e05f4f2 100644 --- a/utils/FileCheck/FileCheck.cpp +++ b/utils/FileCheck/FileCheck.cpp @@ -458,7 +458,8 @@ void Pattern::PrintFailureInfo(const SourceMgr &SM, StringRef Buffer, // variable values. if (!VariableUses.empty()) { for (unsigned i = 0, e = VariableUses.size(); i != e; ++i) { - small_string_ostream<256> OS; + SmallString<256> Msg; + raw_svector_ostream OS(Msg); StringRef Var = VariableUses[i].first; if (Var[0] == '@') { std::string Value; diff --git a/utils/TableGen/CodeEmitterGen.cpp b/utils/TableGen/CodeEmitterGen.cpp index 5e27d45b15..4d0c0ca8e7 100644 --- a/utils/TableGen/CodeEmitterGen.cpp +++ b/utils/TableGen/CodeEmitterGen.cpp @@ -319,7 +319,8 @@ void CodeEmitterGen::run(raw_ostream &o) { // Default case: unhandled opcode o << " default:\n" - << " string_ostream Msg;\n" + << " std::string msg;\n" + << " raw_string_ostream Msg(msg);\n" << " Msg << \"Not supported instr: \" << MI;\n" << " report_fatal_error(Msg.str());\n" << " }\n" diff --git a/utils/yaml-bench/YAMLBench.cpp b/utils/yaml-bench/YAMLBench.cpp index c3c7c152c2..39b8f72ecc 100644 --- a/utils/yaml-bench/YAMLBench.cpp +++ b/utils/yaml-bench/YAMLBench.cpp @@ -166,21 +166,23 @@ static void benchmark( llvm::TimerGroup &Group } static std::string createJSONText(size_t MemoryMB, unsigned ValueSize) { - llvm::string_ostream OS; - OS << "[\n"; + std::string JSONText; + llvm::raw_string_ostream Stream(JSONText); + Stream << "[\n"; size_t MemoryBytes = MemoryMB * 1024 * 1024; - while (OS.tell() < MemoryBytes) { - OS << " {\n" - << " \"key1\": \"" << std::string(ValueSize, '*') << "\",\n" - << " \"key2\": \"" << std::string(ValueSize, '*') << "\",\n" - << " \"key3\": \"" << std::string(ValueSize, '*') << "\"\n" - << " }"; - if (OS.tell() < MemoryBytes) - OS << ","; - OS << "\n"; + while (JSONText.size() < MemoryBytes) { + Stream << " {\n" + << " \"key1\": \"" << std::string(ValueSize, '*') << "\",\n" + << " \"key2\": \"" << std::string(ValueSize, '*') << "\",\n" + << " \"key3\": \"" << std::string(ValueSize, '*') << "\"\n" + << " }"; + Stream.flush(); + if (JSONText.size() < MemoryBytes) Stream << ","; + Stream << "\n"; } - OS << "]\n"; - return OS.str(); + Stream << "]\n"; + Stream.flush(); + return JSONText; } int main(int argc, char **argv) { -- cgit v1.2.3