commit e69170a11079504e1b20ec79296925f295dc01c0
author Alp Toker <alp@nuanti.com> Thu Jun 26 22:52:05 2014 +0000
committer Alp Toker <alp@nuanti.com> Thu Jun 26 22:52:05 2014 +0000
tree 7c415eb6c14f0afb0e97e42d6ba2579dd897fb3a
parent 11c6f6165b76a42da7eaf4514e419be397d7fc44

Revert "Introduce a string_ostream string builder facilty"

Temporarily back out commits r211749, r211752 and r211754.

llvm-svn: 211814

llvm/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp

diff --git a/llvm/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp b/llvm/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp
index 3f9eb07..7840342 100644
--- a/llvm/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp
+++ b/llvm/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp
@@ -281,7 +281,8 @@
   unsigned RelaxedOp = getRelaxedOpcode(Inst.getOpcode());
 
   if (RelaxedOp == Inst.getOpcode()) {
-    small_string_ostream<256> OS;
+    SmallString<256> Tmp;
+    raw_svector_ostream OS(Tmp);
     Inst.dump_pretty(OS);
     OS << "\n";
     report_fatal_error("unexpected instruction to relax: " + OS.str());