[lld] r197834 - Restore vertical alignment lost by clang-format
Joey Gouly
joey.gouly at gmail.com
Fri Dec 20 13:26:03 PST 2013
Do we actually want to go against clang-format here?
Or, is this important enough that we can make clang-format produce code
like this?
On 20 Dec 2013 20:40, "Nick Kledzik" <kledzik at apple.com> wrote:
> Author: kledzik
> Date: Fri Dec 20 14:34:19 2013
> New Revision: 197834
>
> URL: http://llvm.org/viewvc/llvm-project?rev=197834&view=rev
> Log:
> Restore vertical alignment lost by clang-format
>
> Modified:
> lld/trunk/include/lld/Core/Reference.h
> lld/trunk/include/lld/ReaderWriter/CoreLinkingContext.h
> lld/trunk/include/lld/ReaderWriter/Reader.h
> lld/trunk/include/lld/ReaderWriter/Simple.h
> lld/trunk/lib/Driver/CoreDriver.cpp
> lld/trunk/lib/ReaderWriter/MachO/ReferenceKinds.h
> lld/trunk/lib/ReaderWriter/Native/NativeFileFormat.h
> lld/trunk/lib/ReaderWriter/Native/ReaderNative.cpp
> lld/trunk/lib/ReaderWriter/Reader.cpp
> lld/trunk/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp
>
> Modified: lld/trunk/include/lld/Core/Reference.h
> URL:
> http://llvm.org/viewvc/llvm-project/lld/trunk/include/lld/Core/Reference.h?rev=197834&r1=197833&r2=197834&view=diff
>
> ==============================================================================
> --- lld/trunk/include/lld/Core/Reference.h (original)
> +++ lld/trunk/include/lld/Core/Reference.h Fri Dec 20 14:34:19 2013
> @@ -40,11 +40,11 @@ class Reference {
> public:
> /// Which universe defines the kindValue().
> enum class KindNamespace {
> - all = 0,
> + all = 0,
> testing = 1,
> - ELF = 2,
> - COFF = 3,
> - mach_o = 4,
> + ELF = 2,
> + COFF = 3,
> + mach_o = 4,
> };
>
> KindNamespace kindNamespace() const { return
> (KindNamespace)_kindNamespace; }
> @@ -52,13 +52,13 @@ public:
>
> // Which architecture the kind value is for.
> enum class KindArch {
> - all = 0,
> - x86_64 = 1,
> - x86 = 2,
> - ARM = 3,
> + all = 0,
> + x86_64 = 1,
> + x86 = 2,
> + ARM = 3,
> PowerPC = 4,
> Hexagon = 5,
> - Mips = 6
> + Mips = 6
> };
>
> KindArch kindArch() const { return (KindArch)_kindArch; }
> @@ -76,8 +76,8 @@ public:
>
> /// KindValues used with KindNamespace::all and KindArch::all.
> enum {
> - kindInGroup = 1,
> - kindLayoutAfter = 2,
> + kindInGroup = 1,
> + kindLayoutAfter = 2,
> kindLayoutBefore = 3
> };
>
> @@ -113,9 +113,9 @@ protected:
> /// an array of References, so they cannot be individually deleted by
> anyone.
> virtual ~Reference() {}
>
> - KindValue _kindValue;
> - uint8_t _kindNamespace;
> - uint8_t _kindArch;
> + KindValue _kindValue;
> + uint8_t _kindNamespace;
> + uint8_t _kindArch;
> };
>
> } // namespace lld
>
> Modified: lld/trunk/include/lld/ReaderWriter/CoreLinkingContext.h
> URL:
> http://llvm.org/viewvc/llvm-project/lld/trunk/include/lld/ReaderWriter/CoreLinkingContext.h?rev=197834&r1=197833&r2=197834&view=diff
>
> ==============================================================================
> --- lld/trunk/include/lld/ReaderWriter/CoreLinkingContext.h (original)
> +++ lld/trunk/include/lld/ReaderWriter/CoreLinkingContext.h Fri Dec 20
> 14:34:19 2013
> @@ -23,10 +23,10 @@ public:
> CoreLinkingContext();
>
> enum {
> - TEST_RELOC_CALL32 = 1,
> - TEST_RELOC_PCREL32 = 2,
> - TEST_RELOC_GOT_LOAD32 = 3,
> - TEST_RELOC_GOT_USE32 = 4,
> + TEST_RELOC_CALL32 = 1,
> + TEST_RELOC_PCREL32 = 2,
> + TEST_RELOC_GOT_LOAD32 = 3,
> + TEST_RELOC_GOT_USE32 = 4,
> TEST_RELOC_LEA32_WAS_GOT = 5,
> };
>
> @@ -39,8 +39,8 @@ protected:
> virtual Writer &writer() const;
>
> private:
> - std::unique_ptr<Writer> _writer;
> - std::vector<StringRef> _passNames;
> + std::unique_ptr<Writer> _writer;
> + std::vector<StringRef> _passNames;
> };
>
> } // end namespace lld
>
> Modified: lld/trunk/include/lld/ReaderWriter/Reader.h
> URL:
> http://llvm.org/viewvc/llvm-project/lld/trunk/include/lld/ReaderWriter/Reader.h?rev=197834&r1=197833&r2=197834&view=diff
>
> ==============================================================================
> --- lld/trunk/include/lld/ReaderWriter/Reader.h (original)
> +++ lld/trunk/include/lld/ReaderWriter/Reader.h Fri Dec 20 14:34:19 2013
> @@ -98,8 +98,8 @@ public:
> /// of registered kind tables. Each table is a zero terminated array of
> /// KindStrings elements.
> struct KindStrings {
> - Reference::KindValue value;
> - StringRef name;
> + Reference::KindValue value;
> + StringRef name;
> };
>
> /// A Reference Kind value is a tuple of <namespace, arch, value>. All
> @@ -110,15 +110,15 @@ public:
>
> private:
> struct KindEntry {
> - Reference::KindNamespace ns;
> - Reference::KindArch arch;
> - const KindStrings *array;
> + Reference::KindNamespace ns;
> + Reference::KindArch arch;
> + const KindStrings *array;
> };
>
> void add(std::unique_ptr<Reader>);
>
> - std::vector<std::unique_ptr<Reader>> _readers;
> - std::vector<KindEntry> _kindEntries;
> + std::vector<std::unique_ptr<Reader>> _readers;
> + std::vector<KindEntry> _kindEntries;
> };
>
> // Utilities for building a KindString table. For instance:
> @@ -127,10 +127,8 @@ private:
> // LLD_KIND_STRING_ENTRY(R_VAX_DATA16),
> // LLD_KIND_STRING_END
> // };
> -#define LLD_KIND_STRING_ENTRY(name)
> \
> - { name, #name }
> -#define LLD_KIND_STRING_END
> \
> - { 0, "" }
> +#define LLD_KIND_STRING_ENTRY(name) { name, #name }
> +#define LLD_KIND_STRING_END { 0, "" }
>
> } // end namespace lld
>
>
> Modified: lld/trunk/include/lld/ReaderWriter/Simple.h
> URL:
> http://llvm.org/viewvc/llvm-project/lld/trunk/include/lld/ReaderWriter/Simple.h?rev=197834&r1=197833&r2=197834&view=diff
>
> ==============================================================================
> --- lld/trunk/include/lld/ReaderWriter/Simple.h (original)
> +++ lld/trunk/include/lld/ReaderWriter/Simple.h Fri Dec 20 14:34:19 2013
> @@ -62,10 +62,10 @@ public:
> }
>
> protected:
> - atom_collection_vector<DefinedAtom> _definedAtoms;
> - atom_collection_vector<UndefinedAtom> _undefinedAtoms;
> - atom_collection_vector<SharedLibraryAtom> _sharedLibraryAtoms;
> - atom_collection_vector<AbsoluteAtom> _absoluteAtoms;
> + atom_collection_vector<DefinedAtom> _definedAtoms;
> + atom_collection_vector<UndefinedAtom> _undefinedAtoms;
> + atom_collection_vector<SharedLibraryAtom> _sharedLibraryAtoms;
> + atom_collection_vector<AbsoluteAtom> _absoluteAtoms;
> };
>
> class FileToMutable : public SimpleFile {
> @@ -175,9 +175,9 @@ public:
> void setOrdinal(uint64_t ord) { _ordinal = ord; }
>
> private:
> - const File &_file;
> - uint64_t _ordinal;
> - std::vector<SimpleReference> _references;
> + const File &_file;
> + uint64_t _ordinal;
> + std::vector<SimpleReference> _references;
> };
>
> class SimpleUndefinedAtom : public UndefinedAtom {
>
> Modified: lld/trunk/lib/Driver/CoreDriver.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/lld/trunk/lib/Driver/CoreDriver.cpp?rev=197834&r1=197833&r2=197834&view=diff
>
> ==============================================================================
> --- lld/trunk/lib/Driver/CoreDriver.cpp (original)
> +++ lld/trunk/lib/Driver/CoreDriver.cpp Fri Dec 20 14:34:19 2013
> @@ -67,10 +67,10 @@ public:
> namespace lld {
>
> static const Registry::KindStrings coreKindStrings[] = {
> - { CoreLinkingContext::TEST_RELOC_CALL32, "call32" },
> - { CoreLinkingContext::TEST_RELOC_PCREL32, "pcrel32" },
> - { CoreLinkingContext::TEST_RELOC_GOT_LOAD32, "gotLoad32" },
> - { CoreLinkingContext::TEST_RELOC_GOT_USE32, "gotUse32" },
> + { CoreLinkingContext::TEST_RELOC_CALL32, "call32" },
> + { CoreLinkingContext::TEST_RELOC_PCREL32, "pcrel32" },
> + { CoreLinkingContext::TEST_RELOC_GOT_LOAD32, "gotLoad32" },
> + { CoreLinkingContext::TEST_RELOC_GOT_USE32, "gotUse32" },
> { CoreLinkingContext::TEST_RELOC_LEA32_WAS_GOT, "lea32wasGot" },
> LLD_KIND_STRING_END
> };
>
> Modified: lld/trunk/lib/ReaderWriter/MachO/ReferenceKinds.h
> URL:
> http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/MachO/ReferenceKinds.h?rev=197834&r1=197833&r2=197834&view=diff
>
> ==============================================================================
> --- lld/trunk/lib/ReaderWriter/MachO/ReferenceKinds.h (original)
> +++ lld/trunk/lib/ReaderWriter/MachO/ReferenceKinds.h Fri Dec 20 14:34:19
> 2013
> @@ -23,17 +23,17 @@ namespace mach_o {
> // Additional Reference Kind values used internally.
> enum {
> LLD_X86_64_RELOC_GOT_LOAD_NOW_LEA = 100,
> - LLD_X86_64_RELOC_TLV_NOW_LEA = 101,
> - LLD_X86_64_RELOC_LAZY_TARGET = 102,
> - LLD_X86_64_RELOC_LAZY_IMMEDIATE = 103,
> - LLD_X86_64_RELOC_SIGNED_32 = 104,
> + LLD_X86_64_RELOC_TLV_NOW_LEA = 101,
> + LLD_X86_64_RELOC_LAZY_TARGET = 102,
> + LLD_X86_64_RELOC_LAZY_IMMEDIATE = 103,
> + LLD_X86_64_RELOC_SIGNED_32 = 104,
> };
> enum {
> - LLD_X86_RELOC_BRANCH32 = 100, // CALL or JMP 32-bit pc-rel
> - LLD_X86_RELOC_ABS32 = 101, // 32-bit absolute addr in instruction
> - LLD_X86_RELOC_FUNC_REL32 = 102, // 32-bit target from start of func
> - LLD_X86_RELOC_POINTER32 = 103, // 32-bit data pointer
> - LLD_X86_RELOC_LAZY_TARGET = 104,
> + LLD_X86_RELOC_BRANCH32 = 100, // CALL or JMP 32-bit pc-rel
> + LLD_X86_RELOC_ABS32 = 101, // 32-bit absolute addr in
> instruction
> + LLD_X86_RELOC_FUNC_REL32 = 102, // 32-bit target from start of func
> + LLD_X86_RELOC_POINTER32 = 103, // 32-bit data pointer
> + LLD_X86_RELOC_LAZY_TARGET = 104,
> LLD_X86_RELOC_LAZY_IMMEDIATE = 105
> };
> enum {
> @@ -41,9 +41,9 @@ enum {
> LLD_ARM_RELOC_THUMB_ABS_HI16 = 101, // thumb movt of absolute address
> LLD_ARM_RELOC_THUMB_REL_LO16 = 102, // thumb movw of (target - pc)
> LLD_ARM_RELOC_THUMB_REL_HI16 = 103, // thumb movt of (target - pc)
> - LLD_ARM_RELOC_ABS32 = 104, // 32-bit constant pointer
> - LLD_ARM_RELOC_POINTER32 = 105, // 32-bit data pointer
> - LLD_ARM_RELOC_LAZY_TARGET = 106,
> + LLD_ARM_RELOC_ABS32 = 104, // 32-bit constant pointer
> + LLD_ARM_RELOC_POINTER32 = 105, // 32-bit data pointer
> + LLD_ARM_RELOC_LAZY_TARGET = 106,
> LLD_ARM_RELOC_LAZY_IMMEDIATE = 107,
> };
>
>
> Modified: lld/trunk/lib/ReaderWriter/Native/NativeFileFormat.h
> URL:
> http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/Native/NativeFileFormat.h?rev=197834&r1=197833&r2=197834&view=diff
>
> ==============================================================================
> --- lld/trunk/lib/ReaderWriter/Native/NativeFileFormat.h (original)
> +++ lld/trunk/lib/ReaderWriter/Native/NativeFileFormat.h Fri Dec 20
> 14:34:19 2013
> @@ -202,10 +202,10 @@ struct NativeReferenceIvarsV1 {
> enum {
> noTarget = UINT16_MAX
> };
> - uint32_t offsetInAtom;
> - uint16_t kindValue;
> - uint8_t kindNamespace;
> - uint8_t kindArch;
> + uint32_t offsetInAtom;
> + uint16_t kindValue;
> + uint8_t kindNamespace;
> + uint8_t kindArch;
> uint16_t targetIndex;
> uint16_t addendIndex;
> };
> @@ -220,9 +220,9 @@ struct NativeReferenceIvarsV2 {
> };
> uint64_t offsetInAtom;
> int64_t addend;
> - uint16_t kindValue;
> - uint8_t kindNamespace;
> - uint8_t kindArch;
> + uint16_t kindValue;
> + uint8_t kindNamespace;
> + uint8_t kindArch;
> uint32_t targetIndex;
> };
>
>
> Modified: lld/trunk/lib/ReaderWriter/Native/ReaderNative.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/Native/ReaderNative.cpp?rev=197834&r1=197833&r2=197834&view=diff
>
> ==============================================================================
> --- lld/trunk/lib/ReaderWriter/Native/ReaderNative.cpp (original)
> +++ lld/trunk/lib/ReaderWriter/Native/ReaderNative.cpp Fri Dec 20 14:34:19
> 2013
> @@ -840,7 +840,7 @@ private:
> uint32_t elementCount;
> };
>
> - std::unique_ptr<MemoryBuffer> _buffer;
> + std::unique_ptr<MemoryBuffer> _buffer;
> const NativeFileHeader* _header;
> AtomArray<DefinedAtom> _definedAtoms;
> AtomArray<UndefinedAtom> _undefinedAtoms;
> @@ -857,9 +857,9 @@ private:
> const char* _strings;
> uint32_t _stringsMaxOffset;
> const Reference::Addend* _addends;
> - uint32_t _addendsMaxIndex;
> - const uint8_t *_contentStart;
> - const uint8_t *_contentEnd;
> + uint32_t _addendsMaxIndex;
> + const uint8_t *_contentStart;
> + const uint8_t *_contentEnd;
> };
>
> inline const lld::File &NativeDefinedAtomV1::file() const {
>
> Modified: lld/trunk/lib/ReaderWriter/Reader.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/Reader.cpp?rev=197834&r1=197833&r2=197834&view=diff
>
> ==============================================================================
> --- lld/trunk/lib/ReaderWriter/Reader.cpp (original)
> +++ lld/trunk/lib/ReaderWriter/Reader.cpp Fri Dec 20 14:34:19 2013
> @@ -45,8 +45,8 @@ Registry::parseFile(std::unique_ptr<Memo
> }
>
> static const Registry::KindStrings kindStrings[] = {
> - { Reference::kindInGroup, "in-group" },
> - { Reference::kindLayoutAfter, "layout-after" },
> + { Reference::kindInGroup, "in-group" },
> + { Reference::kindLayoutAfter, "layout-after" },
> { Reference::kindLayoutBefore, "layout-before" },
> LLD_KIND_STRING_END
> };
>
> Modified: lld/trunk/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp?rev=197834&r1=197833&r2=197834&view=diff
>
> ==============================================================================
> --- lld/trunk/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp (original)
> +++ lld/trunk/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp Fri Dec 20
> 14:34:19 2013
> @@ -163,11 +163,11 @@ private:
> return r;
> }
>
> - unsigned int _collisionCount;
> - unsigned int _unnamedCounter;
> - NameToAtom _nameMap;
> - AtomToRefName _refNames;
> - std::vector<std::unique_ptr<char[]> > _stringCopies;
> + unsigned int _collisionCount;
> + unsigned int _unnamedCounter;
> + NameToAtom _nameMap;
> + AtomToRefName _refNames;
> + std::vector<std::unique_ptr<char[]>> _stringCopies;
> };
>
> /// Used when reading yaml files to find the target of a reference
> @@ -236,9 +236,9 @@ enum FileKinds {
> };
>
> struct ArchMember {
> - FileKinds _kind;
> - StringRef _name;
> - const lld::File *_content;
> + FileKinds _kind;
> + StringRef _name;
> + const lld::File *_content;
> };
>
> // The content bytes in a DefinedAtom are just uint8_t but we want
> @@ -252,9 +252,9 @@ LLVM_YAML_STRONG_TYPEDEF(bool, ShlibCanB
> // lld::Reference::Kind is a tuple of <namespace, arch, value>.
> // For yaml, we just want one string that encapsulates the tuple.
> struct RefKind {
> - Reference::KindNamespace ns;
> - Reference::KindArch arch;
> - uint16_t value;
> + Reference::KindNamespace ns;
> + Reference::KindArch arch;
> + uint16_t value;
> };
>
> } // namespace anon
> @@ -294,7 +294,7 @@ template <> struct ScalarTraits<RefKind>
>
> template <> struct ScalarEnumerationTraits<lld::File::Kind> {
> static void enumeration(IO &io, lld::File::Kind &value) {
> - io.enumCase(value, "object", lld::File::kindObject);
> + io.enumCase(value, "object", lld::File::kindObject);
> io.enumCase(value, "shared-library", lld::File::kindSharedLibrary);
> io.enumCase(value, "static-library", lld::File::kindArchiveLibrary);
> }
> @@ -311,9 +311,9 @@ template <> struct ScalarEnumerationTrai
> template <> struct
> ScalarEnumerationTraits<lld::DefinedAtom::SectionChoice> {
> static void enumeration(IO &io, lld::DefinedAtom::SectionChoice &value)
> {
> io.enumCase(value, "content",
> lld::DefinedAtom::sectionBasedOnContent);
> - io.enumCase(value, "custom",
> lld::DefinedAtom::sectionCustomPreferred);
> + io.enumCase(value, "custom",
> lld::DefinedAtom::sectionCustomPreferred);
> io.enumCase(value, "custom-required",
> - lld::DefinedAtom::sectionCustomRequired);
> + lld::DefinedAtom::sectionCustomRequired);
> }
> };
>
> @@ -321,35 +321,34 @@ template <> struct ScalarEnumerationTrai
> static void enumeration(IO &io, lld::DefinedAtom::SectionPosition
> &value) {
> io.enumCase(value, "start", lld::DefinedAtom::sectionPositionStart);
> io.enumCase(value, "early", lld::DefinedAtom::sectionPositionEarly);
> - io.enumCase(value, "any", lld::DefinedAtom::sectionPositionAny);
> - io.enumCase(value, "end", lld::DefinedAtom::sectionPositionEnd);
> + io.enumCase(value, "any", lld::DefinedAtom::sectionPositionAny);
> + io.enumCase(value, "end", lld::DefinedAtom::sectionPositionEnd);
> }
> };
>
> template <> struct
> ScalarEnumerationTraits<lld::DefinedAtom::Interposable> {
> static void enumeration(IO &io, lld::DefinedAtom::Interposable &value) {
> - io.enumCase(value, "no", lld::DefinedAtom::interposeNo);
> - io.enumCase(value, "yes", lld::DefinedAtom::interposeYes);
> - io.enumCase(value, "yes-and-weak",
> - lld::DefinedAtom::interposeYesAndRuntimeWeak);
> + io.enumCase(value, "no", DefinedAtom::interposeNo);
> + io.enumCase(value, "yes", DefinedAtom::interposeYes);
> + io.enumCase(value, "yes-and-weak",
> DefinedAtom::interposeYesAndRuntimeWeak);
> }
> };
>
> template <> struct ScalarEnumerationTraits<lld::DefinedAtom::Merge> {
> static void enumeration(IO &io, lld::DefinedAtom::Merge &value) {
> - io.enumCase(value, "no", lld::DefinedAtom::mergeNo);
> + io.enumCase(value, "no", lld::DefinedAtom::mergeNo);
> io.enumCase(value, "as-tentative",
> lld::DefinedAtom::mergeAsTentative);
> - io.enumCase(value, "as-weak", lld::DefinedAtom::mergeAsWeak);
> + io.enumCase(value, "as-weak", lld::DefinedAtom::mergeAsWeak);
> io.enumCase(value, "as-addressed-weak",
> - lld::DefinedAtom::mergeAsWeakAndAddressUsed);
> - io.enumCase(value, "by-content", lld::DefinedAtom::mergeByContent);
> +
> lld::DefinedAtom::mergeAsWeakAndAddressUsed);
> + io.enumCase(value, "by-content", lld::DefinedAtom::mergeByContent);
> }
> };
>
> template <> struct
> ScalarEnumerationTraits<lld::DefinedAtom::DeadStripKind> {
> static void enumeration(IO &io, lld::DefinedAtom::DeadStripKind &value)
> {
> io.enumCase(value, "normal", lld::DefinedAtom::deadStripNormal);
> - io.enumCase(value, "never", lld::DefinedAtom::deadStripNever);
> + io.enumCase(value, "never", lld::DefinedAtom::deadStripNever);
> io.enumCase(value, "always", lld::DefinedAtom::deadStripAlways);
> }
> };
> @@ -364,84 +363,80 @@ template <> struct ScalarEnumerationTrai
> template <>
> struct ScalarEnumerationTraits<lld::DefinedAtom::ContentPermissions> {
> static void enumeration(IO &io, lld::DefinedAtom::ContentPermissions
> &value) {
> - io.enumCase(value, "---", lld::DefinedAtom::perm___);
> - io.enumCase(value, "r--", lld::DefinedAtom::permR__);
> - io.enumCase(value, "r-x", lld::DefinedAtom::permR_X);
> - io.enumCase(value, "rw-", lld::DefinedAtom::permRW_);
> - io.enumCase(value, "rwx", lld::DefinedAtom::permRWX);
> - io.enumCase(value, "rw-l", lld::DefinedAtom::permRW_L);
> + io.enumCase(value, "---", lld::DefinedAtom::perm___);
> + io.enumCase(value, "r--", lld::DefinedAtom::permR__);
> + io.enumCase(value, "r-x", lld::DefinedAtom::permR_X);
> + io.enumCase(value, "rw-", lld::DefinedAtom::permRW_);
> + io.enumCase(value, "rwx", lld::DefinedAtom::permRWX);
> + io.enumCase(value, "rw-l", lld::DefinedAtom::permRW_L);
> io.enumCase(value, "unknown", lld::DefinedAtom::permUnknown);
> }
> };
>
> template <> struct ScalarEnumerationTraits<lld::DefinedAtom::ContentType>
> {
> static void enumeration(IO &io, lld::DefinedAtom::ContentType &value) {
> - io.enumCase(value, "unknown", lld::DefinedAtom::typeUnknown);
> - io.enumCase(value, "code", lld::DefinedAtom::typeCode);
> - io.enumCase(value, "stub", lld::DefinedAtom::typeStub);
> - io.enumCase(value, "constant", lld::DefinedAtom::typeConstant);
> - io.enumCase(value, "data", lld::DefinedAtom::typeData);
> - io.enumCase(value, "quick-data", lld::DefinedAtom::typeDataFast);
> - io.enumCase(value, "zero-fill", lld::DefinedAtom::typeZeroFill);
> - io.enumCase(value, "zero-fill-quick",
> lld::DefinedAtom::typeZeroFillFast);
> - io.enumCase(value, "const-data", lld::DefinedAtom::typeConstData);
> - io.enumCase(value, "got", lld::DefinedAtom::typeGOT);
> - io.enumCase(value, "resolver", lld::DefinedAtom::typeResolver);
> - io.enumCase(value, "branch-island",
> lld::DefinedAtom::typeBranchIsland);
> - io.enumCase(value, "branch-shim", lld::DefinedAtom::typeBranchShim);
> - io.enumCase(value, "stub-helper", lld::DefinedAtom::typeStubHelper);
> - io.enumCase(value, "c-string", lld::DefinedAtom::typeCString);
> - io.enumCase(value, "utf16-string", lld::DefinedAtom::typeUTF16String);
> - io.enumCase(value, "unwind-cfi", lld::DefinedAtom::typeCFI);
> - io.enumCase(value, "unwind-lsda", lld::DefinedAtom::typeLSDA);
> - io.enumCase(value, "const-4-byte", lld::DefinedAtom::typeLiteral4);
> - io.enumCase(value, "const-8-byte", lld::DefinedAtom::typeLiteral8);
> - io.enumCase(value, "const-16-byte", lld::DefinedAtom::typeLiteral16);
> - io.enumCase(value, "lazy-pointer", lld::DefinedAtom::typeLazyPointer);
> + io.enumCase(value, "unknown", DefinedAtom::typeUnknown);
> + io.enumCase(value, "code", DefinedAtom::typeCode);
> + io.enumCase(value, "stub", DefinedAtom::typeStub);
> + io.enumCase(value, "constant", DefinedAtom::typeConstant);
> + io.enumCase(value, "data", DefinedAtom::typeData);
> + io.enumCase(value, "quick-data", DefinedAtom::typeDataFast);
> + io.enumCase(value, "zero-fill", DefinedAtom::typeZeroFill);
> + io.enumCase(value, "zero-fill-quick", DefinedAtom::typeZeroFillFast);
> + io.enumCase(value, "const-data", DefinedAtom::typeConstData);
> + io.enumCase(value, "got", DefinedAtom::typeGOT);
> + io.enumCase(value, "resolver", DefinedAtom::typeResolver);
> + io.enumCase(value, "branch-island", DefinedAtom::typeBranchIsland);
> + io.enumCase(value, "branch-shim", DefinedAtom::typeBranchShim);
> + io.enumCase(value, "stub-helper", DefinedAtom::typeStubHelper);
> + io.enumCase(value, "c-string", DefinedAtom::typeCString);
> + io.enumCase(value, "utf16-string", DefinedAtom::typeUTF16String);
> + io.enumCase(value, "unwind-cfi", DefinedAtom::typeCFI);
> + io.enumCase(value, "unwind-lsda", DefinedAtom::typeLSDA);
> + io.enumCase(value, "const-4-byte", DefinedAtom::typeLiteral4);
> + io.enumCase(value, "const-8-byte", DefinedAtom::typeLiteral8);
> + io.enumCase(value, "const-16-byte", DefinedAtom::typeLiteral16);
> + io.enumCase(value, "lazy-pointer", DefinedAtom::typeLazyPointer);
> io.enumCase(value, "lazy-dylib-pointer",
> - lld::DefinedAtom::typeLazyDylibPointer);
> - io.enumCase(value, "cfstring", lld::DefinedAtom::typeCFString);
> +
> DefinedAtom::typeLazyDylibPointer);
> + io.enumCase(value, "cfstring", DefinedAtom::typeCFString);
> io.enumCase(value, "initializer-pointer",
> - lld::DefinedAtom::typeInitializerPtr);
> +
> DefinedAtom::typeInitializerPtr);
> io.enumCase(value, "terminator-pointer",
> - lld::DefinedAtom::typeTerminatorPtr);
> - io.enumCase(value, "c-string-pointer",
> lld::DefinedAtom::typeCStringPtr);
> + DefinedAtom::typeTerminatorPtr);
> + io.enumCase(value, "c-string-pointer",DefinedAtom::typeCStringPtr);
> io.enumCase(value, "objc-class-pointer",
> - lld::DefinedAtom::typeObjCClassPtr);
> + DefinedAtom::typeObjCClassPtr);
> io.enumCase(value, "objc-category-list",
> - lld::DefinedAtom::typeObjC2CategoryList);
> - io.enumCase(value, "objc-class1", lld::DefinedAtom::typeObjC1Class);
> - io.enumCase(value, "dtraceDOF", lld::DefinedAtom::typeDTraceDOF);
> - io.enumCase(value, "lto-temp", lld::DefinedAtom::typeTempLTO);
> - io.enumCase(value, "compact-unwind",
> - lld::DefinedAtom::typeCompactUnwindInfo);
> - io.enumCase(value, "tlv-thunk", lld::DefinedAtom::typeThunkTLV);
> - io.enumCase(value, "tlv-data", lld::DefinedAtom::typeTLVInitialData);
> - io.enumCase(value, "tlv-zero-fill",
> - lld::DefinedAtom::typeTLVInitialZeroFill);
> +
> DefinedAtom::typeObjC2CategoryList);
> + io.enumCase(value, "objc-class1", DefinedAtom::typeObjC1Class);
> + io.enumCase(value, "dtraceDOF", DefinedAtom::typeDTraceDOF);
> + io.enumCase(value, "lto-temp", DefinedAtom::typeTempLTO);
> + io.enumCase(value, "compact-unwind",
> DefinedAtom::typeCompactUnwindInfo);
> + io.enumCase(value, "tlv-thunk", DefinedAtom::typeThunkTLV);
> + io.enumCase(value, "tlv-data",
> DefinedAtom::typeTLVInitialData);
> + io.enumCase(value, "tlv-zero-fill",
> DefinedAtom::typeTLVInitialZeroFill);
> io.enumCase(value, "tlv-initializer-ptr",
> - lld::DefinedAtom::typeTLVInitializerPtr);
> - io.enumCase(value, "thread-data", lld::DefinedAtom::typeThreadData);
> - io.enumCase(value, "thread-zero-fill",
> - lld::DefinedAtom::typeThreadZeroFill);
> - io.enumCase(value, "ro-note", lld::DefinedAtom::typeRONote);
> - io.enumCase(value, "rw-note", lld::DefinedAtom::typeRWNote);
> - io.enumCase(value, "no-alloc", lld::DefinedAtom::typeNoAlloc);
> +
> DefinedAtom::typeTLVInitializerPtr);
> + io.enumCase(value, "thread-data", DefinedAtom::typeThreadData);
> + io.enumCase(value,
> "thread-zero-fill",DefinedAtom::typeThreadZeroFill);
> + io.enumCase(value, "ro-note", DefinedAtom::typeRONote);
> + io.enumCase(value, "rw-note", DefinedAtom::typeRWNote);
> + io.enumCase(value, "no-alloc", DefinedAtom::typeNoAlloc);
> }
> };
>
> template <> struct ScalarEnumerationTraits<lld::UndefinedAtom::CanBeNull>
> {
> static void enumeration(IO &io, lld::UndefinedAtom::CanBeNull &value) {
> - io.enumCase(value, "never", lld::UndefinedAtom::canBeNullNever);
> - io.enumCase(value, "at-runtime",
> lld::UndefinedAtom::canBeNullAtRuntime);
> - io.enumCase(value, "at-buildtime",
> - lld::UndefinedAtom::canBeNullAtBuildtime);
> + io.enumCase(value, "never", lld::UndefinedAtom::canBeNullNever);
> + io.enumCase(value, "at-runtime",
> lld::UndefinedAtom::canBeNullAtRuntime);
> + io.enumCase(value,
> "at-buildtime",lld::UndefinedAtom::canBeNullAtBuildtime);
> }
> };
>
> template <> struct ScalarEnumerationTraits<ShlibCanBeNull> {
> static void enumeration(IO &io, ShlibCanBeNull &value) {
> - io.enumCase(value, "never", false);
> + io.enumCase(value, "never", false);
> io.enumCase(value, "at-runtime", true);
> }
> };
> @@ -449,8 +444,8 @@ template <> struct ScalarEnumerationTrai
> template <>
> struct ScalarEnumerationTraits<lld::SharedLibraryAtom::Type> {
> static void enumeration(IO &io, lld::SharedLibraryAtom::Type &value) {
> - io.enumCase(value, "code", lld::SharedLibraryAtom::Type::Code);
> - io.enumCase(value, "data", lld::SharedLibraryAtom::Type::Data);
> + io.enumCase(value, "code", lld::SharedLibraryAtom::Type::Code);
> + io.enumCase(value, "data", lld::SharedLibraryAtom::Type::Data);
> io.enumCase(value, "unknown", lld::SharedLibraryAtom::Type::Unknown);
> }
> };
> @@ -502,17 +497,17 @@ template <> struct ScalarTraits<lld::Def
>
> template <> struct ScalarEnumerationTraits<FileKinds> {
> static void enumeration(IO &io, FileKinds &value) {
> - io.enumCase(value, "object", fileKindObjectAtoms);
> - io.enumCase(value, "archive", fileKindArchive);
> - io.enumCase(value, "object-elf", fileKindObjectELF);
> + io.enumCase(value, "object", fileKindObjectAtoms);
> + io.enumCase(value, "archive", fileKindArchive);
> + io.enumCase(value, "object-elf", fileKindObjectELF);
> io.enumCase(value, "object-mach-o", fileKindObjectMachO);
> }
> };
>
> template <> struct MappingTraits<ArchMember> {
> static void mapping(IO &io, ArchMember &member) {
> - io.mapOptional("kind", member._kind, fileKindObjectAtoms);
> - io.mapOptional("name", member._name);
> + io.mapOptional("kind", member._kind, fileKindObjectAtoms);
> + io.mapOptional("name", member._name);
> io.mapRequired("content", member._content);
> }
> };
> @@ -610,7 +605,7 @@ template <> struct MappingTraits<const l
> return error_code::success();
> }
>
> - StringRef _path;
> + StringRef _path;
> std::vector<ArchMember> _members;
> };
>
> @@ -658,14 +653,14 @@ template <> struct MappingTraits<const l
> return r;
> }
>
> - IO &_io;
> - RefNameBuilder *_rnb;
> - StringRef _path;
> - AtomList<lld::DefinedAtom> _definedAtoms;
> - AtomList<lld::UndefinedAtom> _undefinedAtoms;
> - AtomList<lld::SharedLibraryAtom> _sharedLibraryAtoms;
> - AtomList<lld::AbsoluteAtom> _absoluteAtoms;
> - std::vector<std::unique_ptr<char[]> > _stringCopies;
> + IO &_io;
> + RefNameBuilder *_rnb;
> + StringRef _path;
> + AtomList<lld::DefinedAtom> _definedAtoms;
> + AtomList<lld::UndefinedAtom> _undefinedAtoms;
> + AtomList<lld::SharedLibraryAtom> _sharedLibraryAtoms;
> + AtomList<lld::AbsoluteAtom> _absoluteAtoms;
> + std::vector<std::unique_ptr<char[]>> _stringCopies;
> };
>
> static void mapping(IO &io, const lld::File *&file) {
> @@ -695,17 +690,17 @@ template <> struct MappingTraits<const l
> assert(info != nullptr);
> info->_file = keys.operator->();
>
> - io.mapOptional("path", keys->_path);
> - io.mapOptional("defined-atoms", keys->_definedAtoms);
> - io.mapOptional("undefined-atoms", keys->_undefinedAtoms);
> + io.mapOptional("path", keys->_path);
> + io.mapOptional("defined-atoms", keys->_definedAtoms);
> + io.mapOptional("undefined-atoms", keys->_undefinedAtoms);
> io.mapOptional("shared-library-atoms", keys->_sharedLibraryAtoms);
> - io.mapOptional("absolute-atoms", keys->_absoluteAtoms);
> + io.mapOptional("absolute-atoms", keys->_absoluteAtoms);
> }
>
> static void mappingArchive(IO &io, const lld::File *&file) {
> MappingNormalizationHeap<NormArchiveFile, const lld::File *> keys(io,
> file);
>
> - io.mapOptional("path", keys->_path);
> + io.mapOptional("path", keys->_path);
> io.mapOptional("members", keys->_members);
> }
> };
> @@ -757,17 +752,17 @@ template <> struct MappingTraits<const l
> virtual void setTarget(const lld::Atom *a) { _target = a; }
>
> const lld::Atom *_target;
> - StringRef _targetName;
> - uint32_t _offset;
> - Addend _addend;
> - RefKind _mappedKind;
> + StringRef _targetName;
> + uint32_t _offset;
> + Addend _addend;
> + RefKind _mappedKind;
> };
>
> static void mapping(IO &io, const lld::Reference *&ref) {
> MappingNormalizationHeap<NormalizedReference, const lld::Reference *>
> keys(
> io, ref);
>
> - io.mapRequired("kind", keys->_mappedKind);
> + io.mapRequired("kind", keys->_mappedKind);
> io.mapOptional("offset", keys->_offset);
> io.mapOptional("target", keys->_targetName);
> io.mapOptional("addend", keys->_addend, (lld::Reference::Addend)0);
> @@ -874,23 +869,23 @@ template <> struct MappingTraits<const l
> it = reinterpret_cast<const void *>(index);
> }
>
> - const lld::File &_file;
> - StringRef _name;
> - StringRef _refName;
> - Scope _scope;
> - Interposable _interpose;
> - Merge _merge;
> - ContentType _contentType;
> - Alignment _alignment;
> - SectionChoice _sectionChoice;
> - SectionPosition _sectionPosition;
> - DeadStripKind _deadStrip;
> - DynamicExport _dynamicExport;
> - ContentPermissions _permissions;
> - uint32_t _ordinal;
> - std::vector<ImplicitHex8> _content;
> - uint64_t _size;
> - StringRef _sectionName;
> + const lld::File &_file;
> + StringRef _name;
> + StringRef _refName;
> + Scope _scope;
> + Interposable _interpose;
> + Merge _merge;
> + ContentType _contentType;
> + Alignment _alignment;
> + SectionChoice _sectionChoice;
> + SectionPosition _sectionPosition;
> + DeadStripKind _deadStrip;
> + DynamicExport _dynamicExport;
> + ContentPermissions _permissions;
> + uint32_t _ordinal;
> + std::vector<ImplicitHex8> _content;
> + uint64_t _size;
> + StringRef _sectionName;
> std::vector<const lld::Reference *> _references;
> };
>
> @@ -910,31 +905,33 @@ template <> struct MappingTraits<const l
> }
> }
>
> - io.mapOptional("name", keys->_name, StringRef());
> - io.mapOptional("ref-name", keys->_refName, StringRef());
> - io.mapOptional("scope", keys->_scope,
> - lld::DefinedAtom::scopeTranslationUnit);
> - io.mapOptional("type", keys->_contentType,
> lld::DefinedAtom::typeCode);
> - io.mapOptional("content", keys->_content);
> - io.mapOptional("size", keys->_size, (uint64_t)keys->_content.size());
> - io.mapOptional("interposable", keys->_interpose,
> - lld::DefinedAtom::interposeNo);
> - io.mapOptional("merge", keys->_merge, lld::DefinedAtom::mergeNo);
> - io.mapOptional("alignment", keys->_alignment,
> - lld::DefinedAtom::Alignment(0));
> - io.mapOptional("section-choice", keys->_sectionChoice,
> - lld::DefinedAtom::sectionBasedOnContent);
> - io.mapOptional("section-name", keys->_sectionName, StringRef());
> + io.mapOptional("name", keys->_name, StringRef());
> + io.mapOptional("ref-name", keys->_refName, StringRef());
> + io.mapOptional("scope", keys->_scope,
> +
> DefinedAtom::scopeTranslationUnit);
> + io.mapOptional("type", keys->_contentType,
> + DefinedAtom::typeCode);
> + io.mapOptional("content", keys->_content);
> + io.mapOptional("size", keys->_size,
> (uint64_t)keys->_content.size());
> + io.mapOptional("interposable", keys->_interpose,
> + DefinedAtom::interposeNo);
> + io.mapOptional("merge", keys->_merge,
> DefinedAtom::mergeNo);
> + io.mapOptional("alignment", keys->_alignment,
> + DefinedAtom::Alignment(0));
> + io.mapOptional("section-choice", keys->_sectionChoice,
> +
> DefinedAtom::sectionBasedOnContent);
> + io.mapOptional("section-name", keys->_sectionName, StringRef());
> io.mapOptional("section-position", keys->_sectionPosition,
> - lld::DefinedAtom::sectionPositionAny);
> - io.mapOptional("dead-strip", keys->_deadStrip,
> - lld::DefinedAtom::deadStripNormal);
> - io.mapOptional("dynamic-export", keys->_dynamicExport,
> - lld::DefinedAtom::dynamicExportNormal);
> + DefinedAtom::sectionPositionAny);
> + io.mapOptional("dead-strip", keys->_deadStrip,
> + DefinedAtom::deadStripNormal);
> + io.mapOptional("dynamic-export", keys->_dynamicExport,
> +
> DefinedAtom::dynamicExportNormal);
> // default permissions based on content type
> - io.mapOptional("permissions", keys->_permissions,
> - lld::DefinedAtom::permissions(keys->_contentType));
> - io.mapOptional("references", keys->_references);
> + io.mapOptional("permissions", keys->_permissions,
> + DefinedAtom::permissions(
> +
> keys->_contentType));
> + io.mapOptional("references", keys->_references);
> }
> };
>
> @@ -979,9 +976,9 @@ template <> struct MappingTraits<const l
> virtual CanBeNull canBeNull() const { return _canBeNull; }
> virtual const UndefinedAtom *fallback() const { return _fallback; }
>
> - const lld::File &_file;
> - StringRef _name;
> - CanBeNull _canBeNull;
> + const lld::File &_file;
> + StringRef _name;
> + CanBeNull _canBeNull;
> const UndefinedAtom *_fallback;
> };
>
> @@ -989,11 +986,11 @@ template <> struct MappingTraits<const l
> MappingNormalizationHeap<NormalizedAtom, const lld::UndefinedAtom *>
> keys(
> io, atom);
>
> - io.mapRequired("name", keys->_name);
> + io.mapRequired("name", keys->_name);
> io.mapOptional("can-be-null", keys->_canBeNull,
> - lld::UndefinedAtom::canBeNullNever);
> - io.mapOptional("fallback", keys->_fallback,
> - (const lld::UndefinedAtom *)nullptr);
> + lld::UndefinedAtom::canBeNullNever);
> + io.mapOptional("fallback", keys->_fallback,
> + (const lld::UndefinedAtom *)nullptr);
> }
> };
>
> @@ -1043,11 +1040,11 @@ template <> struct MappingTraits<const l
> virtual uint64_t size() const { return _size; }
>
> const lld::File &_file;
> - StringRef _name;
> - StringRef _loadName;
> - ShlibCanBeNull _canBeNull;
> - Type _type;
> - uint64_t _size;
> + StringRef _name;
> + StringRef _loadName;
> + ShlibCanBeNull _canBeNull;
> + Type _type;
> + uint64_t _size;
> };
>
> static void mapping(IO &io, const lld::SharedLibraryAtom *&atom) {
> @@ -1055,11 +1052,11 @@ template <> struct MappingTraits<const l
> MappingNormalizationHeap<NormalizedAtom, const lld::SharedLibraryAtom
> *>
> keys(io, atom);
>
> - io.mapRequired("name", keys->_name);
> - io.mapOptional("load-name", keys->_loadName);
> + io.mapRequired("name", keys->_name);
> + io.mapOptional("load-name", keys->_loadName);
> io.mapOptional("can-be-null", keys->_canBeNull, (ShlibCanBeNull)
> false);
> - io.mapOptional("type", keys->_type, SharedLibraryAtom::Type::Code);
> - io.mapOptional("size", keys->_size, uint64_t(0));
> + io.mapOptional("type", keys->_type,
> SharedLibraryAtom::Type::Code);
> + io.mapOptional("size", keys->_size, uint64_t(0));
> }
> };
>
> @@ -1101,10 +1098,10 @@ template <> struct MappingTraits<const l
> virtual Scope scope() const { return _scope; }
>
> const lld::File &_file;
> - StringRef _name;
> - StringRef _refName;
> - Scope _scope;
> - Hex64 _value;
> + StringRef _name;
> + StringRef _refName;
> + Scope _scope;
> + Hex64 _value;
> };
>
> static void mapping(IO &io, const lld::AbsoluteAtom *&atom) {
> @@ -1123,10 +1120,10 @@ template <> struct MappingTraits<const l
> }
> }
>
> - io.mapRequired("name", keys->_name);
> + io.mapRequired("name", keys->_name);
> io.mapOptional("ref-name", keys->_refName, StringRef());
> - io.mapOptional("scope", keys->_scope);
> - io.mapRequired("value", keys->_value);
> + io.mapOptional("scope", keys->_scope);
> + io.mapRequired("value", keys->_value);
> }
> };
>
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20131220/24780259/attachment.html>
More information about the llvm-commits
mailing list