From 777fb00a761d5b4056dd58fb00b60a9d57927256 Mon Sep 17 00:00:00 2001 From: Jake Ehrlich Date: Fri, 15 Dec 2017 20:17:55 +0000 Subject: [PATCH] [llvm-objcopy] Reformat everything using clang-format -i Overtime some non-clang formatted code has creeped into llvm-objcopy. This patch fixes all of that. Differential Revision: https://reviews.llvm.org/D41262 llvm-svn: 320856 --- llvm/tools/llvm-objcopy/Object.cpp | 30 +++++++++++------------- llvm/tools/llvm-objcopy/llvm-objcopy.cpp | 18 +++++++------- 2 files changed, 22 insertions(+), 26 deletions(-) diff --git a/llvm/tools/llvm-objcopy/Object.cpp b/llvm/tools/llvm-objcopy/Object.cpp index 1501e8222432..bd5bcd7fc188 100644 --- a/llvm/tools/llvm-objcopy/Object.cpp +++ b/llvm/tools/llvm-objcopy/Object.cpp @@ -227,10 +227,9 @@ template void RelocSectionWithSymtabBase::removeSectionReferences( const SectionBase *Sec) { if (Symbols == Sec) { - error("Symbol table " + Symbols->Name + - " cannot be removed because it is " - "referenced by the relocation " - "section " + + error("Symbol table " + Symbols->Name + " cannot be removed because it is " + "referenced by the relocation " + "section " + this->Name); } } @@ -245,9 +244,9 @@ void RelocSectionWithSymtabBase::initialize( " is not a symbol table")); if (Info != SHN_UNDEF) - setSection(SecTable.getSection(Info, "Info field value " + Twine(Info) + - " in section " + Name + - " is invalid")); + setSection(SecTable.getSection(Info, + "Info field value " + Twine(Info) + + " in section " + Name + " is invalid")); else setSection(nullptr); } @@ -294,9 +293,8 @@ void DynamicRelocationSection::writeSection(FileOutputBuffer &Out) const { void SectionWithStrTab::removeSectionReferences(const SectionBase *Sec) { if (StrTab == Sec) { - error("String table " + StrTab->Name + - " cannot be removed because it is " - "referenced by the section " + + error("String table " + StrTab->Name + " cannot be removed because it is " + "referenced by the section " + this->Name); } } @@ -306,9 +304,9 @@ bool SectionWithStrTab::classof(const SectionBase *S) { } void SectionWithStrTab::initialize(SectionTableRef SecTable) { - auto StrTab = - SecTable.getSection(Link, "Link field value " + Twine(Link) + - " in section " + Name + " is invalid"); + auto StrTab = SecTable.getSection(Link, + "Link field value " + Twine(Link) + + " in section " + Name + " is invalid"); if (StrTab->Type != SHT_STRTAB) { error("Link field value " + Twine(Link) + " in section " + Name + " is not a string table"); @@ -416,9 +414,9 @@ void Object::initSymbolTable(const object::ELFFile &ElfFile, } } else if (Sym.st_shndx != SHN_UNDEF) { DefSection = SecTable.getSection( - Sym.st_shndx, "Symbol '" + Name + - "' is defined in invalid section with index " + - Twine(Sym.st_shndx)); + Sym.st_shndx, + "Symbol '" + Name + "' is defined in invalid section with index " + + Twine(Sym.st_shndx)); } SymTab->addSymbol(Name, Sym.getBinding(), Sym.getType(), DefSection, diff --git a/llvm/tools/llvm-objcopy/llvm-objcopy.cpp b/llvm/tools/llvm-objcopy/llvm-objcopy.cpp index 615667bf99ab..9d60ae426390 100644 --- a/llvm/tools/llvm-objcopy/llvm-objcopy.cpp +++ b/llvm/tools/llvm-objcopy/llvm-objcopy.cpp @@ -73,7 +73,7 @@ LLVM_ATTRIBUTE_NORETURN void reportError(StringRef File, Error E) { static cl::opt InputFilename(cl::Positional, cl::desc("")); static cl::opt OutputFilename(cl::Positional, cl::desc(""), - cl::init("-")); + cl::init("-")); static cl::opt OutputFormat("O", cl::desc("Set output format to one of the following:" "\n\tbinary")); @@ -100,8 +100,9 @@ static cl::opt StripDebug("strip-debug", cl::desc("Removes all debug information")); static cl::opt StripSections("strip-sections", cl::desc("Remove all section headers")); -static cl::opt StripNonAlloc("strip-non-alloc", - cl::desc("Remove all non-allocated sections")); +static cl::opt + StripNonAlloc("strip-non-alloc", + cl::desc("Remove all non-allocated sections")); static cl::opt StripDWO("strip-dwo", cl::desc("Remove all DWARF .dwo sections from file")); static cl::opt ExtractDWO( @@ -115,9 +116,7 @@ static cl::opt using SectionPred = std::function; -bool IsDWOSection(const SectionBase &Sec) { - return Sec.Name.endswith(".dwo"); -} +bool IsDWOSection(const SectionBase &Sec) { return Sec.Name.endswith(".dwo"); } template bool OnlyKeepDWOPred(const Object &Obj, const SectionBase &Sec) { @@ -164,8 +163,7 @@ void SplitDWOToFile(const ELFObjectFile &ObjFile, StringRef File) { // any previous removals. Lastly whether or not something is removed shouldn't // depend a) on the order the options occur in or b) on some opaque priority // system. The only priority is that keeps/copies overrule removes. -template -void CopyBinary(const ELFObjectFile &ObjFile) { +template void CopyBinary(const ELFObjectFile &ObjFile) { std::unique_ptr> Obj; if (!OutputFormat.empty() && OutputFormat != "binary") @@ -176,7 +174,7 @@ void CopyBinary(const ELFObjectFile &ObjFile) { Obj = llvm::make_unique>(ObjFile); if (!SplitDWO.empty()) - SplitDWOToFile(ObjFile, SplitDWO.getValue()); + SplitDWOToFile(ObjFile, SplitDWO.getValue()); SectionPred RemovePred = [](const SectionBase &) { return false; }; @@ -207,7 +205,7 @@ void CopyBinary(const ELFObjectFile &ObjFile) { return false; if (&Sec == Obj->getSectionHeaderStrTab()) return false; - switch(Sec.Type) { + switch (Sec.Type) { case SHT_SYMTAB: case SHT_REL: case SHT_RELA: