[llvm-pdbdump] [yaml2pdb] always include object file name in module info

[inglorion]

Summary

Previously, the yaml2pdb subcommand of llvm-pdbdump only
included object file names in module info if a module info stream was
present. This change makes it so that we include the object file name
even if there is no module info stream for the module. As a result,
running
llvm-pdbdump pdb2yaml -dbi-module-info original.pdb > original.yaml &&
llvm-pdbdump yaml2pdb -pdb=new.pdb original.yaml && llvm-pdbdump
pdb2yaml -dbi-module-info new.pdb > new.yaml now produces identical
original.yaml and new.yaml files.

[zturner]

Can you add a test for this? It's really easy to generate yaml -> pdb tests now, just write a yaml file with everything cut out except for the fields you care about. It should pick up default values for everything else. Take a look at test\DebugInfo\PDB\Inputs\one-symbol.yaml for an example.

[inglorion]

added test

[zturner]

test/DebugInfo/PDB/pdbdump-objfilename.yaml

6–7

Seems better to check the entire text rather than just one field, which would match regardless of what the output looked like, as long as that text appeared. How about:

CHECK:      DbiStream
CHECK-NEXT:   Modules
CHECK-NEXT:     - Module:[[ *]]'C:\src\test.obj'
CHECK-NEXT:       ObjFile:[[ *]]'C:\src\test.obj'

[inglorion]

stricter check

[inglorion]

test/DebugInfo/PDB/pdbdump-objfilename.yaml

6–7

I made the check a little stricter. "Modules:" is still CHECK instead of CHECK-NEXT, because otherwise we would fail because of other fields that I don't think we care about in this test.

test/DebugInfo/PDB/pdbdump-objfilename.yaml

+# RUN: llvm-pdbdump yaml2pdb -pdb=%T/objfilename.pdb %s
+# RUN: llvm-pdbdump pdb2yaml -dbi-module-info %T/objfilename.pdb \
+# RUN:     | FileCheck %s
+#
+# CHECK: DbiStream:
+# CHECK: Modules:
+# CHECK-NEXT: - Module:{{ *}}'C:\src\test.obj'
+# CHECK-NEXT: ObjFile:{{ *}}'C:\src\test.obj'
+---
+DbiStream:
+  Modules:
+    - Module:          'C:\src\test.obj'
+      ObjFile:         'C:\src\test.obj'
+...

tools/llvm-pdbdump/llvm-pdbdump.cpp

static void yamlToPdb(StringRef Path) {
   DbiBuilder.setBuildNumber(Dbi.BuildNumber);
   DbiBuilder.setFlags(Dbi.Flags);
   DbiBuilder.setMachineType(Dbi.MachineType);
   DbiBuilder.setPdbDllRbld(Dbi.PdbDllRbld);
   DbiBuilder.setPdbDllVersion(Dbi.PdbDllVersion);
   DbiBuilder.setVersionHeader(Dbi.VerHeader);
   for (const auto &MI : Dbi.ModInfos) {
     auto &ModiBuilder = ExitOnErr(DbiBuilder.addModuleInfo(MI.Mod));
+    ModiBuilder.setObjFileName(MI.Obj);
 
     for (auto S : MI.SourceFiles)
       ExitOnErr(DbiBuilder.addModuleSourceFile(MI.Mod, S));
     if (MI.Modi.hasValue()) {
       const auto &ModiStream = *MI.Modi;
-      ModiBuilder.setObjFileName(MI.Obj);
       for (auto Symbol : ModiStream.Symbols)
         ModiBuilder.addSymbol(Symbol.Record);
     }
     if (MI.FileLineInfo.hasValue()) {
       const auto &FLI = *MI.FileLineInfo;
 
       // File Checksums must be emitted before line information, because line
       // info records use offsets into the checksum buffer to reference a file's