diff options
| author | Zachary Turner <zturner@google.com> | 2017-12-06 00:26:43 +0000 |
|---|---|---|
| committer | Zachary Turner <zturner@google.com> | 2017-12-06 00:26:43 +0000 |
| commit | 2ed069e63d4d765d8a0675d7544850cc3cd51144 (patch) | |
| tree | 57a625a7986d8935965d53e4586aa5a7ef998fce /llvm | |
| parent | 647e4f590f1de9032c3ae2563dbb8532041b1840 (diff) | |
| download | bcm5719-llvm-2ed069e63d4d765d8a0675d7544850cc3cd51144.tar.gz bcm5719-llvm-2ed069e63d4d765d8a0675d7544850cc3cd51144.zip | |
Fix error in llvm-pdbutil.
A recent change made this print the wrong value, breaking some
tests. This is now fixed.
llvm-svn: 319862
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/tools/llvm-pdbutil/DumpOutputStyle.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/llvm/tools/llvm-pdbutil/DumpOutputStyle.cpp b/llvm/tools/llvm-pdbutil/DumpOutputStyle.cpp index 84355e7bd2e..710e0348481 100644 --- a/llvm/tools/llvm-pdbutil/DumpOutputStyle.cpp +++ b/llvm/tools/llvm-pdbutil/DumpOutputStyle.cpp @@ -923,12 +923,12 @@ static void buildDepSet(LazyRandomTypeCollection &Types, static void dumpFullTypeStream(LinePrinter &Printer, LazyRandomTypeCollection &Types, - uint32_t NumHashBuckets, + uint32_t NumTypeRecords, uint32_t NumHashBuckets, FixedStreamArray<support::ulittle32_t> HashValues, bool Bytes, bool Extras) { - Printer.formatLine("Showing {0:N} records", Types.size()); - uint32_t Width = NumDigits(TypeIndex::FirstNonSimpleIndex + Types.size()); + Printer.formatLine("Showing {0:N} records", NumTypeRecords); + uint32_t Width = NumDigits(TypeIndex::FirstNonSimpleIndex + NumTypeRecords); MinimalTypeDumpVisitor V(Printer, Width + 2, Bytes, Extras, Types, NumHashBuckets, HashValues); @@ -1002,7 +1002,7 @@ Error DumpOutputStyle::dumpTypesFromObjectFile() { Types.reset(Reader, 100); if (opts::dump::DumpTypes) { - dumpFullTypeStream(P, Types, 0, {}, opts::dump::DumpTypeData, false); + dumpFullTypeStream(P, Types, 0, 0, {}, opts::dump::DumpTypeData, false); } else if (opts::dump::DumpTypeExtras) { auto LocalHashes = LocallyHashedType::hashTypeCollection(Types); auto GlobalHashes = GloballyHashedType::hashTypeCollection(Types); @@ -1073,8 +1073,9 @@ Error DumpOutputStyle::dumpTpiStream(uint32_t StreamIdx) { if (DumpTypes || !Indices.empty()) { if (Indices.empty()) - dumpFullTypeStream(P, Types, Stream.getNumHashBuckets(), - Stream.getHashValues(), DumpBytes, DumpExtras); + dumpFullTypeStream(P, Types, Stream.getNumTypeRecords(), + Stream.getNumHashBuckets(), Stream.getHashValues(), + DumpBytes, DumpExtras); else { std::vector<TypeIndex> TiList(Indices.begin(), Indices.end()); dumpPartialTypeStream(P, Types, Stream, TiList, DumpBytes, DumpExtras, |
