diff options
| author | Alp Toker <alp@nuanti.com> | 2014-06-26 22:52:05 +0000 |
|---|---|---|
| committer | Alp Toker <alp@nuanti.com> | 2014-06-26 22:52:05 +0000 |
| commit | e69170a11079504e1b20ec79296925f295dc01c0 (patch) | |
| tree | 7c415eb6c14f0afb0e97e42d6ba2579dd897fb3a /llvm/lib/Target/X86 | |
| parent | 11c6f6165b76a42da7eaf4514e419be397d7fc44 (diff) | |
| download | bcm5719-llvm-e69170a11079504e1b20ec79296925f295dc01c0.tar.gz bcm5719-llvm-e69170a11079504e1b20ec79296925f295dc01c0.zip | |
Revert "Introduce a string_ostream string builder facilty"
Temporarily back out commits r211749, r211752 and r211754.
llvm-svn: 211814
Diffstat (limited to 'llvm/lib/Target/X86')
| -rw-r--r-- | llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp | 3 | ||||
| -rw-r--r-- | llvm/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp | 3 | ||||
| -rw-r--r-- | llvm/lib/Target/X86/X86AsmPrinter.cpp | 6 |
3 files changed, 8 insertions, 4 deletions
diff --git a/llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp b/llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp index 7e04608d991..3e57914f9e9 100644 --- a/llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp +++ b/llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp @@ -2412,7 +2412,8 @@ bool X86AsmParser::MatchAndEmitInstruction(SMLoc IDLoc, unsigned &Opcode, if (Match3 == Match_Success) MatchChars[NumMatches++] = Suffixes[2]; if (Match4 == Match_Success) MatchChars[NumMatches++] = Suffixes[3]; - small_string_ostream<128> OS; + SmallString<126> Msg; + raw_svector_ostream OS(Msg); OS << "ambiguous instructions require an explicit suffix (could be "; for (unsigned i = 0; i != NumMatches; ++i) { if (i != 0) diff --git a/llvm/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp b/llvm/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp index 3f9eb07d83d..78403424da6 100644 --- a/llvm/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp +++ b/llvm/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp @@ -281,7 +281,8 @@ void X86AsmBackend::relaxInstruction(const MCInst &Inst, MCInst &Res) const { 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()); diff --git a/llvm/lib/Target/X86/X86AsmPrinter.cpp b/llvm/lib/Target/X86/X86AsmPrinter.cpp index cdfff821431..1dca5689ade 100644 --- a/llvm/lib/Target/X86/X86AsmPrinter.cpp +++ b/llvm/lib/Target/X86/X86AsmPrinter.cpp @@ -550,7 +550,8 @@ emitNonLazySymbolPointer(MCStreamer &OutStreamer, MCSymbol *StubLabel, } void X86AsmPrinter::GenerateExportDirective(const MCSymbol *Sym, bool IsData) { - small_string_ostream<128> OS; + SmallString<128> Directive; + raw_svector_ostream OS(Directive); StringRef Name = Sym->getName(); if (Subtarget->isTargetKnownWindowsMSVC()) @@ -571,7 +572,8 @@ void X86AsmPrinter::GenerateExportDirective(const MCSymbol *Sym, bool IsData) { OS << ",data"; } - OutStreamer.EmitBytes(OS.str()); + OS.flush(); + OutStreamer.EmitBytes(Directive); } void X86AsmPrinter::EmitEndOfAsmFile(Module &M) { |
