Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions llvm/test/tools/llvm-pdbutil/Inputs/publics.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
---
PublicsStream:
Records:
- Kind: S_PUB32
PublicSym32:
Flags: [ Function ]
Offset: 480
Segment: 1
Name: '?AMethod@AClass@@QEAAXHPEAD@Z'
- Kind: S_PUB32
PublicSym32:
Flags: [ ]
Offset: 0
Segment: 2
Name: '??_7Base@@6B@'
- Kind: S_PUB32
PublicSym32:
Flags: [ Function ]
Offset: 0
Segment: 1
Name: '??0Base@@QEAA@XZ'
...
31 changes: 31 additions & 0 deletions llvm/test/tools/llvm-pdbutil/publics-yaml2pdb.test
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
; RUN: llvm-pdbutil yaml2pdb %p/Inputs/publics.yaml --pdb=%t.pdb
; RUN: llvm-pdbutil dump --publics %t.pdb | FileCheck --check-prefix=CHECK-YAML2PDB %s

; RUN: llvm-pdbutil pdb2yaml --publics-stream %t.pdb > %t.yaml
; RUN: FileCheck --input-file=%t.yaml --check-prefix=CHECK-PDB2YAML %s

CHECK-YAML2PDB: S_PUB32 [size = 44] `?AMethod@AClass@@QEAAXHPEAD@Z`
CHECK-YAML2PDB: flags = function, addr = 0001:0480
CHECK-YAML2PDB: S_PUB32 [size = 28] `??_7Base@@6B@`
CHECK-YAML2PDB: flags = none, addr = 0002:0000
CHECK-YAML2PDB: S_PUB32 [size = 32] `??0Base@@QEAA@XZ`
CHECK-YAML2PDB: flags = function, addr = 0001:0000

CHECK-PDB2YAML: - Kind: S_PUB32
CHECK-PDB2YAML: PublicSym32:
CHECK-PDB2YAML: Flags: [ Function ]
CHECK-PDB2YAML: Offset: 480
CHECK-PDB2YAML: Segment: 1
CHECK-PDB2YAML: Name: '?AMethod@AClass@@QEAAXHPEAD@Z'
CHECK-PDB2YAML: - Kind: S_PUB32
CHECK-PDB2YAML: PublicSym32:
CHECK-PDB2YAML: Flags: [ ]
CHECK-PDB2YAML: Offset: 0
CHECK-PDB2YAML: Segment: 2
CHECK-PDB2YAML: Name: '??_7Base@@6B@'
CHECK-PDB2YAML: - Kind: S_PUB32
CHECK-PDB2YAML: PublicSym32:
CHECK-PDB2YAML: Flags: [ Function ]
CHECK-PDB2YAML: Offset: 0
CHECK-PDB2YAML: Segment: 1
CHECK-PDB2YAML: Name: '??0Base@@QEAA@XZ'
20 changes: 20 additions & 0 deletions llvm/tools/llvm-pdbutil/llvm-pdbutil.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
#include "llvm/DebugInfo/CodeView/LazyRandomTypeCollection.h"
#include "llvm/DebugInfo/CodeView/MergingTypeTableBuilder.h"
#include "llvm/DebugInfo/CodeView/StringsAndChecksums.h"
#include "llvm/DebugInfo/CodeView/SymbolDeserializer.h"
#include "llvm/DebugInfo/CodeView/TypeStreamMerger.h"
#include "llvm/DebugInfo/MSF/MSFBuilder.h"
#include "llvm/DebugInfo/MSF/MappedBlockStream.h"
Expand All @@ -49,6 +50,7 @@
#include "llvm/DebugInfo/PDB/IPDBSession.h"
#include "llvm/DebugInfo/PDB/Native/DbiModuleDescriptorBuilder.h"
#include "llvm/DebugInfo/PDB/Native/DbiStreamBuilder.h"
#include "llvm/DebugInfo/PDB/Native/GSIStreamBuilder.h"
#include "llvm/DebugInfo/PDB/Native/InfoStream.h"
#include "llvm/DebugInfo/PDB/Native/InfoStreamBuilder.h"
#include "llvm/DebugInfo/PDB/Native/InputFile.h"
Expand Down Expand Up @@ -818,6 +820,7 @@ static void yamlToPdb(StringRef Path) {
pdb::yaml::PdbDbiStream DefaultDbiStream;
pdb::yaml::PdbTpiStream DefaultTpiStream;
pdb::yaml::PdbTpiStream DefaultIpiStream;
pdb::yaml::PdbPublicsStream DefaultPublicsStream;

const auto &Info = YamlObj.PdbStream.value_or(DefaultInfoStream);

Expand Down Expand Up @@ -880,6 +883,23 @@ static void yamlToPdb(StringRef Path) {
IpiBuilder.addTypeRecord(Type.RecordData, std::nullopt);
}

auto &GsiBuilder = Builder.getGsiBuilder();
const auto &Publics = YamlObj.PublicsStream.value_or(DefaultPublicsStream);
std::vector<BulkPublic> BulkPublics;
for (const auto &P : Publics.PubSyms) {
CVSymbol CV = P.toCodeViewSymbol(Allocator, CodeViewContainer::Pdb);
auto PS = cantFail(SymbolDeserializer::deserializeAs<PublicSym32>(CV));

BulkPublic BP;
BP.Name = PS.Name.data();
BP.NameLen = PS.Name.size();
BP.setFlags(PS.Flags);
BP.Offset = PS.Offset;
BP.Segment = PS.Segment;
BulkPublics.emplace_back(BP);
}
GsiBuilder.addPublicSymbols(std::move(BulkPublics));

Builder.getStringTableBuilder().setStrings(*Strings.strings());

codeview::GUID IgnoredOutGuid;
Expand Down
Loading