From e41aaea26238d0a5cb19163863819786e24f0e02 Mon Sep 17 00:00:00 2001 From: Jordan Rupprecht Date: Thu, 27 May 2021 16:48:40 -0700 Subject: [PATCH] [NFC][libObject] clang-format Archive{.h,.cpp} In preparation for D100651 --- llvm/include/llvm/Object/Archive.h | 35 +++------ llvm/lib/Object/Archive.cpp | 147 ++++++++++++++++++++----------------- 2 files changed, 89 insertions(+), 93 deletions(-) diff --git a/llvm/include/llvm/Object/Archive.h b/llvm/include/llvm/Object/Archive.h index c3f36bd..5b024c7 100644 --- a/llvm/include/llvm/Object/Archive.h +++ b/llvm/include/llvm/Object/Archive.h @@ -54,17 +54,15 @@ public: Expected> getLastModified() const; StringRef getRawLastModified() const { - return StringRef(ArMemHdr->LastModified, - sizeof(ArMemHdr->LastModified)).rtrim(' '); + return StringRef(ArMemHdr->LastModified, sizeof(ArMemHdr->LastModified)) + .rtrim(' '); } Expected getUID() const; Expected getGID() const; // This returns the size of the private struct ArMemHdrType - uint64_t getSizeOf() const { - return sizeof(ArMemHdrType); - } + uint64_t getSizeOf() const { return sizeof(ArMemHdrType); } private: struct ArMemHdrType { @@ -101,7 +99,7 @@ public: Child(const Archive *Parent, const char *Start, Error *Err); Child(const Archive *Parent, StringRef Data, uint16_t StartOfFile); - bool operator ==(const Child &other) const { + bool operator==(const Child &other) const { assert(!Parent || !other.Parent || Parent == other.Parent); return Data.begin() == other.Data.begin(); } @@ -117,9 +115,7 @@ public: return Header.getLastModified(); } - StringRef getRawLastModified() const { - return Header.getRawLastModified(); - } + StringRef getRawLastModified() const { return Header.getRawLastModified(); } Expected getUID() const { return Header.getUID(); } Expected getGID() const { return Header.getGID(); } @@ -182,11 +178,9 @@ public: public: Symbol(const Archive *p, uint32_t symi, uint32_t stri) - : Parent(p) - , SymbolIndex(symi) - , StringIndex(stri) {} + : Parent(p), SymbolIndex(symi), StringIndex(stri) {} - bool operator ==(const Symbol &other) const { + bool operator==(const Symbol &other) const { return (Parent == other.Parent) && (SymbolIndex == other.SymbolIndex); } @@ -212,7 +206,7 @@ public: return !(*this == other); } - symbol_iterator& operator++() { // Preincrement + symbol_iterator &operator++() { // Preincrement symbol = symbol.getNext(); return *this; } @@ -224,14 +218,7 @@ public: /// Size field is 10 decimal digits long static const uint64_t MaxMemberSize = 9999999999; - enum Kind { - K_GNU, - K_GNU64, - K_BSD, - K_DARWIN, - K_DARWIN64, - K_COFF - }; + enum Kind { K_GNU, K_GNU64, K_BSD, K_DARWIN, K_DARWIN64, K_COFF }; Kind kind() const { return (Kind)Format; } bool isThin() const { return IsThin; } @@ -250,9 +237,7 @@ public: } // Cast methods. - static bool classof(Binary const *v) { - return v->isArchive(); - } + static bool classof(Binary const *v) { return v->isArchive(); } // check if a symbol is in the archive Expected> findSym(StringRef name) const; diff --git a/llvm/lib/Object/Archive.cpp b/llvm/lib/Object/Archive.cpp index 11c9de4..6ff896c 100644 --- a/llvm/lib/Object/Archive.cpp +++ b/llvm/lib/Object/Archive.cpp @@ -43,8 +43,7 @@ const char ThinMagic[] = "!\n"; void Archive::anchor() {} -static Error -malformedError(Twine Msg) { +static Error malformedError(Twine Msg) { std::string StringMsg = "truncated or malformed archive (" + Msg.str() + ")"; return make_error(std::move(StringMsg), object_error::parse_failed); @@ -77,8 +76,8 @@ ArchiveMemberHeader::ArchiveMemberHeader(const Archive *Parent, if (Err) { std::string Buf; raw_string_ostream OS(Buf); - OS.write_escaped(StringRef(ArMemHdr->Terminator, - sizeof(ArMemHdr->Terminator))); + OS.write_escaped( + StringRef(ArMemHdr->Terminator, sizeof(ArMemHdr->Terminator))); OS.flush(); std::string Msg("terminator characters in archive member \"" + Buf + "\" not the correct \"`\\n\" values for the archive " @@ -102,14 +101,14 @@ Expected ArchiveMemberHeader::getRawName() const { auto Kind = Parent->kind(); if (Kind == Archive::K_BSD || Kind == Archive::K_DARWIN64) { if (ArMemHdr->Name[0] == ' ') { - uint64_t Offset = reinterpret_cast(ArMemHdr) - - Parent->getData().data(); + uint64_t Offset = + reinterpret_cast(ArMemHdr) - Parent->getData().data(); return malformedError("name contains a leading space for archive member " - "header at offset " + Twine(Offset)); + "header at offset " + + Twine(Offset)); } EndCond = ' '; - } - else if (ArMemHdr->Name[0] == '/' || ArMemHdr->Name[0] == '#') + } else if (ArMemHdr->Name[0] == '/' || ArMemHdr->Name[0] == '#') EndCond = ' '; else EndCond = '/'; @@ -131,8 +130,8 @@ Expected ArchiveMemberHeader::getName(uint64_t Size) const { // archive header is truncated to produce an error message with the name. // Make sure the name field is not truncated. if (Size < offsetof(ArMemHdrType, Name) + sizeof(ArMemHdr->Name)) { - uint64_t ArchiveOffset = reinterpret_cast(ArMemHdr) - - Parent->getData().data(); + uint64_t ArchiveOffset = + reinterpret_cast(ArMemHdr) - Parent->getData().data(); return malformedError("archive header truncated before the name field " "for archive member header at offset " + Twine(ArchiveOffset)); @@ -158,21 +157,22 @@ Expected ArchiveMemberHeader::getName(uint64_t Size) const { raw_string_ostream OS(Buf); OS.write_escaped(Name.substr(1).rtrim(' ')); OS.flush(); - uint64_t ArchiveOffset = reinterpret_cast(ArMemHdr) - - Parent->getData().data(); + uint64_t ArchiveOffset = + reinterpret_cast(ArMemHdr) - Parent->getData().data(); return malformedError("long name offset characters after the '/' are " - "not all decimal numbers: '" + Buf + "' for " - "archive member header at offset " + + "not all decimal numbers: '" + + Buf + "' for archive member header at offset " + Twine(ArchiveOffset)); } // Verify it. if (StringOffset >= Parent->getStringTable().size()) { - uint64_t ArchiveOffset = reinterpret_cast(ArMemHdr) - - Parent->getData().data(); - return malformedError("long name offset " + Twine(StringOffset) + " past " - "the end of the string table for archive member " - "header at offset " + Twine(ArchiveOffset)); + uint64_t ArchiveOffset = + reinterpret_cast(ArMemHdr) - Parent->getData().data(); + return malformedError("long name offset " + Twine(StringOffset) + + " past the end of the string table for archive " + "member header at offset " + + Twine(ArchiveOffset)); } // GNU long file names end with a "/\n". @@ -196,23 +196,24 @@ Expected ArchiveMemberHeader::getName(uint64_t Size) const { raw_string_ostream OS(Buf); OS.write_escaped(Name.substr(3).rtrim(' ')); OS.flush(); - uint64_t ArchiveOffset = reinterpret_cast(ArMemHdr) - - Parent->getData().data(); + uint64_t ArchiveOffset = + reinterpret_cast(ArMemHdr) - Parent->getData().data(); return malformedError("long name length characters after the #1/ are " - "not all decimal numbers: '" + Buf + "' for " - "archive member header at offset " + + "not all decimal numbers: '" + + Buf + "' for archive member header at offset " + Twine(ArchiveOffset)); } if (getSizeOf() + NameLength > Size) { - uint64_t ArchiveOffset = reinterpret_cast(ArMemHdr) - - Parent->getData().data(); + uint64_t ArchiveOffset = + reinterpret_cast(ArMemHdr) - Parent->getData().data(); return malformedError("long name length: " + Twine(NameLength) + " extends past the end of the member or archive " "for archive member header at offset " + Twine(ArchiveOffset)); } return StringRef(reinterpret_cast(ArMemHdr) + getSizeOf(), - NameLength).rtrim('\0'); + NameLength) + .rtrim('\0'); } // It is not a long name so trim the blanks at the end of the name. @@ -225,36 +226,43 @@ Expected ArchiveMemberHeader::getName(uint64_t Size) const { Expected ArchiveMemberHeader::getSize() const { uint64_t Ret; - if (StringRef(ArMemHdr->Size, - sizeof(ArMemHdr->Size)).rtrim(" ").getAsInteger(10, Ret)) { + if (StringRef(ArMemHdr->Size, sizeof(ArMemHdr->Size)) + .rtrim(" ") + .getAsInteger(10, Ret)) { std::string Buf; raw_string_ostream OS(Buf); - OS.write_escaped(StringRef(ArMemHdr->Size, - sizeof(ArMemHdr->Size)).rtrim(" ")); + OS.write_escaped( + StringRef(ArMemHdr->Size, sizeof(ArMemHdr->Size)).rtrim(" ")); OS.flush(); - uint64_t Offset = reinterpret_cast(ArMemHdr) - - Parent->getData().data(); + uint64_t Offset = + reinterpret_cast(ArMemHdr) - Parent->getData().data(); return malformedError("characters in size field in archive header are not " - "all decimal numbers: '" + Buf + "' for archive " - "member header at offset " + Twine(Offset)); + "all decimal numbers: '" + + Buf + + "' for archive " + "member header at offset " + + Twine(Offset)); } return Ret; } Expected ArchiveMemberHeader::getAccessMode() const { unsigned Ret; - if (StringRef(ArMemHdr->AccessMode, - sizeof(ArMemHdr->AccessMode)).rtrim(' ').getAsInteger(8, Ret)) { + if (StringRef(ArMemHdr->AccessMode, sizeof(ArMemHdr->AccessMode)) + .rtrim(' ') + .getAsInteger(8, Ret)) { std::string Buf; raw_string_ostream OS(Buf); - OS.write_escaped(StringRef(ArMemHdr->AccessMode, - sizeof(ArMemHdr->AccessMode)).rtrim(" ")); + OS.write_escaped( + StringRef(ArMemHdr->AccessMode, sizeof(ArMemHdr->AccessMode)) + .rtrim(" ")); OS.flush(); - uint64_t Offset = reinterpret_cast(ArMemHdr) - - Parent->getData().data(); + uint64_t Offset = + reinterpret_cast(ArMemHdr) - Parent->getData().data(); return malformedError("characters in AccessMode field in archive header " - "are not all decimal numbers: '" + Buf + "' for the " - "archive member header at offset " + Twine(Offset)); + "are not all decimal numbers: '" + + Buf + "' for the archive member header at offset " + + Twine(Offset)); } return static_cast(Ret); } @@ -262,19 +270,21 @@ Expected ArchiveMemberHeader::getAccessMode() const { Expected> ArchiveMemberHeader::getLastModified() const { unsigned Seconds; - if (StringRef(ArMemHdr->LastModified, - sizeof(ArMemHdr->LastModified)).rtrim(' ') + if (StringRef(ArMemHdr->LastModified, sizeof(ArMemHdr->LastModified)) + .rtrim(' ') .getAsInteger(10, Seconds)) { std::string Buf; raw_string_ostream OS(Buf); - OS.write_escaped(StringRef(ArMemHdr->LastModified, - sizeof(ArMemHdr->LastModified)).rtrim(" ")); + OS.write_escaped( + StringRef(ArMemHdr->LastModified, sizeof(ArMemHdr->LastModified)) + .rtrim(" ")); OS.flush(); - uint64_t Offset = reinterpret_cast(ArMemHdr) - - Parent->getData().data(); + uint64_t Offset = + reinterpret_cast(ArMemHdr) - Parent->getData().data(); return malformedError("characters in LastModified field in archive header " - "are not all decimal numbers: '" + Buf + "' for the " - "archive member header at offset " + Twine(Offset)); + "are not all decimal numbers: '" + + Buf + "' for the archive member header at offset " + + Twine(Offset)); } return sys::toTimePoint(Seconds); @@ -290,11 +300,12 @@ Expected ArchiveMemberHeader::getUID() const { raw_string_ostream OS(Buf); OS.write_escaped(User); OS.flush(); - uint64_t Offset = reinterpret_cast(ArMemHdr) - - Parent->getData().data(); + uint64_t Offset = + reinterpret_cast(ArMemHdr) - Parent->getData().data(); return malformedError("characters in UID field in archive header " - "are not all decimal numbers: '" + Buf + "' for the " - "archive member header at offset " + Twine(Offset)); + "are not all decimal numbers: '" + + Buf + "' for the archive member header at offset " + + Twine(Offset)); } return Ret; } @@ -309,11 +320,12 @@ Expected ArchiveMemberHeader::getGID() const { raw_string_ostream OS(Buf); OS.write_escaped(Group); OS.flush(); - uint64_t Offset = reinterpret_cast(ArMemHdr) - - Parent->getData().data(); + uint64_t Offset = + reinterpret_cast(ArMemHdr) - Parent->getData().data(); return malformedError("characters in GID field in archive header " - "are not all decimal numbers: '" + Buf + "' for the " - "archive member header at offset " + Twine(Offset)); + "are not all decimal numbers: '" + + Buf + "' for the archive member header at offset " + + Twine(Offset)); } return Ret; } @@ -321,15 +333,15 @@ Expected ArchiveMemberHeader::getGID() const { Archive::Child::Child(const Archive *Parent, StringRef Data, uint16_t StartOfFile) : Parent(Parent), Header(Parent, Data.data(), Data.size(), nullptr), - Data(Data), StartOfFile(StartOfFile) { -} + Data(Data), StartOfFile(StartOfFile) {} Archive::Child::Child(const Archive *Parent, const char *Start, Error *Err) : Parent(Parent), Header(Parent, Start, Parent - ? Parent->getData().size() - (Start - Parent->getData().data()) - : 0, Err) { + ? Parent->getData().size() - (Start - Parent->getData().data()) + : 0, + Err) { if (!Start) return; @@ -368,7 +380,7 @@ Archive::Child::Child(const Archive *Parent, const char *Start, Error *Err) StartOfFile = Header.getSizeOf(); // Don't include attached name. Expected NameOrErr = getRawName(); - if (!NameOrErr){ + if (!NameOrErr) { *Err = NameOrErr.takeError(); return; } @@ -382,8 +394,8 @@ Archive::Child::Child(const Archive *Parent, const char *Start, Error *Err) OS.flush(); uint64_t Offset = Start - Parent->getData().data(); *Err = malformedError("long name length characters after the #1/ are " - "not all decimal numbers: '" + Buf + "' for " - "archive member header at offset " + + "not all decimal numbers: '" + + Buf + "' for archive member header at offset " + Twine(Offset)); return; } @@ -646,8 +658,7 @@ Archive::Archive(MemoryBufferRef Source, Error &Err) SymbolTable = BufOrErr.get(); if (Increment()) return; - } - else if (Name == "__.SYMDEF_64 SORTED" || Name == "__.SYMDEF_64") { + } else if (Name == "__.SYMDEF_64 SORTED" || Name == "__.SYMDEF_64") { Format = K_DARWIN64; // We know that the symbol table is not an external file, but we still // must check any Expected<> return value. -- 2.7.4