[lld] r332672 - Revert "[pdb] Change /DEBUG:GHASH to emit 8 byte hashes."
Zachary Turner via llvm-commits
llvm-commits at lists.llvm.org
Thu May 17 14:49:25 PDT 2018
Author: zturner
Date: Thu May 17 14:49:25 2018
New Revision: 332672
URL: http://llvm.org/viewvc/llvm-project?rev=332672&view=rev
Log:
Revert "[pdb] Change /DEBUG:GHASH to emit 8 byte hashes."
A few tests haven't been properly updated, so reverting while
I have time to investigate proper fixes.
Modified:
lld/trunk/COFF/PDB.cpp
lld/trunk/test/COFF/Inputs/pdb-hashes-1.yaml
lld/trunk/test/COFF/Inputs/pdb-hashes-2-missing.yaml
lld/trunk/test/COFF/Inputs/pdb-hashes-2.yaml
lld/trunk/test/COFF/pdb-global-hashes.test
Modified: lld/trunk/COFF/PDB.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/COFF/PDB.cpp?rev=332672&r1=332671&r2=332672&view=diff
==============================================================================
--- lld/trunk/COFF/PDB.cpp (original)
+++ lld/trunk/COFF/PDB.cpp Thu May 17 14:49:25 2018
@@ -205,8 +205,8 @@ static bool canUseDebugH(ArrayRef<uint8_
DebugH = DebugH.drop_front(sizeof(object::debug_h_header));
return Header->Magic == COFF::DEBUG_HASHES_SECTION_MAGIC &&
Header->Version == 0 &&
- Header->HashAlgorithm == uint16_t(GlobalTypeHashAlg::SHA1_8) &&
- (DebugH.size() % 8 == 0);
+ Header->HashAlgorithm == uint16_t(GlobalTypeHashAlg::SHA1) &&
+ (DebugH.size() % 20 == 0);
}
static Optional<ArrayRef<uint8_t>> getDebugH(ObjFile *File) {
Modified: lld/trunk/test/COFF/Inputs/pdb-hashes-1.yaml
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/Inputs/pdb-hashes-1.yaml?rev=332672&r1=332671&r2=332672&view=diff
==============================================================================
--- lld/trunk/test/COFF/Inputs/pdb-hashes-1.yaml (original)
+++ lld/trunk/test/COFF/Inputs/pdb-hashes-1.yaml Thu May 17 14:49:25 2018
@@ -1,13 +1,13 @@
--- !COFF
-header:
+header:
Machine: IMAGE_FILE_MACHINE_I386
Characteristics: [ ]
-sections:
+sections:
- Name: .text
Characteristics: [ IMAGE_SCN_CNT_CODE, IMAGE_SCN_MEM_EXECUTE, IMAGE_SCN_MEM_READ ]
Alignment: 16
SectionData: 5589E55683EC188B450C8B4D08C745F8000000008B55088D75F4894DF089F18914248945ECE80000000083EC048D4DF4890C248945E8E80000000083C4185E5DC3
- Relocations:
+ Relocations:
- VirtualAddress: 38
SymbolName: '??0Foo at NS@@QAE at H@Z'
Type: IMAGE_REL_I386_REL32
@@ -33,12 +33,12 @@ sections:
- Name: '.debug$S'
Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_DISCARDABLE, IMAGE_SCN_MEM_READ ]
Alignment: 4
- SectionData: 04000000F10000002F0000002D003C110100000007000700000000000000581B000000000000636C616E672076657273696F6E20372E302E30200000F50000008400000000000000000000004100000000000000080000000000000052000000070000000400000001000000400000000000000008000000000000007F0000000600040000000000030000003E000000000000000800000000000000BD0000000400040000000000040000003D000000000000000800000000000000FA0000000300080000000000F1000000960000002A00471100000000000000000000000041000000000000000000000003100000000000000000006D61696E000D003E1174000000010061726763001200451116000000080000001400000000002D000D003E11001000000100617267760012004511160000000C0000001400000000002D000A003E1109100000000066001200451116000000F4FFFFFF1400000000002D0002004F110000F200000030000000000000000000000041000000000000000300000024000000000000000300000014000000040000002D00000005000000F1000000100000000E000811091000004E533A3A466F6F00F40000003000000001000000100165C9E387F88362A8EB2B49539DD5A65500002B0000001001D3AE9D06B0C1F06ABE75A0557053ED6B0000F30000004801000000443A5C7372635C6C6C766D6275696C645C636C616E675C44656275675C7838365C6F626A312E63707000443A5C7372635C6C6C766D6275696C645C636C616E675C44656275675C7838365C6F626A2E6800245430202E7261536561726368203D202465697020245430205E203D2024657370202454302034202B203D2000245430202E7261536561726368203D202465697020245430205E203D2024657370202454302034202B203D2024656270202454302034202D205E203D200024543020246562702034202B203D202465697020245430205E203D2024657370202454302034202B203D2024656270202454302034202D205E203D200024543020246562702034202B203D202465697020245430205E203D2024657370202454302034202B203D2024656270202454302034202D205E203D2024657369202454302038202D205E203D2000
- Subsections:
+ SectionData: 04000000F10000002F0000002D003C110100000007000700000000000000581B000000000000636C616E672076657273696F6E20372E302E30200000F5000000840000000000000000000000410000000000000008000000000000004400000007000000040000000100000040000000000000000800000000000000710000000600040000000000030000003E000000000000000800000000000000AF0000000400040000000000040000003D000000000000000800000000000000EC0000000300080000000000F1000000960000002A00471100000000000000000000000041000000000000000000000003100000000000000000006D61696E000D003E1174000000010061726763001200451116000000080000001400000000002D000D003E11001000000100617267760012004511160000000C0000001400000000002D000A003E1109100000000066001200451116000000F4FFFFFF1400000000002D0002004F110000F200000030000000000000000000000041000000000000000300000024000000000000000400000014000000050000002D00000006000000F1000000100000000E000811091000004E533A3A466F6F00F4000000300000000100000010013469AC0DCAB9F1D7ED0FC4FA74E3983A0000240000001001C6036A3E7D29B0AB68FEE19A35B11BCD0000F30000003C01000000433A5C7372635C6C6C766D2D70726F6A6563745C6275696C645C6F626A312E63707000433A5C7372635C6C6C766D2D70726F6A6563745C6275696C645C6F626A2E6800245430202E7261536561726368203D202465697020245430205E203D2024657370202454302034202B203D2000245430202E7261536561726368203D202465697020245430205E203D2024657370202454302034202B203D2024656270202454302034202D205E203D200024543020246562702034202B203D202465697020245430205E203D2024657370202454302034202B203D2024656270202454302034202D205E203D200024543020246562702034202B203D202465697020245430205E203D2024657370202454302034202B203D2024656270202454302034202D205E203D2024657369202454302038202D205E203D20000000
+ Subsections:
- !Symbols
- Records:
+ Records:
- Kind: S_COMPILE3
- Compile3Sym:
+ Compile3Sym:
Flags: [ ]
Machine: Pentium3
FrontendMajor: 7
@@ -51,7 +51,7 @@ sections:
BackendQFE: 0
Version: 'clang version 7.0.0 '
- !FrameData
- Frames:
+ Frames:
- CodeSize: 65
FrameFunc: '$T0 .raSearch = $eip $T0 ^ = $esp $T0 4 + = '
LocalSize: 0
@@ -85,9 +85,9 @@ sections:
RvaStart: 4
SavedRegsSize: 8
- !Symbols
- Records:
+ Records:
- Kind: S_GPROC32_ID
- ProcSym:
+ ProcSym:
CodeSize: 65
DbgStart: 0
DbgEnd: 0
@@ -95,96 +95,98 @@ sections:
Flags: [ ]
DisplayName: main
- Kind: S_LOCAL
- LocalSym:
+ LocalSym:
Type: 116
Flags: [ IsParameter ]
VarName: argc
- Kind: S_DEFRANGE_REGISTER_REL
- DefRangeRegisterRelSym:
+ DefRangeRegisterRelSym:
Register: 22
Flags: 0
BasePointerOffset: 8
- Range:
+ Range:
OffsetStart: 20
ISectStart: 0
Range: 45
- Gaps:
+ Gaps:
- Kind: S_LOCAL
- LocalSym:
+ LocalSym:
Type: 4096
Flags: [ IsParameter ]
VarName: argv
- Kind: S_DEFRANGE_REGISTER_REL
- DefRangeRegisterRelSym:
+ DefRangeRegisterRelSym:
Register: 22
Flags: 0
BasePointerOffset: 12
- Range:
+ Range:
OffsetStart: 20
ISectStart: 0
Range: 45
- Gaps:
+ Gaps:
- Kind: S_LOCAL
- LocalSym:
+ LocalSym:
Type: 4105
Flags: [ ]
VarName: f
- Kind: S_DEFRANGE_REGISTER_REL
- DefRangeRegisterRelSym:
+ DefRangeRegisterRelSym:
Register: 22
Flags: 0
BasePointerOffset: -12
- Range:
+ Range:
OffsetStart: 20
ISectStart: 0
Range: 45
- Gaps:
+ Gaps:
- Kind: S_PROC_ID_END
- ScopeEndSym:
+ ScopeEndSym:
- !Lines
CodeSize: 65
Flags: [ ]
RelocOffset: 0
RelocSegment: 0
- Blocks:
- - FileName: 'D:\src\llvmbuild\clang\Debug\x86\obj1.cpp'
- Lines:
+ Blocks:
+ - FileName: 'C:\src\llvm-project\build\obj1.cpp'
+ Lines:
- Offset: 0
- LineStart: 3
+ LineStart: 4
IsStatement: false
EndDelta: 0
- Offset: 20
- LineStart: 4
+ LineStart: 5
IsStatement: false
EndDelta: 0
- Offset: 45
- LineStart: 5
+ LineStart: 6
IsStatement: false
EndDelta: 0
- Columns:
+ Columns:
- !Symbols
- Records:
+ Records:
- Kind: S_UDT
- UDTSym:
+ UDTSym:
Type: 4105
UDTName: 'NS::Foo'
- !FileChecksums
- Checksums:
- - FileName: 'D:\src\llvmbuild\clang\Debug\x86\obj1.cpp'
+ Checksums:
+ - FileName: 'C:\src\llvm-project\build\obj1.cpp'
Kind: MD5
- Checksum: 65C9E387F88362A8EB2B49539DD5A655
- - FileName: 'D:\src\llvmbuild\clang\Debug\x86\obj.h'
+ Checksum: 3469AC0DCAB9F1D7ED0FC4FA74E3983A
+ - FileName: 'C:\src\llvm-project\build\obj.h'
Kind: MD5
- Checksum: D3AE9D06B0C1F06ABE75A0557053ED6B
+ Checksum: C6036A3E7D29B0AB68FEE19A35B11BCD
- !StringTable
- Strings:
- - 'D:\src\llvmbuild\clang\Debug\x86\obj1.cpp'
- - 'D:\src\llvmbuild\clang\Debug\x86\obj.h'
+ Strings:
+ - 'C:\src\llvm-project\build\obj1.cpp'
+ - 'C:\src\llvm-project\build\obj.h'
- '$T0 .raSearch = $eip $T0 ^ = $esp $T0 4 + = '
- '$T0 .raSearch = $eip $T0 ^ = $esp $T0 4 + = $ebp $T0 4 - ^ = '
- '$T0 $ebp 4 + = $eip $T0 ^ = $esp $T0 4 + = $ebp $T0 4 - ^ = '
- '$T0 $ebp 4 + = $eip $T0 ^ = $esp $T0 4 + = $ebp $T0 4 - ^ = $esi $T0 8 - ^ = '
- Relocations:
+ - ''
+ - ''
+ Relocations:
- VirtualAddress: 68
SymbolName: _main
Type: IMAGE_REL_I386_DIR32NB
@@ -221,29 +223,29 @@ sections:
- Name: '.debug$T'
Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_DISCARDABLE, IMAGE_SCN_MEM_READ ]
Alignment: 4
- SectionData: 040000000A000210700400000A8000000E0001120200000074000000001000000E0008107400000000000200011000001200011600000000021000006D61696E00F3F2F12A0005150000800200000000000000000000000000004E533A3A466F6F002E3F4155466F6F404E53404000F10A000210041000000A8000000A00011201000000740000001A0009100300000004100000051000000B00010006100000000000001A0003120D15030074000000000058001115030007100000466F6F002A0005150200000208100000000000000000000004004E533A3A466F6F002E3F4155466F6F404E53404000F12E00051600000000443A5C7372635C6C6C766D6275696C645C636C616E675C44656275675C7838365C6F626A2E6800F10E000616091000000A100000020000000E0002160410000007100000466F6F00
- Types:
+ SectionData: 040000000A000210700400000A8000000E0001120200000074000000001000000E0008107400000000000200011000001200011600000000021000006D61696E00F3F2F12A0005150000800200000000000000000000000000004E533A3A466F6F002E3F4155466F6F404E53404000F10A000210041000000A8000000A00011201000000740000001A0009100300000004100000051000000B00010006100000000000001A0003120D15030074000000000058001115030007100000466F6F002A0005150200000208100000000000000000000004004E533A3A466F6F002E3F4155466F6F404E53404000F12600051600000000433A5C7372635C6C6C766D2D70726F6A6563745C6275696C645C6F626A2E68000E000616091000000A100000030000000E0002160410000007100000466F6F00
+ Types:
- Kind: LF_POINTER
- Pointer:
+ Pointer:
ReferentType: 1136
Attrs: 32778
- Kind: LF_ARGLIST
- ArgList:
+ ArgList:
ArgIndices: [ 116, 4096 ]
- Kind: LF_PROCEDURE
- Procedure:
+ Procedure:
ReturnType: 116
CallConv: NearC
Options: [ None ]
ParameterCount: 2
ArgumentList: 4097
- Kind: LF_FUNC_ID
- FuncId:
+ FuncId:
ParentScope: 0
FunctionType: 4098
Name: main
- Kind: LF_STRUCTURE
- Class:
+ Class:
MemberCount: 0
Options: [ None, ForwardReference, HasUniqueName ]
FieldList: 0
@@ -253,14 +255,14 @@ sections:
VTableShape: 0
Size: 0
- Kind: LF_POINTER
- Pointer:
+ Pointer:
ReferentType: 4100
Attrs: 32778
- Kind: LF_ARGLIST
- ArgList:
+ ArgList:
ArgIndices: [ 116 ]
- Kind: LF_MFUNCTION
- MemberFunction:
+ MemberFunction:
ReturnType: 3
ClassType: 4100
ThisType: 4101
@@ -270,21 +272,21 @@ sections:
ArgumentList: 4102
ThisPointerAdjustment: 0
- Kind: LF_FIELDLIST
- FieldList:
+ FieldList:
- Kind: LF_MEMBER
- DataMember:
+ DataMember:
Attrs: 3
Type: 116
FieldOffset: 0
Name: X
- Kind: LF_ONEMETHOD
- OneMethod:
+ OneMethod:
Type: 4103
Attrs: 3
VFTableOffset: -1
Name: Foo
- Kind: LF_STRUCTURE
- Class:
+ Class:
MemberCount: 2
Options: [ None, HasUniqueName ]
FieldList: 4104
@@ -294,47 +296,47 @@ sections:
VTableShape: 0
Size: 4
- Kind: LF_STRING_ID
- StringId:
+ StringId:
Id: 0
- String: 'D:\src\llvmbuild\clang\Debug\x86\obj.h'
+ String: 'C:\src\llvm-project\build\obj.h'
- Kind: LF_UDT_SRC_LINE
- UdtSourceLine:
+ UdtSourceLine:
UDT: 4105
SourceFile: 4106
- LineNumber: 2
+ LineNumber: 3
- Kind: LF_MFUNC_ID
- MemberFuncId:
+ MemberFuncId:
ClassType: 4100
FunctionType: 4103
Name: Foo
- Name: '.debug$H'
Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_DISCARDABLE, IMAGE_SCN_MEM_READ ]
Alignment: 4
- SectionData: C5C9330100000100800309EE1ED8BB5B5397319F1CC14E2CDF04AA3125BBC50E95CEBA304A2C449323ADA4E788EB7A90B5DECADF1A832BA46632585CDC7606E4B97B86241E5F45B0BCD2406E22465E11A528BEF0A7F589C76079F1186C40C2165091EFEBD5B5446B26FFBFD620CFB362
- GlobalHashes:
+ SectionData: C5C9330100000000624A7FEE7323656B7F1C5A63800309EE1ED8BB5B0EB2C87AD629AA9E5C98B7A3ED69DB1355707DF1624E463ACE08649D0FC35F163E20CC43089ADCA64B712C03EDA4CB88537EBAE4005A09006A9FB389476700689419512EFB395F1A23ADA4E788EB7A90DA146E89F004E6185E87867C58B4AC836CBBD1301D1BC1BDEEB7F3A86BB7ECCF6632585CDC7606E4CCAB0C6E6E190E3091E4290AFF7BA25E9E8209892CA91CCBF55A49FCB303335DC553B426E3AC635C1883F35475E9A4A12ED6396BC795E5D801DB74B371743A7A9E69529643FB49E2201DD99ECA4F72B2213D30B9768BAE6EB7C1150155B4421347349E771F26985B869638BAA4FE40A80C07611AAF09B6A4
+ GlobalHashes:
Version: 0
- HashAlgorithm: 1
- HashValues:
- - 800309EE1ED8BB5B
- - 5397319F1CC14E2C
- - DF04AA3125BBC50E
- - 95CEBA304A2C4493
- - 23ADA4E788EB7A90
- - B5DECADF1A832BA4
- - 6632585CDC7606E4
- - B97B86241E5F45B0
- - BCD2406E22465E11
- - A528BEF0A7F589C7
- - 6079F1186C40C216
- - 5091EFEBD5B5446B
- - 26FFBFD620CFB362
+ HashAlgorithm: 0
+ HashValues:
+ - 624A7FEE7323656B7F1C5A63800309EE1ED8BB5B
+ - 0EB2C87AD629AA9E5C98B7A3ED69DB1355707DF1
+ - 624E463ACE08649D0FC35F163E20CC43089ADCA6
+ - 4B712C03EDA4CB88537EBAE4005A09006A9FB389
+ - 476700689419512EFB395F1A23ADA4E788EB7A90
+ - DA146E89F004E6185E87867C58B4AC836CBBD130
+ - 1D1BC1BDEEB7F3A86BB7ECCF6632585CDC7606E4
+ - CCAB0C6E6E190E3091E4290AFF7BA25E9E820989
+ - 2CA91CCBF55A49FCB303335DC553B426E3AC635C
+ - 1883F35475E9A4A12ED6396BC795E5D801DB74B3
+ - 71743A7A9E69529643FB49E2201DD99ECA4F72B2
+ - 213D30B9768BAE6EB7C1150155B4421347349E77
+ - 1F26985B869638BAA4FE40A80C07611AAF09B6A4
- Name: '.debug$S'
Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_LNK_COMDAT, IMAGE_SCN_MEM_DISCARDABLE, IMAGE_SCN_MEM_READ ]
Alignment: 4
- SectionData: 04000000F500000064000000000000000000000020000000000000000400000000000000520000000600000004000000010000001F0000000000000004000000000000007F0000000500040000000000030000001D000000000000000400000000000000BD0000000300040000000000F10000007B000000320047110000000000000000000000002000000000000000000000000C100000000000000000004E533A3A466F6F3A3A466F6F000D003E1105100000010074686973001200451116000000FCFFFFFF0F000000000011000A003E1174000000010078001200451116000000080000000F0000000000110002004F1100F2000000200000000000000000000000200000001800000001000000140000000000000003000000
- Subsections:
+ SectionData: 04000000F500000064000000000000000000000020000000000000000400000000000000440000000600000004000000010000001F000000000000000400000000000000710000000500040000000000030000001D000000000000000400000000000000AF0000000300040000000000F10000007B000000320047110000000000000000000000002000000000000000000000000C100000000000000000004E533A3A466F6F3A3A466F6F000D003E1105100000010074686973001200451116000000FCFFFFFF0F000000000011000A003E1174000000010078001200451116000000080000000F0000000000110002004F1100F2000000200000000000000000000000200000001800000001000000140000000000000004000000
+ Subsections:
- !FrameData
- Frames:
+ Frames:
- CodeSize: 32
FrameFunc: '$T0 .raSearch = $eip $T0 ^ = $esp $T0 4 + = '
LocalSize: 0
@@ -360,9 +362,9 @@ sections:
RvaStart: 3
SavedRegsSize: 4
- !Symbols
- Records:
+ Records:
- Kind: S_GPROC32_ID
- ProcSym:
+ ProcSym:
CodeSize: 32
DbgStart: 0
DbgEnd: 0
@@ -370,51 +372,51 @@ sections:
Flags: [ ]
DisplayName: 'NS::Foo::Foo'
- Kind: S_LOCAL
- LocalSym:
+ LocalSym:
Type: 4101
Flags: [ IsParameter ]
VarName: this
- Kind: S_DEFRANGE_REGISTER_REL
- DefRangeRegisterRelSym:
+ DefRangeRegisterRelSym:
Register: 22
Flags: 0
BasePointerOffset: -4
- Range:
+ Range:
OffsetStart: 15
ISectStart: 0
Range: 17
- Gaps:
+ Gaps:
- Kind: S_LOCAL
- LocalSym:
+ LocalSym:
Type: 116
Flags: [ IsParameter ]
VarName: x
- Kind: S_DEFRANGE_REGISTER_REL
- DefRangeRegisterRelSym:
+ DefRangeRegisterRelSym:
Register: 22
Flags: 0
BasePointerOffset: 8
- Range:
+ Range:
OffsetStart: 15
ISectStart: 0
Range: 17
- Gaps:
+ Gaps:
- Kind: S_PROC_ID_END
- ScopeEndSym:
+ ScopeEndSym:
- !Lines
CodeSize: 32
Flags: [ ]
RelocOffset: 0
RelocSegment: 0
- Blocks:
- - FileName: 'D:\src\llvmbuild\clang\Debug\x86\obj.h'
- Lines:
+ Blocks:
+ - FileName: 'C:\src\llvm-project\build\obj.h'
+ Lines:
- Offset: 0
- LineStart: 3
+ LineStart: 4
IsStatement: false
EndDelta: 0
- Columns:
- Relocations:
+ Columns:
+ Relocations:
- VirtualAddress: 12
SymbolName: '??0Foo at NS@@QAE at H@Z'
Type: IMAGE_REL_I386_DIR32NB
@@ -442,14 +444,14 @@ sections:
- VirtualAddress: 256
SymbolName: '??0Foo at NS@@QAE at H@Z'
Type: IMAGE_REL_I386_SECTION
-symbols:
+symbols:
- Name: .text
Value: 0
SectionNumber: 1
SimpleType: IMAGE_SYM_TYPE_NULL
ComplexType: IMAGE_SYM_DTYPE_NULL
StorageClass: IMAGE_SYM_CLASS_STATIC
- SectionDefinition:
+ SectionDefinition:
Length: 65
NumberOfRelocations: 2
NumberOfLinenumbers: 0
@@ -461,7 +463,7 @@ symbols:
SimpleType: IMAGE_SYM_TYPE_NULL
ComplexType: IMAGE_SYM_DTYPE_NULL
StorageClass: IMAGE_SYM_CLASS_STATIC
- SectionDefinition:
+ SectionDefinition:
Length: 0
NumberOfRelocations: 0
NumberOfLinenumbers: 0
@@ -473,7 +475,7 @@ symbols:
SimpleType: IMAGE_SYM_TYPE_NULL
ComplexType: IMAGE_SYM_DTYPE_NULL
StorageClass: IMAGE_SYM_CLASS_STATIC
- SectionDefinition:
+ SectionDefinition:
Length: 0
NumberOfRelocations: 0
NumberOfLinenumbers: 0
@@ -485,7 +487,7 @@ symbols:
SimpleType: IMAGE_SYM_TYPE_NULL
ComplexType: IMAGE_SYM_DTYPE_NULL
StorageClass: IMAGE_SYM_CLASS_STATIC
- SectionDefinition:
+ SectionDefinition:
Length: 32
NumberOfRelocations: 0
NumberOfLinenumbers: 0
@@ -504,7 +506,7 @@ symbols:
SimpleType: IMAGE_SYM_TYPE_NULL
ComplexType: IMAGE_SYM_DTYPE_NULL
StorageClass: IMAGE_SYM_CLASS_STATIC
- SectionDefinition:
+ SectionDefinition:
Length: 48
NumberOfRelocations: 0
NumberOfLinenumbers: 0
@@ -516,11 +518,11 @@ symbols:
SimpleType: IMAGE_SYM_TYPE_NULL
ComplexType: IMAGE_SYM_DTYPE_NULL
StorageClass: IMAGE_SYM_CLASS_STATIC
- SectionDefinition:
- Length: 832
+ SectionDefinition:
+ Length: 820
NumberOfRelocations: 11
NumberOfLinenumbers: 0
- CheckSum: 372945565
+ CheckSum: 3821266521
Number: 6
- Name: '.debug$S'
Value: 0
@@ -528,11 +530,11 @@ symbols:
SimpleType: IMAGE_SYM_TYPE_NULL
ComplexType: IMAGE_SYM_DTYPE_NULL
StorageClass: IMAGE_SYM_CLASS_STATIC
- SectionDefinition:
+ SectionDefinition:
Length: 284
NumberOfRelocations: 9
NumberOfLinenumbers: 0
- CheckSum: 1378739251
+ CheckSum: 112499332
Number: 4
Selection: IMAGE_COMDAT_SELECT_ASSOCIATIVE
- Name: '.debug$T'
@@ -541,11 +543,11 @@ symbols:
SimpleType: IMAGE_SYM_TYPE_NULL
ComplexType: IMAGE_SYM_DTYPE_NULL
StorageClass: IMAGE_SYM_CLASS_STATIC
- SectionDefinition:
- Length: 316
+ SectionDefinition:
+ Length: 308
NumberOfRelocations: 0
NumberOfLinenumbers: 0
- CheckSum: 3343977630
+ CheckSum: 2028313836
Number: 7
- Name: '.debug$H'
Value: 0
@@ -553,11 +555,11 @@ symbols:
SimpleType: IMAGE_SYM_TYPE_NULL
ComplexType: IMAGE_SYM_DTYPE_NULL
StorageClass: IMAGE_SYM_CLASS_STATIC
- SectionDefinition:
- Length: 112
+ SectionDefinition:
+ Length: 268
NumberOfRelocations: 0
NumberOfLinenumbers: 0
- CheckSum: 1535721080
+ CheckSum: 1115012461
Number: 8
- Name: '@feat.00'
Value: 1
Modified: lld/trunk/test/COFF/Inputs/pdb-hashes-2-missing.yaml
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/Inputs/pdb-hashes-2-missing.yaml?rev=332672&r1=332671&r2=332672&view=diff
==============================================================================
--- lld/trunk/test/COFF/Inputs/pdb-hashes-2-missing.yaml (original)
+++ lld/trunk/test/COFF/Inputs/pdb-hashes-2-missing.yaml Thu May 17 14:49:25 2018
@@ -1,8 +1,8 @@
--- !COFF
-header:
+header:
Machine: IMAGE_FILE_MACHINE_I386
Characteristics: [ ]
-sections:
+sections:
- Name: .text
Characteristics: [ IMAGE_SCN_CNT_CODE, IMAGE_SCN_MEM_EXECUTE, IMAGE_SCN_MEM_READ ]
Alignment: 16
@@ -22,12 +22,12 @@ sections:
- Name: '.debug$S'
Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_DISCARDABLE, IMAGE_SCN_MEM_READ ]
Alignment: 4
- SectionData: 04000000F10000002F0000002D003C110100000007000700000000000000581B000000000000636C616E672076657273696F6E20372E302E30200000F5000000640000000000000000000000190000000000000004000000000000002B000000040000000400000001000000180000000000000004000000000000005800000003000400000000000300000016000000000000000400000000000000960000000100040000000000F1000000540000002E0047110000000000000000000000001900000000000000000000000D100000000000000000004E533A3A66756E63000A003E110310000001006600120045111600000008000000070000000000120002004F11F20000002800000000000000000000001900000000000000020000001C00000000000000030000000700000004000000F1000000100000000E0008110A1000004E533A3A466F6F00F40000001800000001000000100159DFAC75D18675AED1AD169FE316317E0000F3000000D400000000443A5C7372635C6C6C766D6275696C645C636C616E675C44656275675C7838365C6F626A322E63707000245430202E7261536561726368203D202465697020245430205E203D2024657370202454302034202B203D2000245430202E7261536561726368203D202465697020245430205E203D2024657370202454302034202B203D2024656270202454302034202D205E203D200024543020246562702034202B203D202465697020245430205E203D2024657370202454302034202B203D2024656270202454302034202D205E203D200000
- Subsections:
+ SectionData: 04000000F10000002F0000002D003C110100000007000700000000000000581B000000000000636C616E672076657273696F6E20372E302E30200000F500000064000000000000000000000019000000000000000400000000000000240000000400000004000000010000001800000000000000040000000000000051000000030004000000000003000000160000000000000004000000000000008F0000000100040000000000F1000000540000002E0047110000000000000000000000001900000000000000000000000D100000000000000000004E533A3A66756E63000A003E110310000001006600120045111600000008000000070000000000120002004F11F20000002800000000000000000000001900000000000000020000001C00000000000000040000000700000005000000F1000000100000000E0008110A1000004E533A3A466F6F00F400000018000000010000001001CEC8BDE31D126291115B63CE08A5D1360000F3000000CC00000000433A5C7372635C6C6C766D2D70726F6A6563745C6275696C645C6F626A322E63707000245430202E7261536561726368203D202465697020245430205E203D2024657370202454302034202B203D2000245430202E7261536561726368203D202465697020245430205E203D2024657370202454302034202B203D2024656270202454302034202D205E203D200024543020246562702034202B203D202465697020245430205E203D2024657370202454302034202B203D2024656270202454302034202D205E203D2000
+ Subsections:
- !Symbols
- Records:
+ Records:
- Kind: S_COMPILE3
- Compile3Sym:
+ Compile3Sym:
Flags: [ ]
Machine: Pentium3
FrontendMajor: 7
@@ -40,7 +40,7 @@ sections:
BackendQFE: 0
Version: 'clang version 7.0.0 '
- !FrameData
- Frames:
+ Frames:
- CodeSize: 25
FrameFunc: '$T0 .raSearch = $eip $T0 ^ = $esp $T0 4 + = '
LocalSize: 0
@@ -66,9 +66,9 @@ sections:
RvaStart: 3
SavedRegsSize: 4
- !Symbols
- Records:
+ Records:
- Kind: S_GPROC32_ID
- ProcSym:
+ ProcSym:
CodeSize: 25
DbgStart: 0
DbgEnd: 0
@@ -76,58 +76,57 @@ sections:
Flags: [ ]
DisplayName: 'NS::func'
- Kind: S_LOCAL
- LocalSym:
+ LocalSym:
Type: 4099
Flags: [ IsParameter ]
VarName: f
- Kind: S_DEFRANGE_REGISTER_REL
- DefRangeRegisterRelSym:
+ DefRangeRegisterRelSym:
Register: 22
Flags: 0
BasePointerOffset: 8
- Range:
+ Range:
OffsetStart: 7
ISectStart: 0
Range: 18
- Gaps:
+ Gaps:
- Kind: S_PROC_ID_END
- ScopeEndSym:
+ ScopeEndSym:
- !Lines
CodeSize: 25
Flags: [ ]
RelocOffset: 0
RelocSegment: 0
- Blocks:
- - FileName: 'D:\src\llvmbuild\clang\Debug\x86\obj2.cpp'
- Lines:
+ Blocks:
+ - FileName: 'C:\src\llvm-project\build\obj2.cpp'
+ Lines:
- Offset: 0
- LineStart: 3
+ LineStart: 4
IsStatement: false
EndDelta: 0
- Offset: 7
- LineStart: 4
+ LineStart: 5
IsStatement: false
EndDelta: 0
- Columns:
+ Columns:
- !Symbols
- Records:
+ Records:
- Kind: S_UDT
- UDTSym:
+ UDTSym:
Type: 4106
UDTName: 'NS::Foo'
- !FileChecksums
- Checksums:
- - FileName: 'D:\src\llvmbuild\clang\Debug\x86\obj2.cpp'
+ Checksums:
+ - FileName: 'C:\src\llvm-project\build\obj2.cpp'
Kind: MD5
- Checksum: 59DFAC75D18675AED1AD169FE316317E
+ Checksum: CEC8BDE31D126291115B63CE08A5D136
- !StringTable
- Strings:
- - 'D:\src\llvmbuild\clang\Debug\x86\obj2.cpp'
+ Strings:
+ - 'C:\src\llvm-project\build\obj2.cpp'
- '$T0 .raSearch = $eip $T0 ^ = $esp $T0 4 + = '
- '$T0 .raSearch = $eip $T0 ^ = $esp $T0 4 + = $ebp $T0 4 - ^ = '
- '$T0 $ebp 4 + = $eip $T0 ^ = $esp $T0 4 + = $ebp $T0 4 - ^ = '
- - ''
- Relocations:
+ Relocations:
- VirtualAddress: 68
SymbolName: '?func at NS@@YAHABUFoo at 1@@Z'
Type: IMAGE_REL_I386_DIR32NB
@@ -152,14 +151,14 @@ sections:
- Name: '.debug$T'
Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_DISCARDABLE, IMAGE_SCN_MEM_READ ]
Alignment: 4
- SectionData: 040000000A000516000000004E5300F12A0005150000800200000000000000000000000000004E533A3A466F6F002E3F4155466F6F404E53404000F10A000110011000000100F2F10A000210021000002A8000000A00011201000000031000000E0008107400000000000100041000000A000210011000000A8000000A00011201000000740000001A0009100300000001100000061000000B00010007100000000000001A0003120D15030074000000000058001115030008100000466F6F002A0005150200000209100000000000000000000004004E533A3A466F6F002E3F4155466F6F404E53404000F12E00051600000000443A5C7372635C6C6C766D6275696C645C636C616E675C44656275675C7838365C6F626A2E6800F10E0006160A1000000B1000000200000012000116001000000510000066756E6300F3F2F1
- Types:
+ SectionData: 040000000A000516000000004E5300F12A0005150000800200000000000000000000000000004E533A3A466F6F002E3F4155466F6F404E53404000F10A000110011000000100F2F10A000210021000002A8000000A00011201000000031000000E0008107400000000000100041000000A000210011000000A8000000A00011201000000740000001A0009100300000001100000061000000B00010007100000000000001A0003120D15030074000000000058001115030008100000466F6F002A0005150200000209100000000000000000000004004E533A3A466F6F002E3F4155466F6F404E53404000F12600051600000000433A5C7372635C6C6C766D2D70726F6A6563745C6275696C645C6F626A2E68000E0006160A1000000B1000000300000012000116001000000510000066756E6300F3F2F1
+ Types:
- Kind: LF_STRING_ID
- StringId:
+ StringId:
Id: 0
String: NS
- Kind: LF_STRUCTURE
- Class:
+ Class:
MemberCount: 0
Options: [ None, ForwardReference, HasUniqueName ]
FieldList: 0
@@ -169,32 +168,32 @@ sections:
VTableShape: 0
Size: 0
- Kind: LF_MODIFIER
- Modifier:
+ Modifier:
ModifiedType: 4097
Modifiers: [ None, Const ]
- Kind: LF_POINTER
- Pointer:
+ Pointer:
ReferentType: 4098
Attrs: 32810
- Kind: LF_ARGLIST
- ArgList:
+ ArgList:
ArgIndices: [ 4099 ]
- Kind: LF_PROCEDURE
- Procedure:
+ Procedure:
ReturnType: 116
CallConv: NearC
Options: [ None ]
ParameterCount: 1
ArgumentList: 4100
- Kind: LF_POINTER
- Pointer:
+ Pointer:
ReferentType: 4097
Attrs: 32778
- Kind: LF_ARGLIST
- ArgList:
+ ArgList:
ArgIndices: [ 116 ]
- Kind: LF_MFUNCTION
- MemberFunction:
+ MemberFunction:
ReturnType: 3
ClassType: 4097
ThisType: 4102
@@ -204,21 +203,21 @@ sections:
ArgumentList: 4103
ThisPointerAdjustment: 0
- Kind: LF_FIELDLIST
- FieldList:
+ FieldList:
- Kind: LF_MEMBER
- DataMember:
+ DataMember:
Attrs: 3
Type: 116
FieldOffset: 0
Name: X
- Kind: LF_ONEMETHOD
- OneMethod:
+ OneMethod:
Type: 4104
Attrs: 3
VFTableOffset: -1
Name: Foo
- Kind: LF_STRUCTURE
- Class:
+ Class:
MemberCount: 2
Options: [ None, HasUniqueName ]
FieldList: 4105
@@ -228,27 +227,27 @@ sections:
VTableShape: 0
Size: 4
- Kind: LF_STRING_ID
- StringId:
+ StringId:
Id: 0
- String: 'D:\src\llvmbuild\clang\Debug\x86\obj.h'
+ String: 'C:\src\llvm-project\build\obj.h'
- Kind: LF_UDT_SRC_LINE
- UdtSourceLine:
+ UdtSourceLine:
UDT: 4106
SourceFile: 4107
- LineNumber: 2
+ LineNumber: 3
- Kind: LF_FUNC_ID
- FuncId:
+ FuncId:
ParentScope: 4096
FunctionType: 4101
Name: func
-symbols:
+symbols:
- Name: .text
Value: 0
SectionNumber: 1
SimpleType: IMAGE_SYM_TYPE_NULL
ComplexType: IMAGE_SYM_DTYPE_NULL
StorageClass: IMAGE_SYM_CLASS_STATIC
- SectionDefinition:
+ SectionDefinition:
Length: 25
NumberOfRelocations: 0
NumberOfLinenumbers: 0
@@ -260,7 +259,7 @@ symbols:
SimpleType: IMAGE_SYM_TYPE_NULL
ComplexType: IMAGE_SYM_DTYPE_NULL
StorageClass: IMAGE_SYM_CLASS_STATIC
- SectionDefinition:
+ SectionDefinition:
Length: 0
NumberOfRelocations: 0
NumberOfLinenumbers: 0
@@ -272,7 +271,7 @@ symbols:
SimpleType: IMAGE_SYM_TYPE_NULL
ComplexType: IMAGE_SYM_DTYPE_NULL
StorageClass: IMAGE_SYM_CLASS_STATIC
- SectionDefinition:
+ SectionDefinition:
Length: 0
NumberOfRelocations: 0
NumberOfLinenumbers: 0
@@ -284,7 +283,7 @@ symbols:
SimpleType: IMAGE_SYM_TYPE_NULL
ComplexType: IMAGE_SYM_DTYPE_NULL
StorageClass: IMAGE_SYM_CLASS_STATIC
- SectionDefinition:
+ SectionDefinition:
Length: 48
NumberOfRelocations: 0
NumberOfLinenumbers: 0
@@ -296,11 +295,11 @@ symbols:
SimpleType: IMAGE_SYM_TYPE_NULL
ComplexType: IMAGE_SYM_DTYPE_NULL
StorageClass: IMAGE_SYM_CLASS_STATIC
- SectionDefinition:
- Length: 584
+ SectionDefinition:
+ Length: 576
NumberOfRelocations: 7
NumberOfLinenumbers: 0
- CheckSum: 917356735
+ CheckSum: 1275848292
Number: 5
- Name: '.debug$T'
Value: 0
@@ -308,11 +307,11 @@ symbols:
SimpleType: IMAGE_SYM_TYPE_NULL
ComplexType: IMAGE_SYM_DTYPE_NULL
StorageClass: IMAGE_SYM_CLASS_STATIC
- SectionDefinition:
- Length: 320
+ SectionDefinition:
+ Length: 312
NumberOfRelocations: 0
NumberOfLinenumbers: 0
- CheckSum: 2684556216
+ CheckSum: 3001708198
Number: 6
- Name: '@feat.00'
Value: 1
Modified: lld/trunk/test/COFF/Inputs/pdb-hashes-2.yaml
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/Inputs/pdb-hashes-2.yaml?rev=332672&r1=332671&r2=332672&view=diff
==============================================================================
--- lld/trunk/test/COFF/Inputs/pdb-hashes-2.yaml (original)
+++ lld/trunk/test/COFF/Inputs/pdb-hashes-2.yaml Thu May 17 14:49:25 2018
@@ -1,8 +1,8 @@
--- !COFF
-header:
+header:
Machine: IMAGE_FILE_MACHINE_I386
Characteristics: [ ]
-sections:
+sections:
- Name: .text
Characteristics: [ IMAGE_SCN_CNT_CODE, IMAGE_SCN_MEM_EXECUTE, IMAGE_SCN_MEM_READ ]
Alignment: 16
@@ -22,12 +22,12 @@ sections:
- Name: '.debug$S'
Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_DISCARDABLE, IMAGE_SCN_MEM_READ ]
Alignment: 4
- SectionData: 04000000F10000002F0000002D003C110100000007000700000000000000581B000000000000636C616E672076657273696F6E20372E302E30200000F5000000640000000000000000000000190000000000000004000000000000002B000000040000000400000001000000180000000000000004000000000000005800000003000400000000000300000016000000000000000400000000000000960000000100040000000000F1000000540000002E0047110000000000000000000000001900000000000000000000000D100000000000000000004E533A3A66756E63000A003E110310000001006600120045111600000008000000070000000000120002004F11F20000002800000000000000000000001900000000000000020000001C00000000000000030000000700000004000000F1000000100000000E0008110A1000004E533A3A466F6F00F40000001800000001000000100159DFAC75D18675AED1AD169FE316317E0000F3000000D400000000443A5C7372635C6C6C766D6275696C645C636C616E675C44656275675C7838365C6F626A322E63707000245430202E7261536561726368203D202465697020245430205E203D2024657370202454302034202B203D2000245430202E7261536561726368203D202465697020245430205E203D2024657370202454302034202B203D2024656270202454302034202D205E203D200024543020246562702034202B203D202465697020245430205E203D2024657370202454302034202B203D2024656270202454302034202D205E203D200000
- Subsections:
+ SectionData: 04000000F10000002F0000002D003C110100000007000700000000000000581B000000000000636C616E672076657273696F6E20372E302E30200000F500000064000000000000000000000019000000000000000400000000000000240000000400000004000000010000001800000000000000040000000000000051000000030004000000000003000000160000000000000004000000000000008F0000000100040000000000F1000000540000002E0047110000000000000000000000001900000000000000000000000D100000000000000000004E533A3A66756E63000A003E110310000001006600120045111600000008000000070000000000120002004F11F20000002800000000000000000000001900000000000000020000001C00000000000000040000000700000005000000F1000000100000000E0008110A1000004E533A3A466F6F00F400000018000000010000001001CEC8BDE31D126291115B63CE08A5D1360000F3000000CC00000000433A5C7372635C6C6C766D2D70726F6A6563745C6275696C645C6F626A322E63707000245430202E7261536561726368203D202465697020245430205E203D2024657370202454302034202B203D2000245430202E7261536561726368203D202465697020245430205E203D2024657370202454302034202B203D2024656270202454302034202D205E203D200024543020246562702034202B203D202465697020245430205E203D2024657370202454302034202B203D2024656270202454302034202D205E203D2000
+ Subsections:
- !Symbols
- Records:
+ Records:
- Kind: S_COMPILE3
- Compile3Sym:
+ Compile3Sym:
Flags: [ ]
Machine: Pentium3
FrontendMajor: 7
@@ -40,7 +40,7 @@ sections:
BackendQFE: 0
Version: 'clang version 7.0.0 '
- !FrameData
- Frames:
+ Frames:
- CodeSize: 25
FrameFunc: '$T0 .raSearch = $eip $T0 ^ = $esp $T0 4 + = '
LocalSize: 0
@@ -66,9 +66,9 @@ sections:
RvaStart: 3
SavedRegsSize: 4
- !Symbols
- Records:
+ Records:
- Kind: S_GPROC32_ID
- ProcSym:
+ ProcSym:
CodeSize: 25
DbgStart: 0
DbgEnd: 0
@@ -76,58 +76,57 @@ sections:
Flags: [ ]
DisplayName: 'NS::func'
- Kind: S_LOCAL
- LocalSym:
+ LocalSym:
Type: 4099
Flags: [ IsParameter ]
VarName: f
- Kind: S_DEFRANGE_REGISTER_REL
- DefRangeRegisterRelSym:
+ DefRangeRegisterRelSym:
Register: 22
Flags: 0
BasePointerOffset: 8
- Range:
+ Range:
OffsetStart: 7
ISectStart: 0
Range: 18
- Gaps:
+ Gaps:
- Kind: S_PROC_ID_END
- ScopeEndSym:
+ ScopeEndSym:
- !Lines
CodeSize: 25
Flags: [ ]
RelocOffset: 0
RelocSegment: 0
- Blocks:
- - FileName: 'D:\src\llvmbuild\clang\Debug\x86\obj2.cpp'
- Lines:
+ Blocks:
+ - FileName: 'C:\src\llvm-project\build\obj2.cpp'
+ Lines:
- Offset: 0
- LineStart: 3
+ LineStart: 4
IsStatement: false
EndDelta: 0
- Offset: 7
- LineStart: 4
+ LineStart: 5
IsStatement: false
EndDelta: 0
- Columns:
+ Columns:
- !Symbols
- Records:
+ Records:
- Kind: S_UDT
- UDTSym:
+ UDTSym:
Type: 4106
UDTName: 'NS::Foo'
- !FileChecksums
- Checksums:
- - FileName: 'D:\src\llvmbuild\clang\Debug\x86\obj2.cpp'
+ Checksums:
+ - FileName: 'C:\src\llvm-project\build\obj2.cpp'
Kind: MD5
- Checksum: 59DFAC75D18675AED1AD169FE316317E
+ Checksum: CEC8BDE31D126291115B63CE08A5D136
- !StringTable
- Strings:
- - 'D:\src\llvmbuild\clang\Debug\x86\obj2.cpp'
+ Strings:
+ - 'C:\src\llvm-project\build\obj2.cpp'
- '$T0 .raSearch = $eip $T0 ^ = $esp $T0 4 + = '
- '$T0 .raSearch = $eip $T0 ^ = $esp $T0 4 + = $ebp $T0 4 - ^ = '
- '$T0 $ebp 4 + = $eip $T0 ^ = $esp $T0 4 + = $ebp $T0 4 - ^ = '
- - ''
- Relocations:
+ Relocations:
- VirtualAddress: 68
SymbolName: '?func at NS@@YAHABUFoo at 1@@Z'
Type: IMAGE_REL_I386_DIR32NB
@@ -152,14 +151,14 @@ sections:
- Name: '.debug$T'
Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_DISCARDABLE, IMAGE_SCN_MEM_READ ]
Alignment: 4
- SectionData: 040000000A000516000000004E5300F12A0005150000800200000000000000000000000000004E533A3A466F6F002E3F4155466F6F404E53404000F10A000110011000000100F2F10A000210021000002A8000000A00011201000000031000000E0008107400000000000100041000000A000210011000000A8000000A00011201000000740000001A0009100300000001100000061000000B00010007100000000000001A0003120D15030074000000000058001115030008100000466F6F002A0005150200000209100000000000000000000004004E533A3A466F6F002E3F4155466F6F404E53404000F12E00051600000000443A5C7372635C6C6C766D6275696C645C636C616E675C44656275675C7838365C6F626A2E6800F10E0006160A1000000B1000000200000012000116001000000510000066756E6300F3F2F1
- Types:
+ SectionData: 040000000A000516000000004E5300F12A0005150000800200000000000000000000000000004E533A3A466F6F002E3F4155466F6F404E53404000F10A000110011000000100F2F10A000210021000002A8000000A00011201000000031000000E0008107400000000000100041000000A000210011000000A8000000A00011201000000740000001A0009100300000001100000061000000B00010007100000000000001A0003120D15030074000000000058001115030008100000466F6F002A0005150200000209100000000000000000000004004E533A3A466F6F002E3F4155466F6F404E53404000F12600051600000000433A5C7372635C6C6C766D2D70726F6A6563745C6275696C645C6F626A2E68000E0006160A1000000B1000000300000012000116001000000510000066756E6300F3F2F1
+ Types:
- Kind: LF_STRING_ID
- StringId:
+ StringId:
Id: 0
String: NS
- Kind: LF_STRUCTURE
- Class:
+ Class:
MemberCount: 0
Options: [ None, ForwardReference, HasUniqueName ]
FieldList: 0
@@ -169,32 +168,32 @@ sections:
VTableShape: 0
Size: 0
- Kind: LF_MODIFIER
- Modifier:
+ Modifier:
ModifiedType: 4097
Modifiers: [ None, Const ]
- Kind: LF_POINTER
- Pointer:
+ Pointer:
ReferentType: 4098
Attrs: 32810
- Kind: LF_ARGLIST
- ArgList:
+ ArgList:
ArgIndices: [ 4099 ]
- Kind: LF_PROCEDURE
- Procedure:
+ Procedure:
ReturnType: 116
CallConv: NearC
Options: [ None ]
ParameterCount: 1
ArgumentList: 4100
- Kind: LF_POINTER
- Pointer:
+ Pointer:
ReferentType: 4097
Attrs: 32778
- Kind: LF_ARGLIST
- ArgList:
+ ArgList:
ArgIndices: [ 116 ]
- Kind: LF_MFUNCTION
- MemberFunction:
+ MemberFunction:
ReturnType: 3
ClassType: 4097
ThisType: 4102
@@ -204,21 +203,21 @@ sections:
ArgumentList: 4103
ThisPointerAdjustment: 0
- Kind: LF_FIELDLIST
- FieldList:
+ FieldList:
- Kind: LF_MEMBER
- DataMember:
+ DataMember:
Attrs: 3
Type: 116
FieldOffset: 0
Name: X
- Kind: LF_ONEMETHOD
- OneMethod:
+ OneMethod:
Type: 4104
Attrs: 3
VFTableOffset: -1
Name: Foo
- Kind: LF_STRUCTURE
- Class:
+ Class:
MemberCount: 2
Options: [ None, HasUniqueName ]
FieldList: 4105
@@ -228,49 +227,49 @@ sections:
VTableShape: 0
Size: 4
- Kind: LF_STRING_ID
- StringId:
+ StringId:
Id: 0
- String: 'D:\src\llvmbuild\clang\Debug\x86\obj.h'
+ String: 'C:\src\llvm-project\build\obj.h'
- Kind: LF_UDT_SRC_LINE
- UdtSourceLine:
+ UdtSourceLine:
UDT: 4106
SourceFile: 4107
- LineNumber: 2
+ LineNumber: 3
- Kind: LF_FUNC_ID
- FuncId:
+ FuncId:
ParentScope: 4096
FunctionType: 4101
Name: func
- Name: '.debug$H'
Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_DISCARDABLE, IMAGE_SCN_MEM_READ ]
Alignment: 4
- SectionData: C5C93301000001004A061540B751965F23ADA4E788EB7A9032673B3BABE3CA5356B1521BDAE4BEA70661C95750D0206E896FB09488EE8E1BB5DECADF1A832BA46632585CDC7606E4B97B86241E5F45B0BCD2406E22465E11A528BEF0A7F589C76079F1186C40C2165091EFEBD5B5446B5AAD8721C21DF3E6
- GlobalHashes:
+ SectionData: C5C9330100000000D6242F1ED02B98E973DCA3334A061540B751965F476700689419512EFB395F1A23ADA4E788EB7A90DC6D1D00D355FEFEDDE4C68641D053622767E1526FD137C1525BDF80D746B3B9C314372C738054FC95D47092AC4D20BAC80E167B185331D42B388FB966A52D778FFF3829DC925A33C5CA6DD9A3EBA965DA146E89F004E6185E87867C58B4AC836CBBD1301D1BC1BDEEB7F3A86BB7ECCF6632585CDC7606E4CCAB0C6E6E190E3091E4290AFF7BA25E9E8209892CA91CCBF55A49FCB303335DC553B426E3AC635C1883F35475E9A4A12ED6396BC795E5D801DB74B371743A7A9E69529643FB49E2201DD99ECA4F72B2213D30B9768BAE6EB7C1150155B4421347349E77B1F380BB197127A54D0DB470E57DF96B15066C78
+ GlobalHashes:
Version: 0
- HashAlgorithm: 1
- HashValues:
- - 4A061540B751965F
- - 23ADA4E788EB7A90
- - 32673B3BABE3CA53
- - 56B1521BDAE4BEA7
- - 0661C95750D0206E
- - 896FB09488EE8E1B
- - B5DECADF1A832BA4
- - 6632585CDC7606E4
- - B97B86241E5F45B0
- - BCD2406E22465E11
- - A528BEF0A7F589C7
- - 6079F1186C40C216
- - 5091EFEBD5B5446B
- - 5AAD8721C21DF3E6
-symbols:
+ HashAlgorithm: 0
+ HashValues:
+ - D6242F1ED02B98E973DCA3334A061540B751965F
+ - 476700689419512EFB395F1A23ADA4E788EB7A90
+ - DC6D1D00D355FEFEDDE4C68641D053622767E152
+ - 6FD137C1525BDF80D746B3B9C314372C738054FC
+ - 95D47092AC4D20BAC80E167B185331D42B388FB9
+ - 66A52D778FFF3829DC925A33C5CA6DD9A3EBA965
+ - DA146E89F004E6185E87867C58B4AC836CBBD130
+ - 1D1BC1BDEEB7F3A86BB7ECCF6632585CDC7606E4
+ - CCAB0C6E6E190E3091E4290AFF7BA25E9E820989
+ - 2CA91CCBF55A49FCB303335DC553B426E3AC635C
+ - 1883F35475E9A4A12ED6396BC795E5D801DB74B3
+ - 71743A7A9E69529643FB49E2201DD99ECA4F72B2
+ - 213D30B9768BAE6EB7C1150155B4421347349E77
+ - B1F380BB197127A54D0DB470E57DF96B15066C78
+symbols:
- Name: .text
Value: 0
SectionNumber: 1
SimpleType: IMAGE_SYM_TYPE_NULL
ComplexType: IMAGE_SYM_DTYPE_NULL
StorageClass: IMAGE_SYM_CLASS_STATIC
- SectionDefinition:
+ SectionDefinition:
Length: 25
NumberOfRelocations: 0
NumberOfLinenumbers: 0
@@ -282,7 +281,7 @@ symbols:
SimpleType: IMAGE_SYM_TYPE_NULL
ComplexType: IMAGE_SYM_DTYPE_NULL
StorageClass: IMAGE_SYM_CLASS_STATIC
- SectionDefinition:
+ SectionDefinition:
Length: 0
NumberOfRelocations: 0
NumberOfLinenumbers: 0
@@ -294,7 +293,7 @@ symbols:
SimpleType: IMAGE_SYM_TYPE_NULL
ComplexType: IMAGE_SYM_DTYPE_NULL
StorageClass: IMAGE_SYM_CLASS_STATIC
- SectionDefinition:
+ SectionDefinition:
Length: 0
NumberOfRelocations: 0
NumberOfLinenumbers: 0
@@ -306,7 +305,7 @@ symbols:
SimpleType: IMAGE_SYM_TYPE_NULL
ComplexType: IMAGE_SYM_DTYPE_NULL
StorageClass: IMAGE_SYM_CLASS_STATIC
- SectionDefinition:
+ SectionDefinition:
Length: 48
NumberOfRelocations: 0
NumberOfLinenumbers: 0
@@ -318,11 +317,11 @@ symbols:
SimpleType: IMAGE_SYM_TYPE_NULL
ComplexType: IMAGE_SYM_DTYPE_NULL
StorageClass: IMAGE_SYM_CLASS_STATIC
- SectionDefinition:
- Length: 584
+ SectionDefinition:
+ Length: 576
NumberOfRelocations: 7
NumberOfLinenumbers: 0
- CheckSum: 917356735
+ CheckSum: 1275848292
Number: 5
- Name: '.debug$T'
Value: 0
@@ -330,11 +329,11 @@ symbols:
SimpleType: IMAGE_SYM_TYPE_NULL
ComplexType: IMAGE_SYM_DTYPE_NULL
StorageClass: IMAGE_SYM_CLASS_STATIC
- SectionDefinition:
- Length: 320
+ SectionDefinition:
+ Length: 312
NumberOfRelocations: 0
NumberOfLinenumbers: 0
- CheckSum: 2684556216
+ CheckSum: 3001708198
Number: 6
- Name: '.debug$H'
Value: 0
@@ -342,11 +341,11 @@ symbols:
SimpleType: IMAGE_SYM_TYPE_NULL
ComplexType: IMAGE_SYM_DTYPE_NULL
StorageClass: IMAGE_SYM_CLASS_STATIC
- SectionDefinition:
- Length: 120
+ SectionDefinition:
+ Length: 288
NumberOfRelocations: 0
NumberOfLinenumbers: 0
- CheckSum: 358820662
+ CheckSum: 3809286526
Number: 7
- Name: '@feat.00'
Value: 1
Modified: lld/trunk/test/COFF/pdb-global-hashes.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/pdb-global-hashes.test?rev=332672&r1=332671&r2=332672&view=diff
==============================================================================
--- lld/trunk/test/COFF/pdb-global-hashes.test (original)
+++ lld/trunk/test/COFF/pdb-global-hashes.test Thu May 17 14:49:25 2018
@@ -85,7 +85,7 @@ CHECK-NEXT: 0x1000 | LF_FUNC_ID [size
CHECK-NEXT: name = main, type = 0x1002, parent scope = <no type>
CHECK-NEXT: 0x1001 | LF_STRING_ID [size = {{.*}}] ID: <no type>, String: {{.*}}obj.h
CHECK-NEXT: 0x1002 | LF_UDT_SRC_LINE [size = 16]
-CHECK-NEXT: udt = 0x1008, file = 4097, line = 2
+CHECK-NEXT: udt = 0x1008, file = 4097, line = 3
CHECK-NEXT: 0x1003 | LF_MFUNC_ID [size = 16]
CHECK-NEXT: name = Foo, type = 0x1006, class type = 0x1003
CHECK-NEXT: 0x1004 | LF_STRING_ID [size = 12] ID: <no type>, String: NS
More information about the llvm-commits
mailing list