Skip to content

Commit d100b5d

Browse files
niconico
committedJul 16, 2019
Teach llvm-pdbutil pretty -native about -injected-sources
`pretty -native -injected-sources -injected-source-content` works with this patch, and produces identical output to the dia version. Differential Revision: https://reviews.llvm.org/D64428 llvm-svn: 366236
·
llvmorg-21-initllvmorg-9.0.0-rc1
1 parent 17060f0 commit d100b5d

File tree

12 files changed

+383
-21
lines changed

12 files changed

+383
-21
lines changed
 

‎llvm/include/llvm/DebugInfo/PDB/Native/HashTable.h

+9-3
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,12 @@ class HashTableIterator
7272
assert(Map->Present.test(Index));
7373
return Map->Buckets[Index];
7474
}
75+
76+
// Implement postfix op++ in terms of prefix op++ by using the superclass
77+
// implementation.
78+
using iterator_facade_base<HashTableIterator<ValueT>,
79+
std::forward_iterator_tag,
80+
const std::pair<uint32_t, ValueT>>::operator++;
7581
HashTableIterator &operator++() {
7682
while (Index < Map->Buckets.size()) {
7783
++Index;
@@ -94,9 +100,6 @@ class HashTableIterator
94100

95101
template <typename ValueT>
96102
class HashTable {
97-
using const_iterator = HashTableIterator<ValueT>;
98-
friend const_iterator;
99-
100103
struct Header {
101104
support::ulittle32_t Size;
102105
support::ulittle32_t Capacity;
@@ -105,6 +108,9 @@ class HashTable {
105108
using BucketList = std::vector<std::pair<uint32_t, ValueT>>;
106109

107110
public:
111+
using const_iterator = HashTableIterator<ValueT>;
112+
friend const_iterator;
113+
108114
HashTable() { Buckets.resize(8); }
109115
explicit HashTable(uint32_t Capacity) {
110116
Buckets.resize(Capacity);

‎llvm/include/llvm/DebugInfo/PDB/Native/InjectedSourceStream.h

+44
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
//===- InjectedSourceStream.h - PDB Headerblock Stream Access ---*- C++ -*-===//
2+
//
3+
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4+
// See https://llvm.org/LICENSE.txt for license information.
5+
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6+
//
7+
//===----------------------------------------------------------------------===//
8+
9+
#ifndef LLVM_DEBUGINFO_PDB_RAW_PDBINJECTEDSOURCESTREAM_H
10+
#define LLVM_DEBUGINFO_PDB_RAW_PDBINJECTEDSOURCESTREAM_H
11+
12+
#include "llvm/DebugInfo/PDB/Native/HashTable.h"
13+
#include "llvm/DebugInfo/PDB/Native/RawTypes.h"
14+
#include "llvm/Support/Error.h"
15+
16+
namespace llvm {
17+
namespace msf {
18+
class MappedBlockStream;
19+
}
20+
namespace pdb {
21+
class PDBFile;
22+
class PDBStringTable;
23+
24+
class InjectedSourceStream {
25+
public:
26+
InjectedSourceStream(std::unique_ptr<msf::MappedBlockStream> Stream);
27+
Error reload(const PDBStringTable &Strings);
28+
29+
using const_iterator = HashTable<SrcHeaderBlockEntry>::const_iterator;
30+
const_iterator begin() const { return InjectedSourceTable.begin(); }
31+
const_iterator end() const { return InjectedSourceTable.end(); }
32+
33+
uint32_t size() const { return InjectedSourceTable.size(); }
34+
35+
private:
36+
std::unique_ptr<msf::MappedBlockStream> Stream;
37+
38+
const SrcHeaderBlockHeader* Header;
39+
HashTable<SrcHeaderBlockEntry> InjectedSourceTable;
40+
};
41+
}
42+
}
43+
44+
#endif

‎llvm/include/llvm/DebugInfo/PDB/Native/NativeEnumInjectedSources.h

+43
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
//==- NativeEnumInjectedSources.cpp - Native Injected Source Enumerator --*-==//
2+
//
3+
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4+
// See https://llvm.org/LICENSE.txt for license information.
5+
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6+
//
7+
//===----------------------------------------------------------------------===//
8+
9+
#ifndef LLVM_DEBUGINFO_PDB_NATIVE_NATIVEENUMINJECTEDSOURCES_H
10+
#define LLVM_DEBUGINFO_PDB_NATIVE_NATIVEENUMINJECTEDSOURCES_H
11+
12+
#include "llvm/DebugInfo/PDB/IPDBEnumChildren.h"
13+
#include "llvm/DebugInfo/PDB/IPDBInjectedSource.h"
14+
#include "llvm/DebugInfo/PDB/Native/InjectedSourceStream.h"
15+
16+
namespace llvm {
17+
namespace pdb {
18+
19+
class InjectedSourceStream;
20+
class PDBStringTable;
21+
22+
class NativeEnumInjectedSources : public IPDBEnumChildren<IPDBInjectedSource> {
23+
public:
24+
NativeEnumInjectedSources(PDBFile &File, const InjectedSourceStream &IJS,
25+
const PDBStringTable &Strings);
26+
27+
uint32_t getChildCount() const override;
28+
std::unique_ptr<IPDBInjectedSource>
29+
getChildAtIndex(uint32_t Index) const override;
30+
std::unique_ptr<IPDBInjectedSource> getNext() override;
31+
void reset() override;
32+
33+
private:
34+
PDBFile &File;
35+
const InjectedSourceStream &Stream;
36+
const PDBStringTable &Strings;
37+
InjectedSourceStream::const_iterator Cur;
38+
};
39+
40+
} // namespace pdb
41+
} // namespace llvm
42+
43+
#endif

‎llvm/include/llvm/DebugInfo/PDB/Native/PDBFile.h

+6
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ namespace pdb {
3232
class DbiStream;
3333
class GlobalsStream;
3434
class InfoStream;
35+
class InjectedSourceStream;
3536
class PDBStringTable;
3637
class PDBFileBuilder;
3738
class PublicsStream;
@@ -87,6 +88,8 @@ class PDBFile : public msf::IMSFFile {
8788
createIndexedStream(uint16_t SN) const;
8889
Expected<std::unique_ptr<msf::MappedBlockStream>>
8990
safelyCreateIndexedStream(uint32_t StreamIndex) const;
91+
Expected<std::unique_ptr<msf::MappedBlockStream>>
92+
safelyCreateNamedStream(StringRef Name);
9093

9194
msf::MSFStreamLayout getStreamLayout(uint32_t StreamIdx) const;
9295
msf::MSFStreamLayout getFpmStreamLayout() const;
@@ -102,6 +105,7 @@ class PDBFile : public msf::IMSFFile {
102105
Expected<PublicsStream &> getPDBPublicsStream();
103106
Expected<SymbolStream &> getPDBSymbolStream();
104107
Expected<PDBStringTable &> getStringTable();
108+
Expected<InjectedSourceStream &> getInjectedSourceStream();
105109

106110
BumpPtrAllocator &getAllocator() { return Allocator; }
107111

@@ -113,6 +117,7 @@ class PDBFile : public msf::IMSFFile {
113117
bool hasPDBSymbolStream();
114118
bool hasPDBTpiStream() const;
115119
bool hasPDBStringTable();
120+
bool hasPDBInjectedSourceStream();
116121

117122
uint32_t getPointerSize();
118123

@@ -133,6 +138,7 @@ class PDBFile : public msf::IMSFFile {
133138
std::unique_ptr<SymbolStream> Symbols;
134139
std::unique_ptr<msf::MappedBlockStream> DirectoryStream;
135140
std::unique_ptr<msf::MappedBlockStream> StringTableStream;
141+
std::unique_ptr<InjectedSourceStream> InjectedSources;
136142
std::unique_ptr<PDBStringTable> Strings;
137143
};
138144
}

‎llvm/lib/DebugInfo/PDB/CMakeLists.txt

+2
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,11 @@ add_pdb_impl_folder(Native
4747
Native/HashTable.cpp
4848
Native/InfoStream.cpp
4949
Native/InfoStreamBuilder.cpp
50+
Native/InjectedSourceStream.cpp
5051
Native/ModuleDebugStream.cpp
5152
Native/NativeCompilandSymbol.cpp
5253
Native/NativeEnumGlobals.cpp
54+
Native/NativeEnumInjectedSources.cpp
5355
Native/NativeEnumModules.cpp
5456
Native/NativeEnumTypes.cpp
5557
Native/NativeExeSymbol.cpp

‎llvm/lib/DebugInfo/PDB/Native/InjectedSourceStream.cpp

+65
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
//===- InjectedSourceStream.cpp - PDB Headerblock Stream Access -----------===//
2+
//
3+
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4+
// See https://llvm.org/LICENSE.txt for license information.
5+
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6+
//
7+
//===----------------------------------------------------------------------===//
8+
9+
#include "llvm/DebugInfo/PDB/Native/InjectedSourceStream.h"
10+
11+
#include "llvm/DebugInfo/MSF/MappedBlockStream.h"
12+
#include "llvm/DebugInfo/PDB/Native/Hash.h"
13+
#include "llvm/DebugInfo/PDB/Native/PDBStringTable.h"
14+
#include "llvm/DebugInfo/PDB/Native/RawConstants.h"
15+
#include "llvm/DebugInfo/PDB/Native/RawTypes.h"
16+
#include "llvm/Support/BinaryStreamReader.h"
17+
#include "llvm/Support/Endian.h"
18+
19+
using namespace llvm;
20+
using namespace llvm::msf;
21+
using namespace llvm::support;
22+
using namespace llvm::pdb;
23+
24+
InjectedSourceStream::InjectedSourceStream(
25+
std::unique_ptr<MappedBlockStream> Stream)
26+
: Stream(std::move(Stream)) {}
27+
28+
Error InjectedSourceStream::reload(const PDBStringTable &Strings) {
29+
BinaryStreamReader Reader(*Stream);
30+
31+
if (auto EC = Reader.readObject(Header))
32+
return EC;
33+
34+
if (Header->Version !=
35+
static_cast<uint32_t>(PdbRaw_SrcHeaderBlockVer::SrcVerOne))
36+
return make_error<RawError>(raw_error_code::corrupt_file,
37+
"Invalid headerblock header version");
38+
39+
if (auto EC = InjectedSourceTable.load(Reader))
40+
return EC;
41+
42+
for (const auto& Entry : *this) {
43+
if (Entry.second.Size != sizeof(SrcHeaderBlockEntry))
44+
return make_error<RawError>(raw_error_code::corrupt_file,
45+
"Invalid headerbock entry size");
46+
if (Entry.second.Version !=
47+
static_cast<uint32_t>(PdbRaw_SrcHeaderBlockVer::SrcVerOne))
48+
return make_error<RawError>(raw_error_code::corrupt_file,
49+
"Invalid headerbock entry version");
50+
51+
// Check that all name references are valid.
52+
auto Name = Strings.getStringForID(Entry.second.FileNI);
53+
if (!Name)
54+
return Name.takeError();
55+
auto ObjName = Strings.getStringForID(Entry.second.ObjNI);
56+
if (!ObjName)
57+
return ObjName.takeError();
58+
auto VName = Strings.getStringForID(Entry.second.VFileNI);
59+
if (!VName)
60+
return VName.takeError();
61+
}
62+
63+
assert(Reader.bytesRemaining() == 0);
64+
return Error::success();
65+
}

‎llvm/lib/DebugInfo/PDB/Native/NativeEnumInjectedSources.cpp

+121
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,121 @@
1+
//==- NativeEnumInjectedSources.cpp - Native Injected Source Enumerator --*-==//
2+
//
3+
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4+
// See https://llvm.org/LICENSE.txt for license information.
5+
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6+
//
7+
//===----------------------------------------------------------------------===//
8+
9+
#include "llvm/DebugInfo/PDB/Native/NativeEnumInjectedSources.h"
10+
11+
#include "llvm/DebugInfo/PDB/Native/InfoStream.h"
12+
#include "llvm/DebugInfo/PDB/Native/PDBFile.h"
13+
#include "llvm/DebugInfo/PDB/Native/PDBStringTable.h"
14+
15+
namespace llvm {
16+
namespace pdb {
17+
18+
namespace {
19+
20+
Expected<std::string> readStreamData(BinaryStream &Stream) {
21+
uint32_t Offset = 0, DataLength = Stream.getLength();
22+
std::string Result;
23+
Result.reserve(DataLength);
24+
while (Offset < DataLength) {
25+
ArrayRef<uint8_t> Data;
26+
if (auto E = Stream.readLongestContiguousChunk(Offset, Data))
27+
return std::move(E);
28+
Offset += Data.size();
29+
Result += toStringRef(Data);
30+
}
31+
return Result;
32+
}
33+
34+
class NativeInjectedSource final : public IPDBInjectedSource {
35+
const SrcHeaderBlockEntry &Entry;
36+
const PDBStringTable &Strings;
37+
PDBFile &File;
38+
39+
public:
40+
NativeInjectedSource(const SrcHeaderBlockEntry &Entry,
41+
PDBFile &File, const PDBStringTable &Strings)
42+
: Entry(Entry), Strings(Strings), File(File) {}
43+
44+
uint32_t getCrc32() const override { return Entry.CRC; }
45+
uint64_t getCodeByteSize() const override { return Entry.FileSize; }
46+
47+
std::string getFileName() const override {
48+
auto Name = Strings.getStringForID(Entry.FileNI);
49+
assert(Name && "InjectedSourceStream should have rejected this");
50+
return *Name;
51+
}
52+
53+
std::string getObjectFileName() const override {
54+
auto ObjName = Strings.getStringForID(Entry.ObjNI);
55+
assert(ObjName && "InjectedSourceStream should have rejected this");
56+
return *ObjName;
57+
}
58+
59+
std::string getVirtualFileName() const override {
60+
auto VName = Strings.getStringForID(Entry.VFileNI);
61+
assert(VName && "InjectedSourceStream should have rejected this");
62+
return *VName;
63+
}
64+
65+
PDB_SourceCompression getCompression() const override {
66+
return static_cast<PDB_SourceCompression>(Entry.Compression);
67+
}
68+
69+
std::string getCode() const override {
70+
// Get name of stream storing the data.
71+
auto VName = Strings.getStringForID(Entry.VFileNI);
72+
assert(VName && "InjectedSourceStream should have rejected this");
73+
std::string StreamName = ("/src/files/" + *VName).str();
74+
75+
// Find stream with that name and read its data.
76+
// FIXME: Consider validating (or even loading) all this in
77+
// InjectedSourceStream so that no error can happen here.
78+
auto ExpectedFileStream = File.safelyCreateNamedStream(StreamName);
79+
if (!ExpectedFileStream) {
80+
consumeError(ExpectedFileStream.takeError());
81+
return "(failed to open data stream)";
82+
}
83+
84+
auto Data = readStreamData(**ExpectedFileStream);
85+
if (!Data) {
86+
consumeError(Data.takeError());
87+
return "(failed to read data)";
88+
}
89+
return *Data;
90+
}
91+
};
92+
93+
} // namespace
94+
95+
NativeEnumInjectedSources::NativeEnumInjectedSources(
96+
PDBFile &File, const InjectedSourceStream &IJS,
97+
const PDBStringTable &Strings)
98+
: File(File), Stream(IJS), Strings(Strings), Cur(Stream.begin()) {}
99+
100+
uint32_t NativeEnumInjectedSources::getChildCount() const {
101+
return static_cast<uint32_t>(Stream.size());
102+
}
103+
104+
std::unique_ptr<IPDBInjectedSource>
105+
NativeEnumInjectedSources::getChildAtIndex(uint32_t N) const {
106+
if (N >= getChildCount())
107+
return nullptr;
108+
return make_unique<NativeInjectedSource>(std::next(Stream.begin(), N)->second,
109+
File, Strings);
110+
}
111+
112+
std::unique_ptr<IPDBInjectedSource> NativeEnumInjectedSources::getNext() {
113+
if (Cur == Stream.end())
114+
return nullptr;
115+
return make_unique<NativeInjectedSource>((Cur++)->second, File, Strings);
116+
}
117+
118+
void NativeEnumInjectedSources::reset() { Cur = Stream.begin(); }
119+
120+
}
121+
}

‎llvm/lib/DebugInfo/PDB/Native/NativeSession.cpp

+12-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#include "llvm/DebugInfo/PDB/IPDBEnumChildren.h"
1414
#include "llvm/DebugInfo/PDB/IPDBSourceFile.h"
1515
#include "llvm/DebugInfo/PDB/Native/NativeCompilandSymbol.h"
16+
#include "llvm/DebugInfo/PDB/Native/NativeEnumInjectedSources.h"
1617
#include "llvm/DebugInfo/PDB/Native/NativeEnumTypes.h"
1718
#include "llvm/DebugInfo/PDB/Native/NativeExeSymbol.h"
1819
#include "llvm/DebugInfo/PDB/Native/NativeTypeBuiltin.h"
@@ -191,7 +192,17 @@ std::unique_ptr<IPDBEnumTables> NativeSession::getEnumTables() const {
191192

192193
std::unique_ptr<IPDBEnumInjectedSources>
193194
NativeSession::getInjectedSources() const {
194-
return nullptr;
195+
auto ISS = Pdb->getInjectedSourceStream();
196+
if (!ISS) {
197+
consumeError(ISS.takeError());
198+
return nullptr;
199+
}
200+
auto Strings = Pdb->getStringTable();
201+
if (!Strings) {
202+
consumeError(Strings.takeError());
203+
return nullptr;
204+
}
205+
return make_unique<NativeEnumInjectedSources>(*Pdb, *ISS, *Strings);
195206
}
196207

197208
std::unique_ptr<IPDBEnumSectionContribs>

‎llvm/lib/DebugInfo/PDB/Native/PDBFile.cpp

+47-10
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#include "llvm/DebugInfo/PDB/Native/DbiStream.h"
1515
#include "llvm/DebugInfo/PDB/Native/GlobalsStream.h"
1616
#include "llvm/DebugInfo/PDB/Native/InfoStream.h"
17+
#include "llvm/DebugInfo/PDB/Native/InjectedSourceStream.h"
1718
#include "llvm/DebugInfo/PDB/Native/PDBStringTable.h"
1819
#include "llvm/DebugInfo/PDB/Native/PublicsStream.h"
1920
#include "llvm/DebugInfo/PDB/Native/RawError.h"
@@ -365,16 +366,7 @@ Expected<SymbolStream &> PDBFile::getPDBSymbolStream() {
365366

366367
Expected<PDBStringTable &> PDBFile::getStringTable() {
367368
if (!Strings) {
368-
auto IS = getPDBInfoStream();
369-
if (!IS)
370-
return IS.takeError();
371-
372-
Expected<uint32_t> ExpectedNSI = IS->getNamedStreamIndex("/names");
373-
if (!ExpectedNSI)
374-
return ExpectedNSI.takeError();
375-
uint32_t NameStreamIndex = *ExpectedNSI;
376-
377-
auto NS = safelyCreateIndexedStream(NameStreamIndex);
369+
auto NS = safelyCreateNamedStream("/names");
378370
if (!NS)
379371
return NS.takeError();
380372

@@ -389,6 +381,24 @@ Expected<PDBStringTable &> PDBFile::getStringTable() {
389381
return *Strings;
390382
}
391383

384+
Expected<InjectedSourceStream &> PDBFile::getInjectedSourceStream() {
385+
if (!InjectedSources) {
386+
auto IJS = safelyCreateNamedStream("/src/headerblock");
387+
if (!IJS)
388+
return IJS.takeError();
389+
390+
auto Strings = getStringTable();
391+
if (!Strings)
392+
return Strings.takeError();
393+
394+
auto IJ = llvm::make_unique<InjectedSourceStream>(std::move(*IJS));
395+
if (auto EC = IJ->reload(*Strings))
396+
return std::move(EC);
397+
InjectedSources = std::move(IJ);
398+
}
399+
return *InjectedSources;
400+
}
401+
392402
uint32_t PDBFile::getPointerSize() {
393403
auto DbiS = getPDBDbiStream();
394404
if (!DbiS)
@@ -457,6 +467,19 @@ bool PDBFile::hasPDBStringTable() {
457467
return true;
458468
}
459469

470+
bool PDBFile::hasPDBInjectedSourceStream() {
471+
auto IS = getPDBInfoStream();
472+
if (!IS)
473+
return false;
474+
Expected<uint32_t> ExpectedNSI = IS->getNamedStreamIndex("/src/headerblock");
475+
if (!ExpectedNSI) {
476+
consumeError(ExpectedNSI.takeError());
477+
return false;
478+
}
479+
assert(*ExpectedNSI < getNumStreams());
480+
return true;
481+
}
482+
460483
/// Wrapper around MappedBlockStream::createIndexedStream() that checks if a
461484
/// stream with that index actually exists. If it does not, the return value
462485
/// will have an MSFError with code msf_error_code::no_stream. Else, the return
@@ -468,3 +491,17 @@ PDBFile::safelyCreateIndexedStream(uint32_t StreamIndex) const {
468491
return make_error<RawError>(raw_error_code::no_stream);
469492
return createIndexedStream(StreamIndex);
470493
}
494+
495+
Expected<std::unique_ptr<MappedBlockStream>>
496+
PDBFile::safelyCreateNamedStream(StringRef Name) {
497+
auto IS = getPDBInfoStream();
498+
if (!IS)
499+
return IS.takeError();
500+
501+
Expected<uint32_t> ExpectedNSI = IS->getNamedStreamIndex(Name);
502+
if (!ExpectedNSI)
503+
return ExpectedNSI.takeError();
504+
uint32_t NameStreamIndex = *ExpectedNSI;
505+
506+
return safelyCreateIndexedStream(NameStreamIndex);
507+
}

‎llvm/test/tools/llvm-pdbutil/injected-sources-native.test

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
; This is identical to injected-sources.test, except that it uses the -native
2+
; mode of pretty (and hence doesn't require diasdk and runs on all platforms).
3+
4+
; RUN: llvm-pdbutil pretty -native -injected-sources -injected-source-content \
5+
; RUN: %p/Inputs/InjectedSource.pdb | FileCheck %s
6+
; RUN: llvm-pdbutil pretty -native -injected-sources -injected-source-content \
7+
; RUN: %p/Inputs/ClassLayoutTest.pdb | FileCheck --check-prefix=NEGATIVE %s
8+
9+
; CHECK: ---INJECTED SOURCES---
10+
; CHECK: c.natvis (140 bytes): obj=<null>, vname=c.natvis, crc=334478030, compression=None
11+
; CHECK-NEXT: <?xml version="1.0" encoding="utf-8"?>
12+
; CHECK-NEXT: <AutoVisualizer xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010">
13+
; CHECK-NEXT: </AutoVisualizer>
14+
; CHECK: a.natvis (140 bytes): obj=<null>, vname=a.natvis, crc=334478030, compression=None
15+
; CHECK-NEXT: <?xml version="1.0" encoding="utf-8"?>
16+
; CHECK-NEXT: <AutoVisualizer xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010">
17+
; CHECK-NEXT: </AutoVisualizer>
18+
; CHECK: b.natvis (294 bytes): obj=<null>, vname=b.natvis, crc=2059731902, compression=None
19+
; CHECK-NEXT: <?xml version="1.0" encoding="utf-8"?>
20+
; CHECK-NEXT: <AutoVisualizer xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010">
21+
; CHECK-NEXT: <Type Name="Baz">
22+
; CHECK-NEXT: <DisplayString>Third test</DisplayString>
23+
; CHECK-NEXT: </Type>
24+
; CHECK-NEXT: <Type Name="Buzz">
25+
; CHECK-NEXT: <DisplayString>Fourth test</DisplayString>
26+
; CHECK-NEXT: </Type>
27+
; CHECK-NEXT: </AutoVisualizer>
28+
29+
; NEGATIVE: ---INJECTED SOURCES---
30+
; NEGATIVE-NEXT: There are no injected sources.

‎llvm/tools/llvm-pdbutil/llvm-pdbutil.cpp

+2-7
Original file line numberDiff line numberDiff line change
@@ -934,7 +934,7 @@ static std::string stringOr(std::string Str, std::string IfEmpty) {
934934

935935
static void dumpInjectedSources(LinePrinter &Printer, IPDBSession &Session) {
936936
auto Sources = Session.getInjectedSources();
937-
if (0 == Sources->getChildCount()) {
937+
if (!Sources || !Sources->getChildCount()) {
938938
Printer.printLine("There are no injected sources.");
939939
return;
940940
}
@@ -1279,12 +1279,7 @@ static void dumpPretty(StringRef Path) {
12791279
WithColor(Printer, PDB_ColorItem::SectionHeader).get()
12801280
<< "---INJECTED SOURCES---";
12811281
AutoIndent Indent1(Printer);
1282-
1283-
if (ReaderType == PDB_ReaderType::Native)
1284-
Printer.printLine(
1285-
"Injected sources are not supported with the native reader.");
1286-
else
1287-
dumpInjectedSources(Printer, *Session);
1282+
dumpInjectedSources(Printer, *Session);
12881283
}
12891284

12901285
Printer.NewLine();

‎llvm/utils/gn/secondary/llvm/lib/DebugInfo/PDB/BUILD.gn

+2
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,12 @@ static_library("PDB") {
2424
"Native/HashTable.cpp",
2525
"Native/InfoStream.cpp",
2626
"Native/InfoStreamBuilder.cpp",
27+
"Native/InjectedSourceStream.cpp",
2728
"Native/ModuleDebugStream.cpp",
2829
"Native/NamedStreamMap.cpp",
2930
"Native/NativeCompilandSymbol.cpp",
3031
"Native/NativeEnumGlobals.cpp",
32+
"Native/NativeEnumInjectedSources.cpp",
3133
"Native/NativeEnumModules.cpp",
3234
"Native/NativeEnumTypes.cpp",
3335
"Native/NativeExeSymbol.cpp",

0 commit comments

Comments
 (0)
Please sign in to comment.