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