This is an archive of the discontinued LLVM Phabricator instance.

Differential D34898

[PDB] Fill in "Parent" and "End" fields of scope-like symbol records
ClosedPublic

Authored by rnk on Jun 30 2017, 10:26 AM.

Details

Reviewers
zturner
ruiu
Commits
rG3f8519293000: [PDB] Fill in "Parent" and "End" fields of scope-like symbol records
rLLD307278: [PDB] Fill in "Parent" and "End" fields of scope-like symbol records
rL307278: [PDB] Fill in "Parent" and "End" fields of scope-like symbol records
Summary

There are a variety of records that open scopes: function scopes, block
scopes, and inlined call site scopes. These symbol records contain
Parent and End fields with the offsets of other symbol records. The End
field contains the offset of the matching S_END or S_INLINESITE_END
record. The Parent field contains the offset of the parent record, or 0
if this is a top-level scope (i.e. a function).

With this change, llvm-pdbutil pretty -all no longer crashes on PDBs
produced by LLD. I haven't tried a real debugger yet.

Diff Detail

Event Timeline

rnk created this revision.Jun 30 2017, 10:26 AM
zturner added inline comments.Jun 30 2017, 11:42 AM
lld/test/COFF/pdb-scopes.test
39

Would it be helpful to format this (and similar) records so that parent = 0, end = 196 is at the beginning of the string, so that you can just match that and leave out the rest of the (relatively fragile) debug info which we're not trying to test?

41–43

Remove these from the test as they aren't relevant?

44

I wonder if we should display the offset of each symbol in the output. For types we write something like:

0x1017 | LF_CLASS [size = 60]
          class name: `MembersTest::A`
          unique name: `.?AVA@MembersTest@@`
          vtable: <no type>, base list: <no type>, field list: <no type>
          options: forward ref | has unique name

But we have no such analogue for symbols. The only way to uniquely identify a symbol is by its offset in the symbol stream, but since this is what the Parent and End fields do anyway, perhaps we could display it? This would also allow the test to be more robust, as you could say:

CHECK: -    0 | S_GPROC32_ID [size = 44] `g`
CHECK:            parent = 0, addr = 0002:0000, code size = 5, end = [[END:r[0-9]+]]
CHECK:            debug start = 4, debug end = 4, flags = none
CHECK: -  [[END]] | S_END [size = 4]

Right now we're verifying that we're writing some number for the field, but we're not verifying that it's the correct number

58–59

This ties into what I was saying earlier, but it's not clear to me what this number 200 represents. It doesn't seem to be the offset of any symbol. (I did the math by hand, and the offsets are:

S_GPROC32     0
S_FRAMEPROC   44
S_REGREL32    76
S_END         92
S_GPROC32_ID  96
S_FRAMEPROC   140
S_REGREL32    172
S_BLOCK32     192
S_REGREL32    216
S_END         232
S_BLOCK32     240

Nothing has offset 200. So what is this number?

zturner added inline comments.Jun 30 2017, 2:26 PM
lld/COFF/PDB.cpp
191

I found a couple of additional symbols that I wonder if we need to handle.

From cvdump.h

// Separated code (from the compiler) support
S_SEPCODE       =  0x1132,

// extended inline site information
S_INLINESITE2 = 0x115d,

We don't currently handle either of these and I've never seen a problem, but maybe you have some theories on why they might arise?

Also, if we're not supporting code (we aren't), then might as well delete S_WITH32. Otherwise you might as well add all the other managed symbols (e.g. S_MANPROC)

217

Can you change the name of this to somehow indicate that this is the begin or opening symbol of the scope? It's probably obvious but a better name would make it even more obvious.

223

Can you change the signature to

static void scopeStackOpen(SmallVectorImpl<SymbolScope> &Stack,
                           uint32_t Offset,
                           CVSymbol &BeginSymbol) {

and then add an assert on line 1:

assert(symbolOpensScope(BeginSymbol.kind()));

Mostly just for readability.

273–274

Should we do something if Scopes.empty()? Warn, assert, ignore, drop the record?

zturner added inline comments.Jun 30 2017, 2:27 PM
lld/COFF/PDB.cpp
191

s/if we're not supporting code/if we're not supporting managed code/

rnk marked 2 inline comments as done.Jun 30 2017, 3:46 PM
rnk added inline comments.
lld/COFF/PDB.cpp
191

I went ahead and added the non-managed ones you mentioned.

223

Sure, but then I have to add a const_cast.

273–274

Warn, I guess.

lld/test/COFF/pdb-scopes.test
41–43

I removed the guts of the S_REGREL32 records.

44

Now that you've extended the dumper, this is done.

58–59

It should be clear now that the enclosing S_GPROC32_ID has that offset. There are some TU-wide S_ records that I deleted because they weren't relevant.

zturner edited edge metadata.Jun 30 2017, 5:02 PM

Did the new patch not get uploaded? I'm still seeing the original patch.

lld/COFF/PDB.cpp
223

Oh, yea nevermind then.

rnk updated this revision to Diff 105435.Jul 6 2017, 8:22 AM
  • comments
zturner accepted this revision.Jul 6 2017, 9:01 AM
This revision is now accepted and ready to land.Jul 6 2017, 9:01 AM
Closed by commit rL307278: [PDB] Fill in "Parent" and "End" fields of scope-like symbol records (authored by rnk). · Explain WhyJul 6 2017, 9:40 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lld/
COFF/
75 lines
test/
COFF/
Inputs/
425 lines
365 lines
6 lines
75 lines
2 lines
llvm/
include/
llvm/
DebugInfo/
PDB/
Native/
4 lines

Diff 105435

lld/COFF/PDB.cpp

Show First 20 Lines • Show All 170 Lines • ▼ Show 20 Linesstatic MutableArrayRef<uint8_t> copySymbolForPdb(const CVSymbol &Sym,
// next record. MSVC does some canonicalization of the record kind, so we do // next record. MSVC does some canonicalization of the record kind, so we do
// that as well. // that as well.
auto *Prefix = reinterpret_cast<RecordPrefix *>(Mem); auto *Prefix = reinterpret_cast<RecordPrefix *>(Mem);
Prefix->RecordKind = canonicalizeSymbolKind(Sym.kind()); Prefix->RecordKind = canonicalizeSymbolKind(Sym.kind());
Prefix->RecordLen = Size - 2; Prefix->RecordLen = Size - 2;
return NewData; return NewData;
} }
/// Return true if this symbol opens a scope. This implies that the symbol has
/// "parent" and "end" fields, which contain the offset of the S_END or
/// S_INLINESITE_END record.
static bool symbolOpensScope(SymbolKind Kind) {
switch (Kind) {
case SymbolKind::S_GPROC32:
case SymbolKind::S_LPROC32:
case SymbolKind::S_LPROC32_ID:
case SymbolKind::S_GPROC32_ID:
case SymbolKind::S_BLOCK32:
case SymbolKind::S_SEPCODE:
case SymbolKind::S_THUNK32:
case SymbolKind::S_INLINESITE:
zturnerUnsubmitted
Not Done
ReplyInline Actions

I found a couple of additional symbols that I wonder if we need to handle.

From cvdump.h

// Separated code (from the compiler) support
S_SEPCODE       =  0x1132,

// extended inline site information
S_INLINESITE2 = 0x115d,

We don't currently handle either of these and I've never seen a problem, but maybe you have some theories on why they might arise?

Also, if we're not supporting code (we aren't), then might as well delete S_WITH32. Otherwise you might as well add all the other managed symbols (e.g. S_MANPROC)

zturner: I found a couple of additional symbols that I wonder if we need to handle. From cvdump.h ```…
zturnerUnsubmitted
Not Done
ReplyInline Actions

s/if we're not supporting code/if we're not supporting managed code/

zturner: s/if we're not supporting code/if we're not supporting **managed** code/
rnkAuthorUnsubmitted
Not Done
ReplyInline Actions

I went ahead and added the non-managed ones you mentioned.

rnk: I went ahead and added the non-managed ones you mentioned.
case SymbolKind::S_INLINESITE2:
return true;
default:
break;
}
return false;
}
static bool symbolEndsScope(SymbolKind Kind) {
switch (Kind) {
case SymbolKind::S_END:
case SymbolKind::S_PROC_ID_END:
case SymbolKind::S_INLINESITE_END:
return true;
default:
break;
}
return false;
}
struct ScopeRecord {
ulittle32_t PtrParent;
ulittle32_t PtrEnd;
};
struct SymbolScope {
zturnerUnsubmitted
Done
ReplyInline Actions

Can you change the name of this to somehow indicate that this is the begin or opening symbol of the scope? It's probably obvious but a better name would make it even more obvious.

zturner: Can you change the name of this to somehow indicate that this is the begin or opening symbol of…
ScopeRecord *OpeningRecord;
uint32_t ScopeOffset;
};
static void scopeStackOpen(SmallVectorImpl<SymbolScope> &Stack,
uint32_t CurOffset, CVSymbol &Sym) {
zturnerUnsubmitted
Not Done
ReplyInline Actions

Can you change the signature to

static void scopeStackOpen(SmallVectorImpl<SymbolScope> &Stack,
                           uint32_t Offset,
                           CVSymbol &BeginSymbol) {

and then add an assert on line 1:

assert(symbolOpensScope(BeginSymbol.kind()));

Mostly just for readability.

zturner: Can you change the signature to ``` static void scopeStackOpen(SmallVectorImpl<SymbolScope>…
rnkAuthorUnsubmitted
Not Done
ReplyInline Actions

Sure, but then I have to add a const_cast.

rnk: Sure, but then I have to add a const_cast.
zturnerUnsubmitted
Not Done
ReplyInline Actions

Oh, yea nevermind then.

zturner: Oh, yea nevermind then.
assert(symbolOpensScope(Sym.kind()));
SymbolScope S;
S.ScopeOffset = CurOffset;
S.OpeningRecord = const_cast<ScopeRecord *>(
reinterpret_cast<const ScopeRecord *>(Sym.content().data()));
S.OpeningRecord->PtrParent = Stack.empty() ? 0 : Stack.back().ScopeOffset;
Stack.push_back(S);
}
static void scopeStackClose(SmallVectorImpl<SymbolScope> &Stack,
uint32_t CurOffset, ObjectFile *File) {
if (Stack.empty()) {
warn("symbol scopes are not balanced in " + File->getName());
return;
}
SymbolScope S = Stack.pop_back_val();
S.OpeningRecord->PtrEnd = CurOffset;
}
static void mergeSymbolRecords(BumpPtrAllocator &Alloc, ObjectFile *File, static void mergeSymbolRecords(BumpPtrAllocator &Alloc, ObjectFile *File,
ArrayRef<TypeIndex> TypeIndexMap, ArrayRef<TypeIndex> TypeIndexMap,
BinaryStreamRef SymData) { BinaryStreamRef SymData) {
// FIXME: Improve error recovery by warning and skipping records when // FIXME: Improve error recovery by warning and skipping records when
// possible. // possible.
CVSymbolArray Syms; CVSymbolArray Syms;
BinaryStreamReader Reader(SymData); BinaryStreamReader Reader(SymData);
ExitOnErr(Reader.readArray(Syms, Reader.getLength())); ExitOnErr(Reader.readArray(Syms, Reader.getLength()));
SmallVector<SymbolScope, 4> Scopes;
for (const CVSymbol &Sym : Syms) { for (const CVSymbol &Sym : Syms) {
// Discover type index references in the record. Skip it if we don't know // Discover type index references in the record. Skip it if we don't know
// where they are. // where they are.
SmallVector<TiReference, 32> TypeRefs; SmallVector<TiReference, 32> TypeRefs;
if (!discoverTypeIndices(Sym, TypeRefs)) { if (!discoverTypeIndices(Sym, TypeRefs)) {
log("ignoring unknown symbol record with kind 0x" + utohexstr(Sym.kind())); log("ignoring unknown symbol record with kind 0x" + utohexstr(Sym.kind()));
continue; continue;
} }
// Copy the symbol record so we can mutate it. // Copy the symbol record so we can mutate it.
MutableArrayRef<uint8_t> NewData = copySymbolForPdb(Sym, Alloc); MutableArrayRef<uint8_t> NewData = copySymbolForPdb(Sym, Alloc);
// Re-map all the type index references. // Re-map all the type index references.
MutableArrayRef<uint8_t> Contents = MutableArrayRef<uint8_t> Contents =
NewData.drop_front(sizeof(RecordPrefix)); NewData.drop_front(sizeof(RecordPrefix));
if (!remapTypesInSymbolRecord(File, Contents, TypeIndexMap, TypeRefs)) if (!remapTypesInSymbolRecord(File, Contents, TypeIndexMap, TypeRefs))
continue; continue;
// FIXME: Fill in "Parent" and "End" fields by maintaining a stack of // Fill in "Parent" and "End" fields by maintaining a stack of scopes.
// scopes. CVSymbol NewSym(Sym.kind(), NewData);
if (symbolOpensScope(Sym.kind()))
scopeStackOpen(Scopes, File->ModuleDBI->getNextSymbolOffset(), NewSym);
else if (symbolEndsScope(Sym.kind()))
zturnerUnsubmitted
Not Done
ReplyInline Actions

Should we do something if Scopes.empty()? Warn, assert, ignore, drop the record?

zturner: Should we do something if `Scopes.empty()`? Warn, assert, ignore, drop the record?
rnkAuthorUnsubmitted
Not Done
ReplyInline Actions

Warn, I guess.

rnk: Warn, I guess.
scopeStackClose(Scopes, File->ModuleDBI->getNextSymbolOffset(), File);
// Add the symbol to the module. // Add the symbol to the module.
File->ModuleDBI->addSymbol(CVSymbol(Sym.kind(), NewData)); File->ModuleDBI->addSymbol(NewSym);
} }
} }
// Allocate memory for a .debug$S section and relocate it. // Allocate memory for a .debug$S section and relocate it.
static ArrayRef<uint8_t> relocateDebugChunk(BumpPtrAllocator &Alloc, static ArrayRef<uint8_t> relocateDebugChunk(BumpPtrAllocator &Alloc,
SectionChunk *DebugChunk) { SectionChunk *DebugChunk) {
uint8_t *Buffer = Alloc.Allocate<uint8_t>(DebugChunk->getSize()); uint8_t *Buffer = Alloc.Allocate<uint8_t>(DebugChunk->getSize());
assert(DebugChunk->OutputSectionOff == 0 && assert(DebugChunk->OutputSectionOff == 0 &&
▲ Show 20 Lines • Show All 163 Lines • Show Last 20 Lines

lld/test/COFF/Inputs/pdb-scopes-a.yaml

  • This file was added.
--- !COFF
header:
Machine: IMAGE_FILE_MACHINE_AMD64
Characteristics: [ ]
sections:
- Name: .drectve
Characteristics: [ IMAGE_SCN_LNK_INFO, IMAGE_SCN_LNK_REMOVE ]
Alignment: 1
SectionData: 2020202F44454641554C544C49423A224C4942434D5422202F44454641554C544C49423A224F4C444E414D45532220
- Name: '.debug$S'
Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_DISCARDABLE, IMAGE_SCN_MEM_READ ]
Alignment: 1
Subsections:
- !Symbols
Records:
- Kind: S_OBJNAME
ObjNameSym:
Signature: 0
ObjectName: 'C:\src\llvm-project\build\a.obj'
- Kind: S_COMPILE3
Compile3Sym:
Flags: [ SecurityChecks, HotPatch ]
Machine: X64
FrontendMajor: 19
FrontendMinor: 0
FrontendBuild: 24215
FrontendQFE: 1
BackendMajor: 19
BackendMinor: 0
BackendBuild: 24215
BackendQFE: 1
Version: 'Microsoft (R) Optimizing Compiler'
- !Symbols
Records:
- Kind: S_GPROC32_ID
ProcSym:
CodeSize: 5
DbgStart: 4
DbgEnd: 4
FunctionType: 4099
Flags: [ ]
DisplayName: g
- Kind: S_FRAMEPROC
FrameProcSym:
TotalFrameBytes: 0
PaddingFrameBytes: 0
OffsetToPadding: 0
BytesOfCalleeSavedRegisters: 0
OffsetOfExceptionHandler: 0
SectionIdOfExceptionHandler: 0
Flags: [ AsynchronousExceptionHandling, OptimizedForSpeed ]
- Kind: S_REGREL32
RegRelativeSym:
Offset: 8
Type: 116
Register: RSP
VarName: x
- Kind: S_PROC_ID_END
ScopeEndSym:
- !Lines
CodeSize: 5
Flags: [ ]
RelocOffset: 0
RelocSegment: 0
Blocks:
- FileName: 'c:\src\llvm-project\build\a.c'
Lines:
- Offset: 0
LineStart: 1
IsStatement: true
EndDelta: 0
Columns:
- !Symbols
Records:
- Kind: S_GPROC32_ID
ProcSym:
CodeSize: 58
DbgStart: 8
DbgEnd: 53
FunctionType: 4101
Flags: [ ]
DisplayName: main
- Kind: S_FRAMEPROC
FrameProcSym:
TotalFrameBytes: 56
PaddingFrameBytes: 0
OffsetToPadding: 0
BytesOfCalleeSavedRegisters: 0
OffsetOfExceptionHandler: 0
SectionIdOfExceptionHandler: 0
Flags: [ AsynchronousExceptionHandling, OptimizedForSpeed ]
- Kind: S_REGREL32
RegRelativeSym:
Offset: 64
Type: 116
Register: RSP
VarName: argc
- Kind: S_BLOCK32
BlockSym:
CodeSize: 17
Offset: 15
BlockName: ''
- Kind: S_REGREL32
RegRelativeSym:
Offset: 32
Type: 116
Register: RSP
VarName: x
- Kind: S_END
ScopeEndSym:
- Kind: S_BLOCK32
BlockSym:
CodeSize: 17
Offset: 34
BlockName: ''
- Kind: S_REGREL32
RegRelativeSym:
Offset: 36
Type: 116
Register: RSP
VarName: y
- Kind: S_END
ScopeEndSym:
- Kind: S_PROC_ID_END
ScopeEndSym:
- !Lines
CodeSize: 58
Flags: [ ]
RelocOffset: 0
RelocSegment: 0
Blocks:
- FileName: 'c:\src\llvm-project\build\a.c'
Lines:
- Offset: 0
LineStart: 3
IsStatement: true
EndDelta: 0
- Offset: 8
LineStart: 4
IsStatement: true
EndDelta: 0
- Offset: 15
LineStart: 5
IsStatement: true
EndDelta: 0
- Offset: 23
LineStart: 6
IsStatement: true
EndDelta: 0
- Offset: 32
LineStart: 7
IsStatement: true
EndDelta: 0
- Offset: 34
LineStart: 8
IsStatement: true
EndDelta: 0
- Offset: 42
LineStart: 9
IsStatement: true
EndDelta: 0
- Offset: 51
LineStart: 11
IsStatement: true
EndDelta: 0
Columns:
- !FileChecksums
Checksums:
- FileName: 'c:\src\llvm-project\build\a.c'
Kind: MD5
Checksum: 7FA72225C3F5630316383BD8BCC3EF72
- !StringTable
Strings:
- 'c:\src\llvm-project\build\a.c'
- !Symbols
Records:
- Kind: S_BUILDINFO
BuildInfoSym:
BuildId: 4110
Relocations:
- VirtualAddress: 152
SymbolName: g
Type: IMAGE_REL_AMD64_SECREL
- VirtualAddress: 156
SymbolName: g
Type: IMAGE_REL_AMD64_SECTION
- VirtualAddress: 220
SymbolName: g
Type: IMAGE_REL_AMD64_SECREL
- VirtualAddress: 224
SymbolName: g
Type: IMAGE_REL_AMD64_SECTION
- VirtualAddress: 292
SymbolName: main
Type: IMAGE_REL_AMD64_SECREL
- VirtualAddress: 296
SymbolName: main
Type: IMAGE_REL_AMD64_SECTION
- VirtualAddress: 369
SymbolName: main
Type: IMAGE_REL_AMD64_SECREL
- VirtualAddress: 373
SymbolName: main
Type: IMAGE_REL_AMD64_SECTION
- VirtualAddress: 412
SymbolName: main
Type: IMAGE_REL_AMD64_SECREL
- VirtualAddress: 416
SymbolName: main
Type: IMAGE_REL_AMD64_SECTION
- VirtualAddress: 452
SymbolName: main
Type: IMAGE_REL_AMD64_SECREL
- VirtualAddress: 456
SymbolName: main
Type: IMAGE_REL_AMD64_SECTION
- Name: '.debug$T'
Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_DISCARDABLE, IMAGE_SCN_MEM_READ ]
Alignment: 1
Types:
- Kind: LF_ARGLIST
ArgList:
ArgIndices: [ 116 ]
- Kind: LF_PROCEDURE
Procedure:
ReturnType: 3
CallConv: NearC
Options: [ None ]
ParameterCount: 1
ArgumentList: 4096
- Kind: LF_POINTER
Pointer:
ReferentType: 4097
Attrs: 65548
- Kind: LF_FUNC_ID
FuncId:
ParentScope: 0
FunctionType: 4097
Name: g
- Kind: LF_PROCEDURE
Procedure:
ReturnType: 116
CallConv: NearC
Options: [ None ]
ParameterCount: 1
ArgumentList: 4096
- Kind: LF_FUNC_ID
FuncId:
ParentScope: 0
FunctionType: 4100
Name: main
- Kind: LF_FUNC_ID
FuncId:
ParentScope: 0
FunctionType: 4097
Name: f
- Kind: LF_STRING_ID
StringId:
Id: 0
String: 'C:\src\llvm-project\build'
- Kind: LF_STRING_ID
StringId:
Id: 0
String: 'C:\PROGRA~2\MICROS~1.0\VC\Bin\amd64\cl.exe'
- Kind: LF_STRING_ID
StringId:
Id: 0
String: '-c -Z7 -MT -IC:\PROGRA~2\MICROS~1.0\VC\include -IC:\PROGRA~2\MICROS~1.0\VC\atlmfc\include -IC:\PROGRA~2\WI3CF2~1\10\include\10.0.14393.0\ucrt -IC:\PROGRA~2\WI3CF2~1\10\include\10.0.14393.0\shared -IC:\PROGRA~2\WI3CF2~1\10\include\10.0.14393.0\um'
- Kind: LF_SUBSTR_LIST
StringList:
StringIndices: [ 4105 ]
- Kind: LF_STRING_ID
StringId:
Id: 4106
String: ' -IC:\PROGRA~2\WI3CF2~1\10\include\10.0.14393.0\winrt -TC -X'
- Kind: LF_STRING_ID
StringId:
Id: 0
String: a.c
- Kind: LF_STRING_ID
StringId:
Id: 0
String: 'C:\src\llvm-project\build\vc140.pdb'
- Kind: LF_BUILDINFO
BuildInfo:
ArgIndices: [ 4103, 4104, 4108, 4109, 4107 ]
- Name: '.text$mn'
Characteristics: [ IMAGE_SCN_CNT_CODE, IMAGE_SCN_MEM_EXECUTE, IMAGE_SCN_MEM_READ ]
Alignment: 16
SectionData: 894C2408C3CCCCCCCCCCCCCCCCCCCCCC894C24084883EC38837C2440007413C74424202A0000008B4C2420E800000000EB11C74424240D0000008B4C2424E80000000033C04883C438C3
Relocations:
- VirtualAddress: 44
SymbolName: f
Type: IMAGE_REL_AMD64_REL32
- VirtualAddress: 63
SymbolName: f
Type: IMAGE_REL_AMD64_REL32
- Name: .xdata
Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_READ ]
Alignment: 4
SectionData: '0108010008620000'
- Name: .pdata
Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_READ ]
Alignment: 4
SectionData: 000000003A00000000000000
Relocations:
- VirtualAddress: 0
SymbolName: '$LN5'
Type: IMAGE_REL_AMD64_ADDR32NB
- VirtualAddress: 4
SymbolName: '$LN5'
Type: IMAGE_REL_AMD64_ADDR32NB
- VirtualAddress: 8
SymbolName: '$unwind$main'
Type: IMAGE_REL_AMD64_ADDR32NB
symbols:
- Name: .drectve
Value: 0
SectionNumber: 1
SimpleType: IMAGE_SYM_TYPE_NULL
ComplexType: IMAGE_SYM_DTYPE_NULL
StorageClass: IMAGE_SYM_CLASS_STATIC
SectionDefinition:
Length: 47
NumberOfRelocations: 0
NumberOfLinenumbers: 0
CheckSum: 0
Number: 0
- Name: '.debug$S'
Value: 0
SectionNumber: 2
SimpleType: IMAGE_SYM_TYPE_NULL
ComplexType: IMAGE_SYM_DTYPE_NULL
StorageClass: IMAGE_SYM_CLASS_STATIC
SectionDefinition:
Length: 628
NumberOfRelocations: 12
NumberOfLinenumbers: 0
CheckSum: 0
Number: 0
- Name: '.debug$T'
Value: 0
SectionNumber: 3
SimpleType: IMAGE_SYM_TYPE_NULL
ComplexType: IMAGE_SYM_DTYPE_NULL
StorageClass: IMAGE_SYM_CLASS_STATIC
SectionDefinition:
Length: 624
NumberOfRelocations: 0
NumberOfLinenumbers: 0
CheckSum: 0
Number: 0
- Name: '.text$mn'
Value: 0
SectionNumber: 4
SimpleType: IMAGE_SYM_TYPE_NULL
ComplexType: IMAGE_SYM_DTYPE_NULL
StorageClass: IMAGE_SYM_CLASS_STATIC
SectionDefinition:
Length: 74
NumberOfRelocations: 2
NumberOfLinenumbers: 0
CheckSum: 2120072435
Number: 0
- Name: g
Value: 0
SectionNumber: 4
SimpleType: IMAGE_SYM_TYPE_NULL
ComplexType: IMAGE_SYM_DTYPE_FUNCTION
StorageClass: IMAGE_SYM_CLASS_EXTERNAL
- Name: f
Value: 0
SectionNumber: 0
SimpleType: IMAGE_SYM_TYPE_NULL
ComplexType: IMAGE_SYM_DTYPE_FUNCTION
StorageClass: IMAGE_SYM_CLASS_EXTERNAL
- Name: main
Value: 16
SectionNumber: 4
SimpleType: IMAGE_SYM_TYPE_NULL
ComplexType: IMAGE_SYM_DTYPE_FUNCTION
StorageClass: IMAGE_SYM_CLASS_EXTERNAL
- Name: '$LN5'
Value: 16
SectionNumber: 4
SimpleType: IMAGE_SYM_TYPE_NULL
ComplexType: IMAGE_SYM_DTYPE_NULL
StorageClass: IMAGE_SYM_CLASS_LABEL
- Name: .xdata
Value: 0
SectionNumber: 5
SimpleType: IMAGE_SYM_TYPE_NULL
ComplexType: IMAGE_SYM_DTYPE_NULL
StorageClass: IMAGE_SYM_CLASS_STATIC
SectionDefinition:
Length: 8
NumberOfRelocations: 0
NumberOfLinenumbers: 0
CheckSum: 3137252093
Number: 0
- Name: '$unwind$main'
Value: 0
SectionNumber: 5
SimpleType: IMAGE_SYM_TYPE_NULL
ComplexType: IMAGE_SYM_DTYPE_NULL
StorageClass: IMAGE_SYM_CLASS_STATIC
- Name: .pdata
Value: 0
SectionNumber: 6
SimpleType: IMAGE_SYM_TYPE_NULL
ComplexType: IMAGE_SYM_DTYPE_NULL
StorageClass: IMAGE_SYM_CLASS_STATIC
SectionDefinition:
Length: 12
NumberOfRelocations: 3
NumberOfLinenumbers: 0
CheckSum: 336416693
Number: 0
- Name: '$pdata$main'
Value: 0
SectionNumber: 6
SimpleType: IMAGE_SYM_TYPE_NULL
ComplexType: IMAGE_SYM_DTYPE_NULL
StorageClass: IMAGE_SYM_CLASS_STATIC
...

lld/test/COFF/Inputs/pdb-scopes-b.yaml

  • This file was added.
--- !COFF
header:
Machine: IMAGE_FILE_MACHINE_AMD64
Characteristics: [ ]
sections:
- Name: .drectve
Characteristics: [ IMAGE_SCN_LNK_INFO, IMAGE_SCN_LNK_REMOVE ]
Alignment: 1
SectionData: 2020202F44454641554C544C49423A224C4942434D5422202F44454641554C544C49423A224F4C444E414D45532220
- Name: '.debug$S'
Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_DISCARDABLE, IMAGE_SCN_MEM_READ ]
Alignment: 1
Subsections:
- !Symbols
Records:
- Kind: S_OBJNAME
ObjNameSym:
Signature: 0
ObjectName: 'C:\src\llvm-project\build\b.obj'
- Kind: S_COMPILE3
Compile3Sym:
Flags: [ SecurityChecks, HotPatch ]
Machine: X64
FrontendMajor: 19
FrontendMinor: 0
FrontendBuild: 24215
FrontendQFE: 1
BackendMajor: 19
BackendMinor: 0
BackendBuild: 24215
BackendQFE: 1
Version: 'Microsoft (R) Optimizing Compiler'
- !Symbols
Records:
- Kind: S_GPROC32_ID
ProcSym:
CodeSize: 62
DbgStart: 8
DbgEnd: 57
FunctionType: 4101
Flags: [ ]
DisplayName: f
- Kind: S_FRAMEPROC
FrameProcSym:
TotalFrameBytes: 56
PaddingFrameBytes: 0
OffsetToPadding: 0
BytesOfCalleeSavedRegisters: 0
OffsetOfExceptionHandler: 0
SectionIdOfExceptionHandler: 0
Flags: [ AsynchronousExceptionHandling, OptimizedForSpeed ]
- Kind: S_REGREL32
RegRelativeSym:
Offset: 64
Type: 116
Register: RSP
VarName: x
- Kind: S_BLOCK32
BlockSym:
CodeSize: 20
Offset: 15
BlockName: ''
- Kind: S_REGREL32
RegRelativeSym:
Offset: 32
Type: 116
Register: RSP
VarName: y
- Kind: S_END
ScopeEndSym:
- Kind: S_BLOCK32
BlockSym:
CodeSize: 20
Offset: 37
BlockName: ''
- Kind: S_REGREL32
RegRelativeSym:
Offset: 36
Type: 116
Register: RSP
VarName: w
- Kind: S_END
ScopeEndSym:
- Kind: S_PROC_ID_END
ScopeEndSym:
- !Lines
CodeSize: 62
Flags: [ ]
RelocOffset: 0
RelocSegment: 0
Blocks:
- FileName: 'c:\src\llvm-project\build\b.c'
Lines:
- Offset: 0
LineStart: 2
IsStatement: true
EndDelta: 0
- Offset: 8
LineStart: 3
IsStatement: true
EndDelta: 0
- Offset: 15
LineStart: 4
IsStatement: true
EndDelta: 0
- Offset: 26
LineStart: 5
IsStatement: true
EndDelta: 0
- Offset: 35
LineStart: 6
IsStatement: true
EndDelta: 0
- Offset: 37
LineStart: 7
IsStatement: true
EndDelta: 0
- Offset: 48
LineStart: 8
IsStatement: true
EndDelta: 0
- Offset: 57
LineStart: 10
IsStatement: true
EndDelta: 0
Columns:
- !FileChecksums
Checksums:
- FileName: 'c:\src\llvm-project\build\b.c'
Kind: MD5
Checksum: 8E8C92DB46478902EBEAEBFCFF15A6E0
- !StringTable
Strings:
- 'c:\src\llvm-project\build\b.c'
- !Symbols
Records:
- Kind: S_BUILDINFO
BuildInfoSym:
BuildId: 4110
Relocations:
- VirtualAddress: 152
SymbolName: f
Type: IMAGE_REL_AMD64_SECREL
- VirtualAddress: 156
SymbolName: f
Type: IMAGE_REL_AMD64_SECTION
- VirtualAddress: 223
SymbolName: f
Type: IMAGE_REL_AMD64_SECREL
- VirtualAddress: 227
SymbolName: f
Type: IMAGE_REL_AMD64_SECTION
- VirtualAddress: 266
SymbolName: f
Type: IMAGE_REL_AMD64_SECREL
- VirtualAddress: 270
SymbolName: f
Type: IMAGE_REL_AMD64_SECTION
- VirtualAddress: 308
SymbolName: f
Type: IMAGE_REL_AMD64_SECREL
- VirtualAddress: 312
SymbolName: f
Type: IMAGE_REL_AMD64_SECTION
- Name: '.debug$T'
Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_DISCARDABLE, IMAGE_SCN_MEM_READ ]
Alignment: 1
Types:
- Kind: LF_ARGLIST
ArgList:
ArgIndices: [ 0 ]
- Kind: LF_PROCEDURE
Procedure:
ReturnType: 3
CallConv: NearC
Options: [ None ]
ParameterCount: 0
ArgumentList: 4096
- Kind: LF_POINTER
Pointer:
ReferentType: 4097
Attrs: 65548
- Kind: LF_ARGLIST
ArgList:
ArgIndices: [ 116 ]
- Kind: LF_PROCEDURE
Procedure:
ReturnType: 3
CallConv: NearC
Options: [ None ]
ParameterCount: 1
ArgumentList: 4099
- Kind: LF_FUNC_ID
FuncId:
ParentScope: 0
FunctionType: 4100
Name: f
- Kind: LF_FUNC_ID
FuncId:
ParentScope: 0
FunctionType: 4097
Name: g
- Kind: LF_STRING_ID
StringId:
Id: 0
String: 'C:\src\llvm-project\build'
- Kind: LF_STRING_ID
StringId:
Id: 0
String: 'C:\PROGRA~2\MICROS~1.0\VC\Bin\amd64\cl.exe'
- Kind: LF_STRING_ID
StringId:
Id: 0
String: '-c -Z7 -MT -IC:\PROGRA~2\MICROS~1.0\VC\include -IC:\PROGRA~2\MICROS~1.0\VC\atlmfc\include -IC:\PROGRA~2\WI3CF2~1\10\include\10.0.14393.0\ucrt -IC:\PROGRA~2\WI3CF2~1\10\include\10.0.14393.0\shared -IC:\PROGRA~2\WI3CF2~1\10\include\10.0.14393.0\um'
- Kind: LF_SUBSTR_LIST
StringList:
StringIndices: [ 4105 ]
- Kind: LF_STRING_ID
StringId:
Id: 4106
String: ' -IC:\PROGRA~2\WI3CF2~1\10\include\10.0.14393.0\winrt -TC -X'
- Kind: LF_STRING_ID
StringId:
Id: 0
String: b.c
- Kind: LF_STRING_ID
StringId:
Id: 0
String: 'C:\src\llvm-project\build\vc140.pdb'
- Kind: LF_BUILDINFO
BuildInfo:
ArgIndices: [ 4103, 4104, 4108, 4109, 4107 ]
- Name: '.text$mn'
Characteristics: [ IMAGE_SCN_CNT_CODE, IMAGE_SCN_MEM_EXECUTE, IMAGE_SCN_MEM_READ ]
Alignment: 16
SectionData: 894C24084883EC38837C24400074168B44244083C003894424208B4C2420E800000000EB148B44244083C004894424248B4C2424E8000000004883C438C3
Relocations:
- VirtualAddress: 31
SymbolName: g
Type: IMAGE_REL_AMD64_REL32
- VirtualAddress: 53
SymbolName: g
Type: IMAGE_REL_AMD64_REL32
- Name: .xdata
Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_READ ]
Alignment: 4
SectionData: '0108010008620000'
- Name: .pdata
Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_READ ]
Alignment: 4
SectionData: '000000003E00000000000000'
Relocations:
- VirtualAddress: 0
SymbolName: '$LN5'
Type: IMAGE_REL_AMD64_ADDR32NB
- VirtualAddress: 4
SymbolName: '$LN5'
Type: IMAGE_REL_AMD64_ADDR32NB
- VirtualAddress: 8
SymbolName: '$unwind$f'
Type: IMAGE_REL_AMD64_ADDR32NB
symbols:
- Name: .drectve
Value: 0
SectionNumber: 1
SimpleType: IMAGE_SYM_TYPE_NULL
ComplexType: IMAGE_SYM_DTYPE_NULL
StorageClass: IMAGE_SYM_CLASS_STATIC
SectionDefinition:
Length: 47
NumberOfRelocations: 0
NumberOfLinenumbers: 0
CheckSum: 0
Number: 0
- Name: '.debug$S'
Value: 0
SectionNumber: 2
SimpleType: IMAGE_SYM_TYPE_NULL
ComplexType: IMAGE_SYM_DTYPE_NULL
StorageClass: IMAGE_SYM_CLASS_STATIC
SectionDefinition:
Length: 484
NumberOfRelocations: 8
NumberOfLinenumbers: 0
CheckSum: 0
Number: 0
- Name: '.debug$T'
Value: 0
SectionNumber: 3
SimpleType: IMAGE_SYM_TYPE_NULL
ComplexType: IMAGE_SYM_DTYPE_NULL
StorageClass: IMAGE_SYM_CLASS_STATIC
SectionDefinition:
Length: 616
NumberOfRelocations: 0
NumberOfLinenumbers: 0
CheckSum: 0
Number: 0
- Name: '.text$mn'
Value: 0
SectionNumber: 4
SimpleType: IMAGE_SYM_TYPE_NULL
ComplexType: IMAGE_SYM_DTYPE_NULL
StorageClass: IMAGE_SYM_CLASS_STATIC
SectionDefinition:
Length: 62
NumberOfRelocations: 2
NumberOfLinenumbers: 0
CheckSum: 3841032836
Number: 0
- Name: g
Value: 0
SectionNumber: 0
SimpleType: IMAGE_SYM_TYPE_NULL
ComplexType: IMAGE_SYM_DTYPE_FUNCTION
StorageClass: IMAGE_SYM_CLASS_EXTERNAL
- Name: f
Value: 0
SectionNumber: 4
SimpleType: IMAGE_SYM_TYPE_NULL
ComplexType: IMAGE_SYM_DTYPE_FUNCTION
StorageClass: IMAGE_SYM_CLASS_EXTERNAL
- Name: '$LN5'
Value: 0
SectionNumber: 4
SimpleType: IMAGE_SYM_TYPE_NULL
ComplexType: IMAGE_SYM_DTYPE_NULL
StorageClass: IMAGE_SYM_CLASS_LABEL
- Name: .xdata
Value: 0
SectionNumber: 5
SimpleType: IMAGE_SYM_TYPE_NULL
ComplexType: IMAGE_SYM_DTYPE_NULL
StorageClass: IMAGE_SYM_CLASS_STATIC
SectionDefinition:
Length: 8
NumberOfRelocations: 0
NumberOfLinenumbers: 0
CheckSum: 3137252093
Number: 0
- Name: '$unwind$f'
Value: 0
SectionNumber: 5
SimpleType: IMAGE_SYM_TYPE_NULL
ComplexType: IMAGE_SYM_DTYPE_NULL
StorageClass: IMAGE_SYM_CLASS_STATIC
- Name: .pdata
Value: 0
SectionNumber: 6
SimpleType: IMAGE_SYM_TYPE_NULL
ComplexType: IMAGE_SYM_DTYPE_NULL
StorageClass: IMAGE_SYM_CLASS_STATIC
SectionDefinition:
Length: 12
NumberOfRelocations: 3
NumberOfLinenumbers: 0
CheckSum: 2420588879
Number: 0
- Name: '$pdata$f'
Value: 0
SectionNumber: 6
SimpleType: IMAGE_SYM_TYPE_NULL
ComplexType: IMAGE_SYM_DTYPE_NULL
StorageClass: IMAGE_SYM_CLASS_STATIC
...

lld/test/COFF/pdb-comdat.test

Show First 20 Lines • Show All 41 Lines • ▼ Show 20 Lines
CHECK: ============================================================ CHECK: ============================================================
CHECK-LABEL: Mod 0000 | `{{.*}}pdb_comdat_main.obj`: CHECK-LABEL: Mod 0000 | `{{.*}}pdb_comdat_main.obj`:
CHECK: 4 | S_OBJNAME [size = 56] sig=0, `C:\src\llvm-project\build\pdb_comdat_main.obj` CHECK: 4 | S_OBJNAME [size = 56] sig=0, `C:\src\llvm-project\build\pdb_comdat_main.obj`
CHECK: 60 | S_COMPILE3 [size = 60] CHECK: 60 | S_COMPILE3 [size = 60]
CHECK: machine = intel x86-x64, Ver = Microsoft (R) Optimizing Compiler, language = c CHECK: machine = intel x86-x64, Ver = Microsoft (R) Optimizing Compiler, language = c
CHECK: frontend = 19.0.24215.1, backend = 19.0.24215.1 CHECK: frontend = 19.0.24215.1, backend = 19.0.24215.1
CHECK: flags = security checks | hot patchable CHECK: flags = security checks | hot patchable
CHECK: 120 | S_GPROC32_ID [size = 44] `main` CHECK: 120 | S_GPROC32_ID [size = 44] `main`
CHECK: parent = 0, end = 0, addr = 0002:0000, code size = 24 CHECK: parent = 0, end = 196, addr = 0002:0000, code size = 24
CHECK: debug start = 4, debug end = 19, flags = none CHECK: debug start = 4, debug end = 19, flags = none
CHECK: 164 | S_FRAMEPROC [size = 32] CHECK: 164 | S_FRAMEPROC [size = 32]
CHECK: size = 40, padding size = 0, offset to padding = 0 CHECK: size = 40, padding size = 0, offset to padding = 0
CHECK: bytes of callee saved registers = 0, exception handler addr = 0000:0000 CHECK: bytes of callee saved registers = 0, exception handler addr = 0000:0000
CHECK: flags = has async eh | opt speed CHECK: flags = has async eh | opt speed
CHECK: 196 | S_END [size = 4] CHECK: 196 | S_END [size = 4]
CHECK: 200 | S_GDATA32 [size = 24] `global` CHECK: 200 | S_GDATA32 [size = 24] `global`
CHECK: type = 0x0074 (int), addr = 0000:0000 CHECK: type = 0x0074 (int), addr = 0000:0000
CHECK: 224 | S_BUILDINFO [size = 8] BuildId = `4106` CHECK: 224 | S_BUILDINFO [size = 8] BuildId = `4106`
CHECK: 232 | S_GPROC32_ID [size = 44] `foo` CHECK: 232 | S_GPROC32_ID [size = 44] `foo`
CHECK: parent = 0, end = 0, addr = 0002:0032, code size = 15 CHECK: parent = 0, end = 308, addr = 0002:0032, code size = 15
CHECK: debug start = 0, debug end = 14, flags = none CHECK: debug start = 0, debug end = 14, flags = none
CHECK: 276 | S_FRAMEPROC [size = 32] CHECK: 276 | S_FRAMEPROC [size = 32]
CHECK: size = 0, padding size = 0, offset to padding = 0 CHECK: size = 0, padding size = 0, offset to padding = 0
CHECK: bytes of callee saved registers = 0, exception handler addr = 0000:0000 CHECK: bytes of callee saved registers = 0, exception handler addr = 0000:0000
CHECK: flags = marked inline | has async eh | opt speed CHECK: flags = marked inline | has async eh | opt speed
CHECK: 308 | S_END [size = 4] CHECK: 308 | S_END [size = 4]
CHECK-LABEL: Mod 0001 | `{{.*}}pdb_comdat_bar.obj`: CHECK-LABEL: Mod 0001 | `{{.*}}pdb_comdat_bar.obj`:
CHECK: 4 | S_OBJNAME [size = 56] sig=0, `C:\src\llvm-project\build\pdb_comdat_bar.obj` CHECK: 4 | S_OBJNAME [size = 56] sig=0, `C:\src\llvm-project\build\pdb_comdat_bar.obj`
CHECK: 60 | S_COMPILE3 [size = 60] CHECK: 60 | S_COMPILE3 [size = 60]
CHECK: machine = intel x86-x64, Ver = Microsoft (R) Optimizing Compiler, language = c CHECK: machine = intel x86-x64, Ver = Microsoft (R) Optimizing Compiler, language = c
CHECK: frontend = 19.0.24215.1, backend = 19.0.24215.1 CHECK: frontend = 19.0.24215.1, backend = 19.0.24215.1
CHECK: flags = security checks | hot patchable CHECK: flags = security checks | hot patchable
CHECK: 120 | S_GPROC32_ID [size = 44] `bar` CHECK: 120 | S_GPROC32_ID [size = 44] `bar`
CHECK: parent = 0, end = 0, addr = 0002:0048, code size = 14 CHECK: parent = 0, end = 196, addr = 0002:0048, code size = 14
CHECK: debug start = 4, debug end = 9, flags = none CHECK: debug start = 4, debug end = 9, flags = none
CHECK: 164 | S_FRAMEPROC [size = 32] CHECK: 164 | S_FRAMEPROC [size = 32]
CHECK: size = 40, padding size = 0, offset to padding = 0 CHECK: size = 40, padding size = 0, offset to padding = 0
CHECK: bytes of callee saved registers = 0, exception handler addr = 0000:0000 CHECK: bytes of callee saved registers = 0, exception handler addr = 0000:0000
CHECK: flags = has async eh | opt speed CHECK: flags = has async eh | opt speed
CHECK: 196 | S_END [size = 4] CHECK: 196 | S_END [size = 4]
CHECK: 200 | S_GDATA32 [size = 24] `global` CHECK: 200 | S_GDATA32 [size = 24] `global`
CHECK: type = 0x0074 (int), addr = 0000:0000 CHECK: type = 0x0074 (int), addr = 0000:0000
Show All 16 Lines

lld/test/COFF/pdb-scopes.test

  • This file was added.
Consider this program:
$ cat a.c
void g(int x) {}
void f(int x);
int main(int argc) {
if (argc) {
int x = 42;
f(x);
} else {
int y = 13;
f(y);
}
}
$ cat b.c
extern void g();
void f(int x) {
if (x) {
int y = x + 3;
g(y);
} else {
int w = x + 4;
g(w);
}
}
This program is interesting because there are two TUs, and each TU has nested
scopes. Make sure we get the right parent and end offsets.
RUN: yaml2obj %S/Inputs/pdb-scopes-a.yaml -o %t-a.obj
RUN: yaml2obj %S/Inputs/pdb-scopes-b.yaml -o %t-b.obj
RUN: lld-link %t-a.obj %t-b.obj -debug -entry:main -nodefaultlib -out:%t.exe -pdb:%t.pdb
RUN: llvm-pdbutil dump -symbols %t.pdb | FileCheck %s
CHECK-LABEL: Mod 0000 | `C:\src\llvm-project\build\tools\lld\test\COFF\Output\pdb-scopes.test.tmp-a.obj`:
CHECK: 104 | S_GPROC32_ID [size = 44] `g`
CHECK: parent = 0, end = 196, addr = 0002:0000, code size = 5
CHECK: debug start = 4, debug end = 4, flags = none
zturnerUnsubmitted
Done
ReplyInline Actions

Would it be helpful to format this (and similar) records so that parent = 0, end = 196 is at the beginning of the string, so that you can just match that and leave out the rest of the (relatively fragile) debug info which we're not trying to test?

zturner: Would it be helpful to format this (and similar) records so that `parent = 0, end = 196` is at…
CHECK: 180 | S_REGREL32 [size = 16] `x`
CHECK: 196 | S_END [size = 4]
CHECK: 200 | S_GPROC32_ID [size = 44] `main`
CHECK: parent = 0, end = 384, addr = 0002:0016, code size = 58
zturnerUnsubmitted
Not Done
ReplyInline Actions

Remove these from the test as they aren't relevant?

zturner: Remove these from the test as they aren't relevant?
rnkAuthorUnsubmitted
Not Done
ReplyInline Actions

I removed the guts of the S_REGREL32 records.

rnk: I removed the guts of the S_REGREL32 records.
CHECK: debug start = 8, debug end = 53, flags = none
zturnerUnsubmitted
Not Done
ReplyInline Actions

I wonder if we should display the offset of each symbol in the output. For types we write something like:

0x1017 | LF_CLASS [size = 60]
          class name: `MembersTest::A`
          unique name: `.?AVA@MembersTest@@`
          vtable: <no type>, base list: <no type>, field list: <no type>
          options: forward ref | has unique name

But we have no such analogue for symbols. The only way to uniquely identify a symbol is by its offset in the symbol stream, but since this is what the Parent and End fields do anyway, perhaps we could display it? This would also allow the test to be more robust, as you could say:

CHECK: -    0 | S_GPROC32_ID [size = 44] `g`
CHECK:            parent = 0, addr = 0002:0000, code size = 5, end = [[END:r[0-9]+]]
CHECK:            debug start = 4, debug end = 4, flags = none
CHECK: -  [[END]] | S_END [size = 4]

Right now we're verifying that we're writing some number for the field, but we're not verifying that it's the correct number

zturner: I wonder if we should display the offset of each symbol in the output. For types we write…
rnkAuthorUnsubmitted
Not Done
ReplyInline Actions

Now that you've extended the dumper, this is done.

rnk: Now that you've extended the dumper, this is done.
CHECK: 276 | S_REGREL32 [size = 20] `argc`
CHECK: 296 | S_BLOCK32 [size = 24] ``
CHECK: parent = 200, end = 336
CHECK: code size = 17, addr = 0002:0031
CHECK: 320 | S_REGREL32 [size = 16] `x`
CHECK: 336 | S_END [size = 4]
CHECK: 340 | S_BLOCK32 [size = 24] ``
CHECK: parent = 200, end = 380
CHECK: code size = 17, addr = 0002:0050
CHECK: 364 | S_REGREL32 [size = 16] `y`
CHECK: 380 | S_END [size = 4]
CHECK: 384 | S_END [size = 4]
CHECK-LABEL: Mod 0001 | `C:\src\llvm-project\build\tools\lld\test\COFF\Output\pdb-scopes.test.tmp-b.obj`:
CHECK: 104 | S_GPROC32_ID [size = 44] `f`
zturnerUnsubmitted
Not Done
ReplyInline Actions

This ties into what I was saying earlier, but it's not clear to me what this number 200 represents. It doesn't seem to be the offset of any symbol. (I did the math by hand, and the offsets are:

S_GPROC32     0
S_FRAMEPROC   44
S_REGREL32    76
S_END         92
S_GPROC32_ID  96
S_FRAMEPROC   140
S_REGREL32    172
S_BLOCK32     192
S_REGREL32    216
S_END         232
S_BLOCK32     240

Nothing has offset 200. So what is this number?

zturner: This ties into what I was saying earlier, but it's not clear to me what this number `200`…
rnkAuthorUnsubmitted
Not Done
ReplyInline Actions

It should be clear now that the enclosing S_GPROC32_ID has that offset. There are some TU-wide S_ records that I deleted because they weren't relevant.

rnk: It should be clear now that the enclosing S_GPROC32_ID has that offset. There are some TU-wide…
CHECK: parent = 0, end = 284, addr = 0002:0080, code size = 62
CHECK: debug start = 8, debug end = 57, flags = none
CHECK: 180 | S_REGREL32 [size = 16] `x`
CHECK: 196 | S_BLOCK32 [size = 24] ``
CHECK: parent = 104, end = 236
CHECK: code size = 20, addr = 0002:0095
CHECK: 220 | S_REGREL32 [size = 16] `y`
CHECK: 236 | S_END [size = 4]
CHECK: 240 | S_BLOCK32 [size = 24] ``
CHECK: parent = 104, end = 280
CHECK: code size = 20, addr = 0002:0117
CHECK: 264 | S_REGREL32 [size = 16] `w`
CHECK: 280 | S_END [size = 4]
CHECK: 284 | S_END [size = 4]
CHECK-LABEL: Mod 0002 | `* Linker *`:

lld/test/COFF/pdb-symbol-types.yaml

Show All 16 Lines
# CHECK: ============================================================ # CHECK: ============================================================
# CHECK-LABEL: Mod 0000 | `{{.*}}pdb-symbol-types.yaml.tmp.obj`: # CHECK-LABEL: Mod 0000 | `{{.*}}pdb-symbol-types.yaml.tmp.obj`:
# CHECK: 4 | S_OBJNAME [size = 52] sig=0, `C:\src\llvm-project\build\symbol-types.obj` # CHECK: 4 | S_OBJNAME [size = 52] sig=0, `C:\src\llvm-project\build\symbol-types.obj`
# CHECK: 56 | S_COMPILE3 [size = 60] # CHECK: 56 | S_COMPILE3 [size = 60]
# CHECK: machine = intel x86-x64, Ver = Microsoft (R) Optimizing Compiler, language = c # CHECK: machine = intel x86-x64, Ver = Microsoft (R) Optimizing Compiler, language = c
# CHECK: frontend = 19.0.24215.1, backend = 19.0.24215.1 # CHECK: frontend = 19.0.24215.1, backend = 19.0.24215.1
# CHECK: flags = security checks | hot patchable # CHECK: flags = security checks | hot patchable
# CHECK: 116 | S_GPROC32_ID [size = 44] `main` # CHECK: 116 | S_GPROC32_ID [size = 44] `main`
# CHECK: parent = 0, end = 0, addr = 0002:0000, code size = 7 # CHECK: parent = 0, end = 192, addr = 0002:0000, code size = 7
# CHECK: debug start = 0, debug end = 6, flags = none # CHECK: debug start = 0, debug end = 6, flags = none
# CHECK: 160 | S_FRAMEPROC [size = 32] # CHECK: 160 | S_FRAMEPROC [size = 32]
# CHECK: size = 0, padding size = 0, offset to padding = 0 # CHECK: size = 0, padding size = 0, offset to padding = 0
# CHECK: bytes of callee saved registers = 0, exception handler addr = 0000:0000 # CHECK: bytes of callee saved registers = 0, exception handler addr = 0000:0000
# CHECK: flags = has async eh | opt speed # CHECK: flags = has async eh | opt speed
# CHECK: 192 | S_END [size = 4] # CHECK: 192 | S_END [size = 4]
# CHECK: 196 | S_GDATA32 [size = 28] `global_foo` # CHECK: 196 | S_GDATA32 [size = 28] `global_foo`
# CHECK: type = 0x1004 (Foo), addr = 0001:0000 # CHECK: type = 0x1004 (Foo), addr = 0001:0000
▲ Show 20 Lines • Show All 311 Lines • Show Last 20 Lines

llvm/include/llvm/DebugInfo/PDB/Native/DbiModuleDescriptorBuilder.h

Show First 20 Lines • Show All 62 Lines • ▼ Show 20 Linespublic:
unsigned getModuleIndex() const { return Layout.Mod; } unsigned getModuleIndex() const { return Layout.Mod; }
ArrayRef<std::string> source_files() const { ArrayRef<std::string> source_files() const {
return makeArrayRef(SourceFiles); return makeArrayRef(SourceFiles);
} }
uint32_t calculateSerializedLength() const; uint32_t calculateSerializedLength() const;
/// Return the offset within the module symbol stream of the next symbol
/// record passed to addSymbol. Add four to account for the signature.
uint32_t getNextSymbolOffset() const { return SymbolByteSize + 4; }
void finalize(); void finalize();
Error finalizeMsfLayout(); Error finalizeMsfLayout();
Error commit(BinaryStreamWriter &ModiWriter, const msf::MSFLayout &MsfLayout, Error commit(BinaryStreamWriter &ModiWriter, const msf::MSFLayout &MsfLayout,
WritableBinaryStreamRef MsfBuffer); WritableBinaryStreamRef MsfBuffer);
private: private:
uint32_t calculateC13DebugInfoSize() const; uint32_t calculateC13DebugInfoSize() const;
Show All 21 Lines