diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/llvm-ar/llvm-ar.cpp | 3 | ||||
| -rw-r--r-- | tools/llvm-objdump/llvm-objdump.cpp | 12 | ||||
| -rw-r--r-- | tools/llvm-readobj/ARMWinEHPrinter.cpp | 3 | ||||
| -rw-r--r-- | tools/llvm-readobj/Win64EHDumper.cpp | 4 |
4 files changed, 8 insertions, 14 deletions
diff --git a/tools/llvm-ar/llvm-ar.cpp b/tools/llvm-ar/llvm-ar.cpp index 60886bb7b1..2d7e8df6b4 100644 --- a/tools/llvm-ar/llvm-ar.cpp +++ b/tools/llvm-ar/llvm-ar.cpp @@ -689,8 +689,7 @@ writeSymbolTable(raw_fd_ostream &Out, ArrayRef<NewArchiveIterator> Members, std::vector<std::pair<unsigned, unsigned>> &MemberOffsetRefs) { unsigned StartOffset = 0; unsigned MemberNum = 0; - std::string NameBuf; - raw_string_ostream NameOS(NameBuf); + string_ostream NameOS; unsigned NumSyms = 0; LLVMContext &Context = getGlobalContext(); for (ArrayRef<NewArchiveIterator>::iterator I = Members.begin(), diff --git a/tools/llvm-objdump/llvm-objdump.cpp b/tools/llvm-objdump/llvm-objdump.cpp index d98691b4b0..d9886c10ae 100644 --- a/tools/llvm-objdump/llvm-objdump.cpp +++ b/tools/llvm-objdump/llvm-objdump.cpp @@ -222,8 +222,7 @@ static void emitDOTFile(const char *FileName, const MCFunction &f, Out << "<o>"; // Escape special chars and print the instruction in mnemonic form. - std::string Str; - raw_string_ostream OS(Str); + string_ostream OS; IP->printInst(&(*i)->getInsts()->at(ii).Inst, OS, ""); Out << DOT::EscapeString(OS.str()); } @@ -473,9 +472,7 @@ static void DisassembleObject(const ObjectFile *Obj, bool InlineRelocs) { if (Symbols.empty()) Symbols.push_back(std::make_pair(0, name)); - - SmallString<40> Comments; - raw_svector_ostream CommentStream(Comments); + small_string_ostream<40> Comments; StringRef Bytes; if (error(Section.getContents(Bytes))) @@ -513,15 +510,14 @@ static void DisassembleObject(const ObjectFile *Obj, bool InlineRelocs) { MCInst Inst; if (DisAsm->getInstruction(Inst, Size, memoryObject, - SectionAddr + Index, - DebugOut, CommentStream)) { + SectionAddr + Index, DebugOut, Comments)) { outs() << format("%8" PRIx64 ":", SectionAddr + Index); if (!NoShowRawInsn) { outs() << "\t"; DumpBytes(StringRef(Bytes.data() + Index, Size)); } IP->printInst(&Inst, outs(), ""); - outs() << CommentStream.str(); + outs() << Comments.str(); Comments.clear(); outs() << "\n"; } else { diff --git a/tools/llvm-readobj/ARMWinEHPrinter.cpp b/tools/llvm-readobj/ARMWinEHPrinter.cpp index f6675bdcfe..7138438ca2 100644 --- a/tools/llvm-readobj/ARMWinEHPrinter.cpp +++ b/tools/llvm-readobj/ARMWinEHPrinter.cpp @@ -95,8 +95,7 @@ raw_ostream &operator<<(raw_ostream &OS, const ARM::WinEH::ReturnType &RT) { static std::string formatSymbol(StringRef Name, uint64_t Address, uint64_t Offset = 0) { - std::string Buffer; - raw_string_ostream OS(Buffer); + string_ostream OS; if (!Name.empty()) OS << Name << " "; diff --git a/tools/llvm-readobj/Win64EHDumper.cpp b/tools/llvm-readobj/Win64EHDumper.cpp index f058632a8c..2d67843486 100644 --- a/tools/llvm-readobj/Win64EHDumper.cpp +++ b/tools/llvm-readobj/Win64EHDumper.cpp @@ -115,8 +115,7 @@ static unsigned getNumUsedSlots(const UnwindCode &UnwindCode) { static std::string formatSymbol(const Dumper::Context &Ctx, const coff_section *Section, uint64_t Offset, uint32_t Displacement) { - std::string Buffer; - raw_string_ostream OS(Buffer); + string_ostream OS; StringRef Name; SymbolRef Symbol; @@ -131,6 +130,7 @@ static std::string formatSymbol(const Dumper::Context &Ctx, OS << format(" +0x%X (0x%" PRIX64 ")", Displacement, Offset); else OS << format(" (0x%" PRIX64 ")", Offset); + return OS.str(); } |