Index: test/tools/llvm-pdbdump/checksum-string.test =================================================================== --- test/tools/llvm-pdbdump/checksum-string.test +++ test/tools/llvm-pdbdump/checksum-string.test @@ -1,3 +1,4 @@ +; REQUIRES: diasdk ; RUN: llvm-pdbutil pretty -lines %p/Inputs/PrettyFuncDumperTest.pdb > %t ; CHECK: ---COMPILANDS--- Index: test/tools/llvm-pdbdump/class-layout.test =================================================================== --- test/tools/llvm-pdbdump/class-layout.test +++ test/tools/llvm-pdbdump/class-layout.test @@ -1,3 +1,5 @@ +; REQUIRES: diasdk + ; RUN: llvm-pdbutil pretty -all -class-recurse-depth=1 \ ; RUN: %p/Inputs/ClassLayoutTest.pdb > %t ; RUN: FileCheck -input-file=%t %s -check-prefix=GLOBALS_TEST Index: test/tools/llvm-pdbdump/complex-padding-graphical.test =================================================================== --- test/tools/llvm-pdbdump/complex-padding-graphical.test +++ test/tools/llvm-pdbdump/complex-padding-graphical.test @@ -1,3 +1,5 @@ +; REQUIRES: diasdk + ; RUN: llvm-pdbutil pretty -classes -class-definitions=layout \ ; RUN: -include-types=Test %p/Inputs/ComplexPaddingTest.pdb > %t Index: test/tools/llvm-pdbdump/enum-layout.test =================================================================== --- test/tools/llvm-pdbdump/enum-layout.test +++ test/tools/llvm-pdbdump/enum-layout.test @@ -1,3 +1,5 @@ +; REQUIRES: diasdk + ; RUN: llvm-pdbutil pretty -types %p/Inputs/ClassLayoutTest.pdb > %t ; RUN: FileCheck -input-file=%t %s -check-prefix=GLOBAL_ENUM ; RUN: FileCheck -input-file=%t %s -check-prefix=MEMBER_ENUM Index: test/tools/llvm-pdbdump/explain-dbi-stream.test =================================================================== --- test/tools/llvm-pdbdump/explain-dbi-stream.test +++ test/tools/llvm-pdbdump/explain-dbi-stream.test @@ -1,3 +1,5 @@ +; REQUIRES: diasdk + ; RUN: llvm-pdbutil explain \ ; RUN: -offset=0xF000 \ ; RUN: -offset=0xF004 \ Index: test/tools/llvm-pdbdump/explain-pdb-stream.test =================================================================== --- test/tools/llvm-pdbdump/explain-pdb-stream.test +++ test/tools/llvm-pdbdump/explain-pdb-stream.test @@ -1,3 +1,5 @@ +; REQUIRES: diasdk + ; RUN: llvm-pdbutil explain \ ; RUN: -offset=0x11000 \ ; RUN: -offset=0x11004 \ Index: test/tools/llvm-pdbdump/explain.test =================================================================== --- test/tools/llvm-pdbdump/explain.test +++ test/tools/llvm-pdbdump/explain.test @@ -1,3 +1,5 @@ +; REQUIRES: diasdk + ; RUN: llvm-pdbutil explain -offset=0 %p/Inputs/InjectedSource.pdb \ ; RUN: | FileCheck --check-prefix=ZERO %s ; RUN: llvm-pdbutil explain -offset=40 %p/Inputs/InjectedSource.pdb \ Index: test/tools/llvm-pdbdump/injected-sources.test =================================================================== --- test/tools/llvm-pdbdump/injected-sources.test +++ test/tools/llvm-pdbdump/injected-sources.test @@ -1,6 +1,8 @@ ; The PDB committed to the repo does not seem to be recognized by older ; versions of DIA SDK, so we xfail the test temporarily until we can ; figure out how to get a PDB that makes all versions of MSVC happy. +; REQUIRES: diasdk + ; RUN: llvm-pdbutil pretty -injected-sources -injected-source-content \ ; RUN: %p/Inputs/InjectedSource.pdb | FileCheck %s ; RUN: llvm-pdbutil pretty -injected-sources -injected-source-content \ Index: test/tools/llvm-pdbdump/lit.local.cfg =================================================================== --- test/tools/llvm-pdbdump/lit.local.cfg +++ test/tools/llvm-pdbdump/lit.local.cfg @@ -1 +1,2 @@ -config.unsupported = not config.have_dia_sdk +if config.have_dia_sdk: + config.available_features.add("diasdk") Index: test/tools/llvm-pdbdump/load-address.test =================================================================== --- test/tools/llvm-pdbdump/load-address.test +++ test/tools/llvm-pdbdump/load-address.test @@ -1,3 +1,5 @@ +; REQUIRES: diasdk + ; RUN: llvm-pdbutil pretty -externals %p/Inputs/LoadAddressTest.pdb \ ; RUN: | FileCheck --check-prefix=RVA %s ; RUN: llvm-pdbutil pretty -externals -load-address=0x40000000 \ Index: test/tools/llvm-pdbdump/pretty-func-dumper.test =================================================================== --- test/tools/llvm-pdbdump/pretty-func-dumper.test +++ test/tools/llvm-pdbdump/pretty-func-dumper.test @@ -1,3 +1,5 @@ +; REQUIRES: diasdk + ; RUN: llvm-pdbutil pretty -all -class-recurse-depth=1 \ ; RUN: %p/Inputs/PrettyFuncDumperTest.pdb > %t ; RUN: FileCheck -input-file=%t %s -check-prefix=GLOBALS_FUNC Index: test/tools/llvm-pdbdump/regex-filter.test =================================================================== --- test/tools/llvm-pdbdump/regex-filter.test +++ test/tools/llvm-pdbdump/regex-filter.test @@ -1,3 +1,5 @@ +; REQUIRES: diasdk + ; RUN: llvm-pdbutil pretty -module-syms -globals -types %p/Inputs/FilterTest.pdb \ ; RUN: | FileCheck --check-prefix=NO_FILTER %s Index: test/tools/llvm-pdbdump/simple-padding-graphical.test =================================================================== --- test/tools/llvm-pdbdump/simple-padding-graphical.test +++ test/tools/llvm-pdbdump/simple-padding-graphical.test @@ -1,3 +1,5 @@ +; REQUIRES: diasdk + ; RUN: llvm-pdbutil pretty -classes -class-definitions=layout \ ; RUN: -include-types=SimplePad %p/Inputs/SimplePaddingTest.pdb > %t Index: test/tools/llvm-pdbdump/stripped.test =================================================================== --- test/tools/llvm-pdbdump/stripped.test +++ test/tools/llvm-pdbdump/stripped.test @@ -0,0 +1,115 @@ +; RUN: llvm-pdbutil dump -all %p/Inputs/Stripped.pdb > %t +; RUN: FileCheck -input-file=%t %s + +; CHECK: Summary +; CHECK-NEXT: ============================================================ +; CHECK-NEXT: Block Size: 1024 +; CHECK-NEXT: Number of blocks: 827 +; CHECK-NEXT: Number of streams: 15 +; CHECK-NEXT: Signature: 1354244563 +; CHECK-NEXT: Age: 3 +; CHECK-NEXT: GUID: {7123C791-43DD-8144-92B7-B46F5ED10AA0} +; CHECK-NEXT: Features: 0x0 +; CHECK-NEXT: Has Debug Info: true +; CHECK-NEXT: Has Types: true +; CHECK-NEXT: Has IDs: false +; CHECK-NEXT: Has Globals: true +; CHECK-NEXT: Has Publics: true +; CHECK-NEXT: Is incrementally linked: false +; CHECK-NEXT: Has conflicting types: false +; CHECK-NEXT: Is stripped: true + +; CHECK: Streams +; CHECK-NEXT: ============================================================ +; CHECK-NEXT: Stream 0 ( 3320 bytes): [Old MSF Directory] +; CHECK-NEXT: Blocks: [4, 5, 821, 822] +; CHECK-NEXT: Stream 1 ( 74 bytes): [PDB Stream] +; CHECK-NEXT: Blocks: [816] +; CHECK-NEXT: Stream 2 ( 56 bytes): [TPI Stream] +; CHECK-NEXT: Blocks: [815] +; CHECK-NEXT: Stream 3 (184963 bytes): [DBI Stream] +; CHECK-NEXT: Blocks: [6, 635, 636, 637, 638, 639, 640, 641, 642, 643, 644, 645, 646, 647, 648, 649, 650, 651, 652, 653, 654, 655, 656, 657, 658, 659, 660, 661, 662, 663, 664, 665, 666, 667, 668, 669, 670, 671, 672, 673, 674, 675, 676, 677, 678, 679, 680, 681, 682, 683, 684, 685, 686, 687, 688, 689, 690, 691, 692, 693, 694, 695, 696, 697, 698, 699, 700, 701, 702, 703, 704, 705, 706, 707, 708, 709, 710, 711, 712, 713, 714, 715, 716, 717, 718, 719, 720, 721, 722, 723, 724, 725, 726, 727, 728, 729, 730, 731, 732, 733, 734, 735, 736, 737, 738, 739, 740, 741, 742, 743, 744, 745, 746, 747, 748, 749, 750, 751, 752, 753, 754, 755, 756, 757, 758, 759, 760, 761, 762, 763, 764, 765, 766, 767, 768, 769, 770, 771, 772, 773, 774, 775, 776, 777, 778, 779, 780, 781, 782, 783, 784, 785, 786, 787, 788, 789, 790, 791, 792, 793, 794, 795, 796, 797, 798, 799, 800, 801, 802, 803, 804, 805, 806, 807, 808, 809, 810, 811, 812, 813, 814] +; CHECK-NEXT: Stream 4 ( 0 bytes): [IPI Stream] +; CHECK-NEXT: Blocks: [] +; CHECK-NEXT: Stream 5 ( 26836 bytes): [Xdata] +; CHECK-NEXT: Blocks: [7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33] +; CHECK-NEXT: Stream 6 ( 25172 bytes): [Pdata] +; CHECK-NEXT: Blocks: [34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58] +; CHECK-NEXT: Stream 7 ( 240 bytes): [Section Header Original Data] +; CHECK-NEXT: Blocks: [59] +; CHECK-NEXT: Stream 8 (208512 bytes): [Omap To Source Data] +; CHECK-NEXT: Blocks: [60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, 263] +; CHECK-NEXT: Stream 9 (237672 bytes): [Omap From Source Data] +; CHECK-NEXT: Blocks: [264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351, 352, 353, 354, 355, 356, 357, 358, 359, 360, 361, 362, 363, 364, 365, 366, 367, 368, 369, 370, 371, 372, 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, 383, 384, 385, 386, 387, 388, 389, 390, 391, 392, 393, 394, 395, 396, 397, 398, 399, 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 419, 420, 421, 422, 423, 424, 425, 426, 427, 428, 429, 430, 431, 432, 433, 434, 435, 436, 437, 438, 439, 440, 441, 442, 443, 444, 445, 446, 447, 448, 449, 450, 451, 452, 453, 454, 455, 456, 457, 458, 459, 460, 461, 462, 463, 464, 465, 466, 467, 468, 469, 470, 471, 472, 473, 474, 475, 476, 477, 478, 479, 480, 481, 482, 483, 484, 485, 486, 487, 488, 489, 490, 491, 492, 493, 494, 495, 496] +; CHECK-NEXT: Stream 10 ( 240 bytes): [Section Header Data] +; CHECK-NEXT: Blocks: [497] +; CHECK-NEXT: Stream 11 ( 16 bytes): [Global Symbol Hash] +; CHECK-NEXT: Blocks: [498] +; CHECK-NEXT: Stream 12 ( 33552 bytes): [Public Symbol Hash] +; CHECK-NEXT: Blocks: [532, 500, 501, 502, 503, 504, 505, 506, 507, 508, 509, 510, 511, 512, 513, 514, 515, 516, 517, 518, 519, 520, 521, 522, 523, 524, 525, 526, 527, 528, 529, 530, 531] +; CHECK-NEXT: Stream 13 (103996 bytes): [Symbol Records] +; CHECK-NEXT: Blocks: [499, 533, 534, 535, 536, 537, 538, 539, 540, 541, 542, 543, 544, 545, 546, 547, 548, 549, 550, 551, 552, 553, 554, 555, 556, 557, 558, 559, 560, 561, 562, 563, 564, 565, 566, 567, 568, 569, 570, 571, 572, 573, 574, 575, 576, 577, 578, 579, 580, 581, 582, 583, 584, 585, 586, 587, 588, 589, 590, 591, 592, 593, 594, 595, 596, 597, 598, 599, 600, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 613, 614, 615, 616, 617, 618, 619, 620, 621, 622, 623, 624, 625, 626, 627, 628, 629, 630, 631, 632, 633] +; CHECK-NEXT: Stream 14 ( 0 bytes): [TPI Hash] +; CHECK-NEXT: Blocks: [] + +; CHECK: Module Stats +; CHECK-NEXT: ============================================================ + +; CHECK: S_UDT Record Stats +; CHECK-NEXT: ============================================================ + +; CHECK: String Table +; CHECK-NEXT: ============================================================ + +; CHECK: Modules +; CHECK-NEXT: ============================================================ + +; CHECK: Files +; CHECK-NEXT: ============================================================ + +; CHECK: Lines +; CHECK-NEXT: ============================================================ + +; CHECK: Inlinee Lines +; CHECK-NEXT: ============================================================ + +; CHECK: Cross Module Imports +; CHECK-NEXT: ============================================================ + +; CHECK: Cross Module Exports +; CHECK-NEXT: ============================================================ + +; CHECK: Old FPO Data +; CHECK-NEXT: ============================================================ + +; CHECK: New FPO Data +; CHECK-NEXT: ============================================================ + +; CHECK: Types (TPI Stream) +; CHECK-NEXT: ============================================================ + +; CHECK: Types (IPI Stream) +; CHECK-NEXT: ============================================================ + +; CHECK: Global Symbols +; CHECK-NEXT: ============================================================ + +; CHECK: Public Symbols +; CHECK-NEXT: ============================================================ + +; CHECK: Symbols +; CHECK-NEXT: ============================================================ + +; CHECK: Section Headers +; CHECK-NEXT: ============================================================ + +; CHECK: Original Section Headers +; CHECK-NEXT: ============================================================ + +; CHECK: Section Contributions +; CHECK-NEXT: ============================================================ + +; CHECK: Section Map +; CHECK-NEXT: ============================================================ + + Index: test/tools/llvm-pdbdump/symbol-filters.test =================================================================== --- test/tools/llvm-pdbdump/symbol-filters.test +++ test/tools/llvm-pdbdump/symbol-filters.test @@ -1,3 +1,5 @@ +; REQUIRES: diasdk + ; RUN: llvm-pdbutil pretty -globals -module-syms -sym-types=data %p/Inputs/FilterTest.pdb \ ; RUN: | FileCheck --check-prefix=ONLY_DATA %s Index: test/tools/llvm-pdbdump/type-qualifiers.test =================================================================== --- test/tools/llvm-pdbdump/type-qualifiers.test +++ test/tools/llvm-pdbdump/type-qualifiers.test @@ -1,3 +1,5 @@ +; REQUIRES: diasdk + ; RUN: llvm-pdbutil pretty -all -class-recurse-depth=1 \ ; RUN: %p/Inputs/TypeQualifiersTest.pdb > %t ; RUN: FileCheck -input-file=%t %s -check-prefix=GLOBALS_FUNC Index: test/tools/llvm-pdbdump/usingnamespace.test =================================================================== --- test/tools/llvm-pdbdump/usingnamespace.test +++ test/tools/llvm-pdbdump/usingnamespace.test @@ -1,3 +1,5 @@ +; REQUIRES: diasdk + ; RUN: llvm-pdbutil pretty -module-syms %p/Inputs/UsingNamespaceTest.pdb > %t ; RUN: FileCheck -input-file=%t %s Index: tools/llvm-pdbutil/DumpOutputStyle.cpp =================================================================== --- tools/llvm-pdbutil/DumpOutputStyle.cpp +++ tools/llvm-pdbutil/DumpOutputStyle.cpp @@ -250,7 +250,7 @@ static StatCollection getSymbolStats(const SymbolGroup &SG, StatCollection &CumulativeStats) { StatCollection Stats; - if (SG.getFile().isPdb()) { + if (SG.getFile().isPdb() && SG.hasDebugStream()) { // For PDB files, all symbols are packed into one stream. for (const auto &S : SG.getPdbModuleStream().symbols(nullptr)) { Stats.update(S.kind(), S.length()); @@ -1420,19 +1420,21 @@ P.formatLine("TI: {0}, Offset: {1}", IO.Type, fmtle(IO.Offset)); } - P.NewLine(); - P.formatLine("Hash Adjusters:"); - auto &Adjusters = Stream.getHashAdjusters(); - auto &Strings = Err(getPdb().getStringTable()); - for (const auto &A : Adjusters) { - AutoIndent Indent2(P); - auto ExpectedStr = Strings.getStringForID(A.first); - TypeIndex TI(A.second); - if (ExpectedStr) - P.formatLine("`{0}` -> {1}", *ExpectedStr, TI); - else { - P.formatLine("unknown str id ({0}) -> {1}", A.first, TI); - consumeError(ExpectedStr.takeError()); + if (getPdb().hasPDBStringTable()) { + P.NewLine(); + P.formatLine("Hash Adjusters:"); + auto &Adjusters = Stream.getHashAdjusters(); + auto &Strings = Err(getPdb().getStringTable()); + for (const auto &A : Adjusters) { + AutoIndent Indent2(P); + auto ExpectedStr = Strings.getStringForID(A.first); + TypeIndex TI(A.second); + if (ExpectedStr) + P.formatLine("`{0}` -> {1}", *ExpectedStr, TI); + else { + P.formatLine("unknown str id ({0}) -> {1}", A.first, TI); + consumeError(ExpectedStr.takeError()); + } } } } Index: tools/llvm-pdbutil/InputFile.h =================================================================== --- tools/llvm-pdbutil/InputFile.h +++ tools/llvm-pdbutil/InputFile.h @@ -110,6 +110,8 @@ const InputFile &getFile() const { return *File; } InputFile &getFile() { return *File; } + bool hasDebugStream() const { return DebugStream != nullptr; } + private: void initializeForPdb(uint32_t Modi); void updatePdbModi(uint32_t Modi); Index: tools/llvm-pdbutil/InputFile.cpp =================================================================== --- tools/llvm-pdbutil/InputFile.cpp +++ tools/llvm-pdbutil/InputFile.cpp @@ -116,10 +116,6 @@ return formatUnknownEnum(Kind); } -static const DebugStringTableSubsectionRef &extractStringTable(PDBFile &File) { - return cantFail(File.getStringTable()).getStringTable(); -} - template static void formatInternal(LinePrinter &Printer, bool Append, Args &&... args) { if (Append) @@ -168,8 +164,13 @@ // PDB always uses the same string table, but each module has its own // checksums. So we only set the strings if they're not already set. - if (!SC.hasStrings()) - SC.setStrings(extractStringTable(File->pdb())); + if (!SC.hasStrings()) { + auto StringTable = File->pdb().getStringTable(); + if (StringTable) + SC.setStrings(StringTable->getStringTable()); + else + consumeError(StringTable.takeError()); + } SC.resetChecksums(); auto MDS = getModuleDebugStream(File->pdb(), Name, Modi);