Improve consistency and flexibility with llvm-pdbdump subcommands

[zturner]

Summary

We had the pdb2yaml and raw options which each dumped pdb in a different way. But many of the options were effectively the same, but spelled differently. For example, we had:

    pdb2yaml            |     raw
---------------------------------------
-dbi-module-syms        | -module-syms
-dbi-module-info        | -modules
-dbi-module-source-info | -module-files
-dbi-module-lines	     | -line-info

Furthermore, they didn't appear in the same categories in their respective subcommands, had different help text, stored the results in different variables, etc. So this patch aims to fix all of that by having one set of variables that are shared among subcommands.

At the same time, we need to improve the granularity by which we can dump module subsections. Previously, line-info and dbi-module-lines really means "dump all the subsections of each module's debug stream". But some of those subsections are actually not about lines at all. There's Frame Data, Checksums, even symbols can show up. What we'd really like is a way to specify exactly which subsections are dumped. So the -line-info is changed to an enum value that looks like this:

-subsections              - dump subsections from each module's debug stream
  =cme                    -   Cross module exports (DEBUG_S_CROSSSCOPEEXPORTS subsection)
  =cmi                    -   Cross module imports (DEBUG_S_CROSSSCOPEIMPORTS subsection)
  =fc                     -   File checksums (DEBUG_S_CHECKSUMS subsection)
  =ilines                 -   Inlinee lines (DEBUG_S_INLINEELINES subsection)
  =lines                  -   Lines (DEBUG_S_LINES subsection)
  =all                    -   All known subsections

and you can specify one or more of these values separated by commas. This makes it easy to add support for other subsections in future patches. Another benefit is that it allows us to consolidate some of the tests. I was able to convert 3 different tests which did mostly the same thing but with different subsections into a single test which tests all subsections at once.

[inglorion]

I would like to change the changes to these option names to coincide with renaming llvm-pdbdump to llvm-pdbtool (or some such) so that we only break the interface once.

While we're at it - how much value is there in having both yaml and raw that is almost the same, but with slightly different syntax? I've added some code to dump things in raw format before we understood what they meant, but I think now that we can dump pretty much everything as YAML, we should consider removing raw. Again, that breaks the API, so the introduction of llvm-pdbtool seems like a good time to do it.

llvm/test/DebugInfo/PDB/Inputs/debug-subsections.yaml

1

Why does this change?

[inglorion]

Oops, I submitted that before I was done reviewing. More comments probably coming soon.

[zturner]

I don't mind submitting it as a followup, but I think it's a bad idea to submit it at the same time. While you're right that it only breaks the interface once to do it together, I don't think anyone is really depending on the interface that much, and changing the name is already going to be a rather huge change that is like 100% boilerplate

llvm/test/DebugInfo/PDB/Inputs/debug-subsections.yaml

1

It shouldn't, that looks like a copy paste error.

[inglorion]

Thanks for doing this, zturner! I have some more inline comments and questions.

llvm/test/DebugInfo/PDB/pdbdump-readwrite.test

1–2

While thinking about this: What does -dbi-stream mean? Is it useful to specify -dbi-stream without any of the additional enabling flags like -modules?

Also, should we at some point change this test to use -all instead of the various individual options?

llvm/tools/llvm-pdbdump/YAMLOutputStyle.cpp

47

Please remove the commented-out code (also further down).

124

Since you're changing this - would it make sense to rewrite this

if (!opts::pdb2yaml::StringTable && !opts::shared::DumpModuleFiles && opts::shared::DumpModuleSubsections.empty()))
  return Error::success();

?

llvm/tools/llvm-pdbdump/llvm-pdbdump.cpp

887

Can you make a function that enables all shared options and call that from the places where we handle -all for pdb2yaml and raw? That way, the code that handles -all for pdb2yaml is all in one place, and the code that handles -all for raw is all in one place, instead of both being partially here and partially where they are now.

[inglorion]

Hmm, good point. I hadn't considered that changing the name in the same change would mix a lot of mechanical changes with actual interesting to review changes. Let's keep them in two separate changes, then. Can you land them close together in time, though?

[zturner]

In D33996#776225, @inglorion wrote:

While we're at it - how much value is there in having both yaml and raw that is almost the same, but with slightly different syntax? I've added some code to dump things in raw format before we understood what they meant, but I think now that we can dump pretty much everything as YAML, we should consider removing raw.

I've been thinking about what to do here, and I think there is a better option. We should change raw mode to be more concise. raw was originally supposed to be for human consumption while yaml was for machine consumption. But they are equally verbose, and there's no clear argument that raw is more readable than yaml. It might even be worse. So what I've been thinking about is changing raw to be very compressed. For example, instead of this:

D:\foo> llvm-pdbdump raw -all foo.pdb
FileHeaders {
  BlockSize: 4096
  FreeBlockMap: 2
  NumBlocks: 1145
  NumDirectoryBytes: 5484
  Unknown1: 0
  BlockMapAddr: 1143
  NumDirectoryBlocks: 2
  DirectoryBlocks: [1141, 1142]
  NumStreams: 236
}
Streams [
  Stream 0: [Old MSF Directory] (40 bytes)
  Stream 1: [PDB Stream] (118 bytes)
  Stream 2: [TPI Stream] (407284 bytes)
  Stream 3: [DBI Stream] (210538 bytes)
  Stream 4: [IPI Stream] (496844 bytes)
  Stream 5: [Named Stream "/LinkInfo"] (0 bytes)
...
PDB Stream {
  Version: 20000404
  Signature: 0x59303684
  Age: 2
  Guid: {6EE2E173-08F2-BF4D-AA11-4734E99F4974}
  Features: 0x1
  Named Streams {
    /names: 6
    /LinkInfo: 5
    /src/headerblock: 233
  }
}
Type Info Stream (TPI) {
  TPI Version: 20040203
  Record count: 8478
  Records [
    {
      ArgList (0x1000) {
        TypeLeafKind: LF_ARGLIST (0x1201)
        NumArgs: 0
        Arguments [
        ]
      }
    }
    {
      Procedure (0x1001) {
        TypeLeafKind: LF_PROCEDURE (0x1008)
        ReturnType: void (0x3)
        CallingConvention: NearC (0x0)
        FunctionOptions [ (0x0)
        ]
        NumParameters: 0
        ArgListType: () (0x1000)
      }
    }

We print this:

D:\foo> llvm-pdbdump raw -all foo.pdb
MSF [BlockSize=4096, FreeBlockMap=2, NumBlocks=1145, DirSize=5484, BlockMapAddr=1143, NumDirBlocks=2, Streams=236]

Streams [
  Stream 0: [Old MSF Directory] (40 bytes)
  Stream 1: [PDB Stream] (118 bytes)
  Stream 2: [TPI Stream] (407284 bytes)
  Stream 3: [DBI Stream] (210538 bytes)
  Stream 4: [IPI Stream] (496844 bytes)
  Stream 5: [Named Stream "/LinkInfo"] (0 bytes)
  ...
]

PDB Stream [Ver: 20000404, Sig: 0x59303684, Age: 2, Guid: {6EE2E173-08F2-BF4D-AA11-4734E99F4974}, Features: 0x1]
  Named Streams {
    /names: 6
    /LinkInfo: 5
    /src/headerblock: 233
  }
  
TPI Stream [Ver: 20040203]
  Records [
    TI: 0x1000 - LF_ARGLIST (0x1201) {}
    TI: 0x1001 - LF_PROCEDURE (0x1001) { Ret: void (0x03), Conv: NearC (0x0), Options: 0x0, Args: () (0x1000)}
    ...
  ]

or some such.

[zturner]

In D33996#776278, @inglorion wrote:

Hmm, good point. I hadn't considered that changing the name in the same change would mix a lot of mechanical changes with actual interesting to review changes. Let's keep them in two separate changes, then. Can you land them close together in time, though?

I can try. I have about 5 changes in the pipeline, and I need to get those in first or I will have to do a ton of work to rewrite them after changing the tool name. But I can do it after I land those changes.

[zturner]

llvm/test/DebugInfo/PDB/pdbdump-readwrite.test

1–2

If you specify -dbi-stream with nothing else it just dumps the header fields. Perhaps a better way to organize all these options is to make them all by enum lists like I did with -subsections, then you could write: -dbi=headers,modules,files,etc. Another option would be to make it so we don't do the hierarchical display at all, but instead make each option independent. Then if you specified -dbi-headers -modules -files you'd get something like:

DBI Headers
--------------
...

Modules
--------------
...

Files
--------------

It's a little bit easier to do things from this method, but it's a little more separated from the underlying file structure which is kind of disadvantageous.

[zturner]

Updated with suggestions.

[zturner]

Update

[inglorion]

llvm/tools/llvm-pdbdump/YAMLOutputStyle.cpp

47

Looks like there's still a line of commented-out code.

llvm/tools/llvm-pdbdump/llvm-pdbdump.cpp

901

That takes care of some of the scattering of the code, but most of the code for pdb2yaml::All is still in YAMLOutput.cpp. Did you intend to move that here, too?

[zturner]

llvm/tools/llvm-pdbdump/YAMLOutputStyle.cpp

47

Removed offline.

llvm/tools/llvm-pdbdump/llvm-pdbdump.cpp

901

No because none of that is related to the shared options. You only mentioned handling the shared options in a common place.

[inglorion]

llvm/tools/llvm-pdbdump/llvm-pdbdump.cpp

901

Apologies if I did not express myself clearly. What I meant is that the implementation of -all is scattered. For raw, we have this block here, and the block a few lines down under if (opts::RawSubcommand). For pdb2yaml, we have this block here, and the code in YAMLOutputStyle::dump in YAMLOutputStyle.cpp. So there are two places where we check opts::raw::RawAll and do something, and two places where we check opts::pdb2yaml::All and do something. My proposal was intended to bring that down to one place for opts::raw::RawAll and one for opts::pdb2yaml::All.

Alternatively, I would also be ok if you moved all the code for handing both opts::raw::RawAll and opts::pdb2yaml::All here. That's what I thought you were doing, but I see now that it wasn't.

I have a slight preference for the first way, but the second way is fine with me, too. The main thing I want is to have neither pdb2yaml::All or raw::RawAll broken up into pieces that are far apart.

[zturner]

llvm/tools/llvm-pdbdump/llvm-pdbdump.cpp

901

Ok, I can do that. I think the second way might be easier, just because pdb2yaml All and raw All have some subtle differences.

In the future, if I go forwad with the idea to change raw to be more compressed for human readability, then we can abandon the requirement for the output to map closely to the file format (since we have pdb2yaml for that), and then a lot of the option decisions can be simplified I think.

[zturner]

So the lines being deleted thing is happening when one patch uses full context and the next doesn't. Re-upped with full context

[inglorion]

Thanks! lgtm

llvm/test/DebugInfo/PDB/Inputs/cross-module-import-export.yaml

-DbiStream:       
-  Modules:         
-    - Module:          'Foo.obj'
-      ObjFile:         'Foo.obj'
-      Subsections:     
-        - !CrossModuleExports
-          Exports:         
-            - LocalId:         4852
-              GlobalId:        9283
-            - LocalId:         2147487875
-              GlobalId:        9123
-    - Module:          'Bar.obj'
-      ObjFile:         'Bar.obj'
-      Subsections:     
-        - !CrossModuleExports
-          Exports:         
-            - LocalId:         4265
-              GlobalId:        6097
-            - LocalId:         4297
-              GlobalId:        4677
-        - !CrossModuleImports
-          Imports:         
-            - Module:          'Foo.obj'
-              Imports:         [ 4852, 2147487875 ]

llvm/test/DebugInfo/PDB/Inputs/debug-subsections.yaml

+DbiStream:       
+  Modules:         
+    - Module:          'Foo.obj'
+      ObjFile:         'Foo.obj'
+      Subsections:     
+        - !CrossModuleExports
+          Exports:         
+            - LocalId:         4852
+              GlobalId:        9283
+            - LocalId:         2147487875
+              GlobalId:        9123
+    - Module:          'Bar.obj'
+      ObjFile:         'Bar.obj'
+      Subsections:     
+        - !CrossModuleExports
+          Exports:         
+            - LocalId:         4265
+              GlobalId:        6097
+            - LocalId:         4297
+              GlobalId:        4677
+        - !CrossModuleImports
+          Imports:         
+            - Module:          'Foo.obj'
+              Imports:         [ 4852, 2147487875 ]
+    - Module:          'd:\src\llvm\test\DebugInfo\PDB\Inputs\empty.obj'
+      ObjFile:         'd:\src\llvm\test\DebugInfo\PDB\Inputs\empty.obj'
+      SourceFiles:
+        - 'd:\src\llvm\test\debuginfo\pdb\inputs\empty.cpp'
+      Subsections:
+        - !FileChecksums
+          Checksums:
+            - FileName:        'd:\src\llvm\test\debuginfo\pdb\inputs\empty.cpp'
+              Kind:            MD5
+              Checksum:        A0A5BD0D3ECD93FC29D19DE826FBF4BC
+            - FileName:        'f:\dd\externalapis\windows\10\sdk\inc\winerror.h'
+              Kind:            MD5
+              Checksum:        1154D69F5B2650196E1FC34F4134E56B
+        - !Lines
+          CodeSize:        10
+          Flags:           [  ]
+          RelocOffset:     16
+          RelocSegment:    1
+          Blocks:
+            - FileName:        'd:\src\llvm\test\debuginfo\pdb\inputs\empty.cpp'
+              Lines:
+                - Offset:          0
+                  LineStart:       5
+                  IsStatement:     true
+                  EndDelta:        0
+                - Offset:          3
+                  LineStart:       6
+                  IsStatement:     true
+                  EndDelta:        0
+                - Offset:          8
+                  LineStart:       7
+                  IsStatement:     true
+                  EndDelta:        0
+              Columns:
+        - !InlineeLines
+          HasExtraFiles:   false
+          Sites:           
+            - FileName:        'f:\dd\externalapis\windows\10\sdk\inc\winerror.h'
+              LineNum:         26950
+              Inlinee:         22767

llvm/test/DebugInfo/PDB/Inputs/simple-line-info.yaml

----
-DbiStream:
-  Modules:
-    - Module:          'd:\src\llvm\test\DebugInfo\PDB\Inputs\empty.obj'
-      ObjFile:         'd:\src\llvm\test\DebugInfo\PDB\Inputs\empty.obj'
-      SourceFiles:
-        - 'd:\src\llvm\test\debuginfo\pdb\inputs\empty.cpp'
-      Subsections:
-        - !FileChecksums
-          Checksums:
-            - FileName:        'd:\src\llvm\test\debuginfo\pdb\inputs\empty.cpp'
-              Kind:            MD5
-              Checksum:        A0A5BD0D3ECD93FC29D19DE826FBF4BC
-            - FileName:        'f:\dd\externalapis\windows\10\sdk\inc\winerror.h'
-              Kind:            MD5
-              Checksum:        1154D69F5B2650196E1FC34F4134E56B
-        - !Lines
-          CodeSize:        10
-          Flags:           [  ]
-          RelocOffset:     16
-          RelocSegment:    1
-          Blocks:
-            - FileName:        'd:\src\llvm\test\debuginfo\pdb\inputs\empty.cpp'
-              Lines:
-                - Offset:          0
-                  LineStart:       5
-                  IsStatement:     true
-                  EndDelta:        0
-                - Offset:          3
-                  LineStart:       6
-                  IsStatement:     true
-                  EndDelta:        0
-                - Offset:          8
-                  LineStart:       7
-                  IsStatement:     true
-                  EndDelta:        0
-              Columns:
-        - !InlineeLines
-          HasExtraFiles:   false
-          Sites:           
-            - FileName:        'f:\dd\externalapis\windows\10\sdk\inc\winerror.h'
-              LineNum:         26950
-              Inlinee:         22767
-...

llvm/test/DebugInfo/PDB/cross-module-import-export.test

-; RUN: llvm-pdbdump yaml2pdb -pdb=%t.pdb %p/Inputs/cross-module-import-export.yaml
-
-; RUN: llvm-pdbdump pdb2yaml -all -no-file-headers %t.pdb | FileCheck --check-prefix=YAML %s
-; RUN: llvm-pdbdump raw -all %t.pdb | FileCheck --check-prefix=RAW %s
-
-YAML:      Modules:
-YAML-NEXT:   - Module:          Foo.obj
-YAML-NEXT:     ObjFile:         Foo.obj
-YAML-NEXT:     Subsections:
-YAML-NEXT:       - !CrossModuleExports
-YAML-NEXT:         Exports:
-YAML-NEXT:           - LocalId:         4852
-YAML-NEXT:             GlobalId:        9283
-YAML-NEXT:           - LocalId:         2147487875
-YAML-NEXT:             GlobalId:        9123
-YAML:        - Module:          Bar.obj
-YAML-NEXT:     ObjFile:         Bar.obj
-YAML-NEXT:     Subsections:
-YAML-NEXT:       - !CrossModuleExports
-YAML-NEXT:         Exports:
-YAML-NEXT:           - LocalId:         4265
-YAML-NEXT:             GlobalId:        6097
-YAML-NEXT:           - LocalId:         4297
-YAML-NEXT:             GlobalId:        4677
-YAML-NEXT:       - !CrossModuleImports
-YAML-NEXT:         Imports:
-YAML-NEXT:           - Module:          Foo.obj
-YAML-NEXT:             Imports:         [ 4852, 2147487875 ]
-
-
-RAW:      DBI Stream {
-RAW:        Modules [
-RAW-NEXT:     {
-RAW-NEXT:       Name: Foo.obj
-RAW:            LineInfo [
-RAW-NEXT:         CrossModuleExports {
-RAW-NEXT:           Local: 0x12F4
-RAW-NEXT:           Global: 0x2443
-RAW-NEXT:           Local: 0x80001083
-RAW-NEXT:           Global: 0x23A3
-RAW-NEXT:         }
-RAW-NEXT:       ]
-RAW-NEXT:     }
-RAW-NEXT:     {
-RAW-NEXT:       Name: Bar.obj
-RAW:            LineInfo [
-RAW-NEXT:         CrossModuleExports {
-RAW-NEXT:           Local: 0x10A9
-RAW-NEXT:           Global: 0x17D1
-RAW-NEXT:           Local: 0x10C9
-RAW-NEXT:           Global: 0x1245
-RAW-NEXT:         }
-RAW-NEXT:         CrossModuleImports {
-RAW-NEXT:           Module: Foo.obj
-RAW-NEXT:           Imports: [0x12F4, 0x80001083]
-RAW-NEXT:         }
-RAW-NEXT:       ]
-RAW-NEXT:     }
-RAW-NEXT:   ]
-RAW-NEXT: }
 

llvm/test/DebugInfo/PDB/pdb-minimal-construct.test

-; This testcase verifies that we can produce a minimal PDB, while
-; serving as an example for how to construct a minimal PDB for other
-; testcases.  It takes as input a small fragment of hand-written yaml
-; that specifies nothing about the PDB other than a definition of one
-; symbol that it contains.  Then it produces a PDB, and uses the
-; resulting PDB to go back to yaml, and verify that the resulting yaml
-; is identical.
-
-; RUN: llvm-pdbdump yaml2pdb -pdb=%t.pdb %p/Inputs/one-symbol.yaml
-; RUN: llvm-pdbdump pdb2yaml -minimal -dbi-module-syms -no-file-headers %t.pdb > %t.pdb.yaml
-; RUN: diff -b %p/Inputs/one-symbol.yaml %t.pdb.yaml
+; This testcase verifies that we can produce a minimal PDB, while
+; serving as an example for how to construct a minimal PDB for other
+; testcases.  It takes as input a small fragment of hand-written yaml
+; that specifies nothing about the PDB other than a definition of one
+; symbol that it contains.  Then it produces a PDB, and uses the
+; resulting PDB to go back to yaml, and verify that the resulting yaml
+; is identical.
+
+; RUN: llvm-pdbdump yaml2pdb -pdb=%t.pdb %p/Inputs/one-symbol.yaml
+; RUN: llvm-pdbdump pdb2yaml -minimal -module-syms -no-file-headers %t.pdb > %t.pdb.yaml
+; RUN: diff -b %p/Inputs/one-symbol.yaml %t.pdb.yaml

llvm/test/DebugInfo/PDB/pdb-yaml-symbols.test

-; RUN: llvm-pdbdump pdb2yaml -dbi-module-syms %p/Inputs/empty.pdb \
+; RUN: llvm-pdbdump pdb2yaml -module-syms %p/Inputs/empty.pdb \
 ; RUN:   | FileCheck -check-prefix=YAML %s
 
 

llvm/test/DebugInfo/PDB/pdbdump-debug-subsections.test

+; RUN: llvm-pdbdump yaml2pdb -pdb=%t.pdb %p/Inputs/debug-subsections.yaml
+
+; RUN: llvm-pdbdump pdb2yaml -all -no-file-headers %t.pdb | FileCheck --check-prefix=YAML %s
+; RUN: llvm-pdbdump raw -subsections=all %t.pdb | FileCheck --check-prefix=RAW %s
+
+YAML:      Modules:
+YAML-NEXT:   - Module:          Foo.obj
+YAML-NEXT:     ObjFile:         Foo.obj
+YAML-NEXT:     Subsections:
+YAML-NEXT:       - !CrossModuleExports
+YAML-NEXT:         Exports:
+YAML-NEXT:           - LocalId:         4852
+YAML-NEXT:             GlobalId:        9283
+YAML-NEXT:           - LocalId:         2147487875
+YAML-NEXT:             GlobalId:        9123
+YAML:        - Module:          Bar.obj
+YAML-NEXT:     ObjFile:         Bar.obj
+YAML-NEXT:     Subsections:
+YAML-NEXT:       - !CrossModuleExports
+YAML-NEXT:         Exports:
+YAML-NEXT:           - LocalId:         4265
+YAML-NEXT:             GlobalId:        6097
+YAML-NEXT:           - LocalId:         4297
+YAML-NEXT:             GlobalId:        4677
+YAML-NEXT:       - !CrossModuleImports
+YAML-NEXT:         Imports:
+YAML-NEXT:           - Module:          Foo.obj
+YAML-NEXT:             Imports:         [ 4852, 2147487875 ]
+YAML:       - Module:          'd:\src\llvm\test\DebugInfo\PDB\Inputs\empty.obj'
+YAML-NEXT:    ObjFile:         'd:\src\llvm\test\DebugInfo\PDB\Inputs\empty.obj'
+YAML-NEXT:    SourceFiles:
+YAML-NEXT:      - 'd:\src\llvm\test\debuginfo\pdb\inputs\empty.cpp'
+YAML-NEXT:    Subsections:
+YAML-NEXT:      - !FileChecksums
+YAML-NEXT:        Checksums:
+YAML-NEXT:          - FileName:        'd:\src\llvm\test\debuginfo\pdb\inputs\empty.cpp'
+YAML-NEXT:            Kind:            MD5
+YAML-NEXT:            Checksum:        A0A5BD0D3ECD93FC29D19DE826FBF4BC
+YAML-NEXT:          - FileName:        'f:\dd\externalapis\windows\10\sdk\inc\winerror.h'
+YAML-NEXT:            Kind:            MD5
+YAML-NEXT:            Checksum:        1154D69F5B2650196E1FC34F4134E56B
+YAML-NEXT:      - !Lines
+YAML-NEXT:        CodeSize:        10
+YAML-NEXT:        Flags:           [  ]
+YAML-NEXT:        RelocOffset:     16
+YAML-NEXT:        RelocSegment:    1
+YAML-NEXT:        Blocks:
+YAML-NEXT:          - FileName:        'd:\src\llvm\test\debuginfo\pdb\inputs\empty.cpp'
+YAML-NEXT:            Lines:
+YAML-NEXT:              - Offset:          0
+YAML-NEXT:                LineStart:       5
+YAML-NEXT:                IsStatement:     true
+YAML-NEXT:                EndDelta:        0
+YAML-NEXT:              - Offset:          3
+YAML-NEXT:                LineStart:       6
+YAML-NEXT:                IsStatement:     true
+YAML-NEXT:                EndDelta:        0
+YAML-NEXT:              - Offset:          8
+YAML-NEXT:                LineStart:       7
+YAML-NEXT:                IsStatement:     true
+YAML-NEXT:                EndDelta:        0
+YAML-NEXT:            Columns:
+YAML-NEXT:      - !InlineeLines
+YAML-NEXT:        HasExtraFiles:   false
+YAML-NEXT:        Sites:           
+YAML-NEXT:          - FileName:        'f:\dd\externalapis\windows\10\sdk\inc\winerror.h'
+YAML-NEXT:            LineNum:         26950
+YAML-NEXT:            Inlinee:         22767
+
+
+RAW:      DBI Stream {
+RAW:        Modules [
+RAW-NEXT:     {
+RAW-NEXT:       Name: Foo.obj
+RAW:            Subsections [
+RAW-NEXT:         CrossModuleExports {
+RAW-NEXT:           Local: 0x12F4
+RAW-NEXT:           Global: 0x2443
+RAW-NEXT:           Local: 0x80001083
+RAW-NEXT:           Global: 0x23A3
+RAW-NEXT:         }
+RAW-NEXT:       ]
+RAW-NEXT:     }
+RAW-NEXT:     {
+RAW-NEXT:       Name: Bar.obj
+RAW:            Subsections [
+RAW-NEXT:         CrossModuleExports {
+RAW-NEXT:           Local: 0x10A9
+RAW-NEXT:           Global: 0x17D1
+RAW-NEXT:           Local: 0x10C9
+RAW-NEXT:           Global: 0x1245
+RAW-NEXT:         }
+RAW-NEXT:         CrossModuleImports {
+RAW-NEXT:           Module: Foo.obj
+RAW-NEXT:           Imports: [0x12F4, 0x80001083]
+RAW-NEXT:         }
+RAW-NEXT:       ]
+RAW-NEXT:     }
+RAW-NEXT:    {
+RAW-NEXT:      Name: d:\src\llvm\test\DebugInfo\PDB\Inputs\empty.obj
+RAW:           Subsections [
+RAW-NEXT:        FileChecksums {
+RAW-NEXT:          Checksum {
+RAW-NEXT:            FileName: d:\src\llvm\test\debuginfo\pdb\inputs\empty.cpp
+RAW-NEXT:            Kind: MD5 (0x1)
+RAW-NEXT:            Checksum (
+RAW-NEXT:              0000: A0A5BD0D 3ECD93FC 29D19DE8 26FBF4BC  |....>...)...&...|
+RAW-NEXT:            )
+RAW-NEXT:          }
+RAW-NEXT:          Checksum {
+RAW-NEXT:            FileName: f:\dd\externalapis\windows\10\sdk\inc\winerror.h
+RAW-NEXT:            Kind: MD5 (0x1)
+RAW-NEXT:            Checksum (
+RAW-NEXT:              0000: 1154D69F 5B265019 6E1FC34F 4134E56B  |.T..[&P.n..OA4.k|
+RAW-NEXT:            )
+RAW-NEXT:          }
+RAW-NEXT:        }
+RAW-NEXT:        Lines {
+RAW-NEXT:          Block {
+RAW-NEXT:            RelocSegment: 1
+RAW-NEXT:            RelocOffset: 16
+RAW-NEXT:            CodeSize: 10
+RAW-NEXT:            HasColumns: No
+RAW-NEXT:            Lines {
+RAW-NEXT:              FileName: d:\src\llvm\test\debuginfo\pdb\inputs\empty.cpp
+RAW-NEXT:              Line {
+RAW-NEXT:                Offset: 0
+RAW-NEXT:                LineNumberStart: 5
+RAW-NEXT:                EndDelta: 0
+RAW-NEXT:                IsStatement: Yes
+RAW-NEXT:              }
+RAW-NEXT:              Line {
+RAW-NEXT:                Offset: 3
+RAW-NEXT:                LineNumberStart: 6
+RAW-NEXT:                EndDelta: 0
+RAW-NEXT:                IsStatement: Yes
+RAW-NEXT:              }
+RAW-NEXT:              Line {
+RAW-NEXT:                Offset: 8
+RAW-NEXT:                LineNumberStart: 7
+RAW-NEXT:                EndDelta: 0
+RAW-NEXT:                IsStatement: Yes
+RAW-NEXT:              }
+RAW-NEXT:            }
+RAW-NEXT:          }
+RAW-NEXT:        }
+RAW-NEXT:        InlineeLines {
+RAW-NEXT:          HasExtraFiles: No
+RAW-NEXT:          Lines [
+RAW-NEXT:            Inlinee {
+RAW-NEXT:              FileName: f:\dd\externalapis\windows\10\sdk\inc\winerror.h
+RAW-NEXT:              Function {
+RAW-NEXT:                Index: 0x58ef (unknown function)
+RAW-NEXT:              }
+RAW-NEXT:              SourceLine: 26950
+RAW-NEXT:            }
+RAW-NEXT:          ]
+RAW-NEXT:        }
+RAW-NEXT:      ]
+RAW-NEXT:    }
+RAW-NEXT:  ]
+RAW-NEXT:}

llvm/test/DebugInfo/PDB/pdbdump-headers.test

 ; RUN: llvm-pdbdump raw -headers -string-table -tpi-records -tpi-record-bytes -module-syms \
 ; RUN:              -sym-record-bytes -globals -publics -module-files \
 ; RUN:              -stream-summary -stream-blocks -ipi-records -ipi-record-bytes \
-; RUN:              -section-contribs -section-map -section-headers -line-info \
+; RUN:              -section-contribs -section-map -section-headers -subsections=all \
 ; RUN:              -tpi-hash -fpo -page-stats %p/Inputs/empty.pdb | FileCheck -check-prefix=EMPTY %s
 ; RUN: llvm-pdbdump raw -all %p/Inputs/empty.pdb | FileCheck -check-prefix=ALL %s
 ; RUN: llvm-pdbdump raw -headers -modules -module-files \

 ; EMPTY-NEXT:           )
 ; EMPTY-NEXT:         }
 ; EMPTY-NEXT:       ]
-; EMPTY-NEXT:       LineInfo [
+; EMPTY-NEXT:       Subsections [
 ; EMPTY-NEXT:         FileChecksums {
 ; EMPTY-NEXT:           Checksum {
 ; EMPTY-NEXT:             FileName: d:\src\llvm\test\debuginfo\pdb\inputs\empty.cpp

 ; EMPTY-NEXT:           )
 ; EMPTY-NEXT:         }
 ; EMPTY-NEXT:       ]
-; EMPTY-NEXT:       LineInfo [
+; EMPTY-NEXT:       Subsections [
 ; EMPTY-NEXT:       ]
 ; EMPTY-NEXT:     }
 ; EMPTY-NEXT:   ]

llvm/test/DebugInfo/PDB/pdbdump-readwrite.test

-RUN: llvm-pdbdump pdb2yaml -dbi-module-info -dbi-module-source-info \
-RUN:   -dbi-stream -pdb-stream -string-table -tpi-stream -stream-directory \
+RUN: llvm-pdbdump pdb2yaml -modules -module-files -dbi-stream \
+RUN:   -pdb-stream -string-table -tpi-stream -stream-directory \
 RUN:   -stream-metadata %p/Inputs/empty.pdb > %t.1
 RUN: llvm-pdbdump yaml2pdb -pdb=%t.2 %t.1
 

llvm/test/DebugInfo/PDB/pdbdump-source-names.test

 # pass if alignment is implemented correctly.
 
 RUN: llvm-pdbdump yaml2pdb -pdb=%T/source-names-1.pdb %p/Inputs/source-names-1.yaml
-RUN: llvm-pdbdump pdb2yaml -dbi-module-source-info %T/source-names-1.pdb \
+RUN: llvm-pdbdump pdb2yaml -module-files %T/source-names-1.pdb \
 RUN:     | FileCheck -check-prefix=CHECK1 %s
 RUN: llvm-pdbdump yaml2pdb -pdb=%T/source-names-2.pdb %p/Inputs/source-names-2.yaml
-RUN: llvm-pdbdump pdb2yaml -dbi-module-source-info %T/source-names-2.pdb \
+RUN: llvm-pdbdump pdb2yaml -module-files %T/source-names-2.pdb \
 RUN:     | FileCheck -check-prefix=CHECK2 %s
 
 CHECK1: SourceFiles:

llvm/test/DebugInfo/PDB/pdbdump-write.test

 ; (for example if we don't write the entire stream)
 ;
 ; RUN: llvm-pdbdump pdb2yaml -stream-metadata -stream-directory \
-; RUN:   -pdb-stream -tpi-stream -dbi-module-syms %p/Inputs/empty.pdb > %t.1
+; RUN:   -pdb-stream -tpi-stream -module-syms %p/Inputs/empty.pdb > %t.1
 ; RUN: llvm-pdbdump yaml2pdb -pdb=%t.2 %t.1
 ; RUN: llvm-pdbdump pdb2yaml -pdb-stream -tpi-stream \
-; RUN:   -dbi-module-syms -no-file-headers %p/Inputs/empty.pdb > %t.3
+; RUN:   -module-syms -no-file-headers %p/Inputs/empty.pdb > %t.3
 ; RUN: llvm-pdbdump pdb2yaml -pdb-stream -tpi-stream \
-; RUN:   -dbi-module-syms -no-file-headers %t.2 > %t.4
+; RUN:   -module-syms -no-file-headers %t.2 > %t.4
 ; RUN: diff %t.3 %t.4

llvm/test/DebugInfo/PDB/pdbdump-yaml-lineinfo-write.test

-; This testcase verifies that we can produce a PDB with line
-; information.  It does this by describing some line information
-; manually in YAML, creating a PDB out of it, then dumping then
-; line information from the resulting PDB.
-
-; RUN: llvm-pdbdump yaml2pdb -pdb=%t.pdb %p/Inputs/simple-line-info.yaml
-; RUN: llvm-pdbdump raw -line-info %t.pdb | FileCheck -check-prefix=LINES %s
-
-LINES:       Modules [
-LINES-NEXT:    {
-LINES-NEXT:      Name: d:\src\llvm\test\DebugInfo\PDB\Inputs\empty.obj
-LINES:           LineInfo [
-LINES-NEXT:        FileChecksums {
-LINES-NEXT:          Checksum {
-LINES-NEXT:            FileName: d:\src\llvm\test\debuginfo\pdb\inputs\empty.cpp
-LINES-NEXT:            Kind: MD5 (0x1)
-LINES-NEXT:            Checksum (
-LINES-NEXT:              0000: A0A5BD0D 3ECD93FC 29D19DE8 26FBF4BC  |....>...)...&...|
-LINES-NEXT:            )
-LINES-NEXT:          }
-LINES-NEXT:          Checksum {
-LINES-NEXT:            FileName: f:\dd\externalapis\windows\10\sdk\inc\winerror.h
-LINES-NEXT:            Kind: MD5 (0x1)
-LINES-NEXT:            Checksum (
-LINES-NEXT:              0000: 1154D69F 5B265019 6E1FC34F 4134E56B  |.T..[&P.n..OA4.k|
-LINES-NEXT:            )
-LINES-NEXT:          }
-LINES-NEXT:        }
-LINES-NEXT:        Lines {
-LINES-NEXT:          Block {
-LINES-NEXT:            RelocSegment: 1
-LINES-NEXT:            RelocOffset: 16
-LINES-NEXT:            CodeSize: 10
-LINES-NEXT:            HasColumns: No
-LINES-NEXT:            Lines {
-LINES-NEXT:              FileName: d:\src\llvm\test\debuginfo\pdb\inputs\empty.cpp
-LINES-NEXT:              Line {
-LINES-NEXT:                Offset: 0
-LINES-NEXT:                LineNumberStart: 5
-LINES-NEXT:                EndDelta: 0
-LINES-NEXT:                IsStatement: Yes
-LINES-NEXT:              }
-LINES-NEXT:              Line {
-LINES-NEXT:                Offset: 3
-LINES-NEXT:                LineNumberStart: 6
-LINES-NEXT:                EndDelta: 0
-LINES-NEXT:                IsStatement: Yes
-LINES-NEXT:              }
-LINES-NEXT:              Line {
-LINES-NEXT:                Offset: 8
-LINES-NEXT:                LineNumberStart: 7
-LINES-NEXT:                EndDelta: 0
-LINES-NEXT:                IsStatement: Yes
-LINES-NEXT:              }
-LINES-NEXT:            }
-LINES-NEXT:          }
-LINES-NEXT:        }
-LINES-NEXT:        InlineeLines {
-LINES-NEXT:          HasExtraFiles: No
-LINES-NEXT:          Lines [
-LINES-NEXT:            Inlinee {
-LINES-NEXT:              FileName: f:\dd\externalapis\windows\10\sdk\inc\winerror.h
-LINES-NEXT:              Function {
-LINES-NEXT:                Index: 0x58ef (unknown function)
-LINES-NEXT:              }
-LINES-NEXT:              SourceLine: 26950
-LINES-NEXT:            }
-LINES-NEXT:          ]
-LINES-NEXT:        }
-LINES-NEXT:      ]
-LINES-NEXT:    }

llvm/test/DebugInfo/PDB/pdbdump-yaml-lineinfo.test

-; RUN: llvm-pdbdump pdb2yaml -dbi-module-lines %p/Inputs/empty.pdb \
-; RUN:   | FileCheck -check-prefix=YAML %s
-
-
-YAML: ---
-YAML: MSF:
-YAML:   SuperBlock:
-YAML:     BlockSize:       4096
-YAML:     FreeBlockMap:    2
-YAML:     NumBlocks:       25
-YAML:     NumDirectoryBytes: 136
-YAML:     Unknown1:        0
-YAML:     BlockMapAddr:    24
-YAML:   NumDirectoryBlocks: 1
-YAML:   DirectoryBlocks: [ 23 ]
-YAML:   NumStreams:      0
-YAML:   FileSize:        102400
-YAML: DbiStream:
-YAML:   VerHeader:       V70
-YAML:   Age:             1
-YAML:   BuildNumber:     35840
-YAML:   PdbDllVersion:   31101
-YAML:   PdbDllRbld:      0
-YAML:   Flags:           1
-YAML:   MachineType:     x86
-YAML:   Modules:
-YAML:   - Module:          'd:\src\llvm\test\DebugInfo\PDB\Inputs\empty.obj'
-YAML:     ObjFile:         'd:\src\llvm\test\DebugInfo\PDB\Inputs\empty.obj'
-YAML:     SourceFiles:
-YAML:       - 'd:\src\llvm\test\debuginfo\pdb\inputs\empty.cpp'
-YAML:     Subsections:
-YAML:       - !Lines
-YAML:         CodeSize:        10
-YAML:         Flags:           [  ]
-YAML:         RelocOffset:     16
-YAML:         RelocSegment:    1
-YAML:         Blocks:
-YAML:           - FileName:        'd:\src\llvm\test\debuginfo\pdb\inputs\empty.cpp'
-YAML:             Lines:
-YAML:               - Offset:          0
-YAML:                 LineStart:       5
-YAML:                 IsStatement:     true
-YAML:                 EndDelta:        0
-YAML:               - Offset:          3
-YAML:                 LineStart:       6
-YAML:                 IsStatement:     true
-YAML:                 EndDelta:        0
-YAML:               - Offset:          8
-YAML:                 LineStart:       7
-YAML:                 IsStatement:     true
-YAML:                 EndDelta:        0
-YAML:             Columns:
-YAML:       - !FileChecksums
-YAML:         Checksums:
-YAML:           - FileName:        'd:\src\llvm\test\debuginfo\pdb\inputs\empty.cpp'
-YAML:             Kind:            MD5
-YAML:             Checksum:        A0A5BD0D3ECD93FC29D19DE826FBF4BC
-YAML:  - Module:          '* Linker *'
-YAML:    ObjFile:         ''
-YAML: ...
 

llvm/tools/llvm-pdbdump/LLVMOutputStyle.cpp

       : C13DebugFragmentVisitor(F), P(P), IPI(IPI) {}
 
   Error handleLines() override {
-    if (Lines.empty())
+    if (Lines.empty() ||
+        !opts::checkModuleSubsection(opts::ModuleSubsection::Lines))
       return Error::success();
 
     DictScope DD(P, "Lines");

   }
 
   Error handleFileChecksums() override {
-    if (!Checksums.hasValue())
+    if (!Checksums.hasValue() ||
+        !opts::checkModuleSubsection(opts::ModuleSubsection::FileChecksums))
       return Error::success();
 
     DictScope DD(P, "FileChecksums");

   }
 
   Error handleInlineeLines() override {
-    if (InlineeLines.empty())
+    if (InlineeLines.empty() ||
+        !opts::checkModuleSubsection(opts::ModuleSubsection::InlineeLines))
       return Error::success();
 
     DictScope D(P, "InlineeLines");

   }
 
   Error handleCrossModuleExports() override {
+    if (CrossExports.empty() ||
+        !opts::checkModuleSubsection(opts::ModuleSubsection::CrossScopeExports))
+      return Error::success();
+
     for (const auto &M : CrossExports) {
       DictScope D(P, "CrossModuleExports");
       for (const auto &E : M) {

   }
 
   Error handleCrossModuleImports() override {
+    if (CrossImports.empty() ||
+        !opts::checkModuleSubsection(opts::ModuleSubsection::CrossScopeImports))
+      return Error::success();
+
     for (const auto &M : CrossImports) {
       DictScope D(P, "CrossModuleImports");
       for (const auto &ImportGroup : M) {

 }
 
 Error LLVMOutputStyle::dumpDbiStream() {
-  bool DumpModules = opts::raw::DumpModules || opts::raw::DumpModuleSyms ||
-                     opts::raw::DumpModuleFiles || opts::raw::DumpLineInfo;
+  bool DumpModules = opts::shared::DumpModules ||
+                     opts::shared::DumpModuleSyms ||
+                     opts::shared::DumpModuleFiles ||
+                     !opts::shared::DumpModuleSubsections.empty();
   if (!opts::raw::DumpHeaders && !DumpModules)
     return Error::success();
   if (!File.hasPDBDbiStream()) {

       P.printNumber("Symbol Byte Size", Modi.getSymbolDebugInfoByteSize());
       P.printNumber("Type Server Index", Modi.getTypeServerIndex());
       P.printBoolean("Has EC Info", Modi.hasECInfo());
-      if (opts::raw::DumpModuleFiles) {
+      if (opts::shared::DumpModuleFiles) {
         std::string FileListName = to_string(Modules.getSourceFileCount(I)) +
                                    " Contributing Source Files";
         ListScope LL(P, FileListName);

       }
       bool HasModuleDI = (Modi.getModuleStreamIndex() < File.getNumStreams());
       bool ShouldDumpSymbols =
-          (opts::raw::DumpModuleSyms || opts::raw::DumpSymRecordBytes);
-      if (HasModuleDI && (ShouldDumpSymbols || opts::raw::DumpLineInfo)) {
+          (opts::shared::DumpModuleSyms || opts::raw::DumpSymRecordBytes);
+      if (HasModuleDI &&
+          (ShouldDumpSymbols || !opts::shared::DumpModuleSubsections.empty())) {
         auto ModStreamData = MappedBlockStream::createIndexedStream(
             File.getMsfLayout(), File.getMsfBuffer(),
             Modi.getModuleStreamIndex(), File.getAllocator());

           bool HadError = false;
           for (auto S : ModS.symbols(&HadError)) {
             DictScope LL(P, "");
-            if (opts::raw::DumpModuleSyms) {
+            if (opts::shared::DumpModuleSyms) {
               if (auto EC = SD.dump(S)) {
                 llvm::consumeError(std::move(EC));
                 HadError = true;

                 raw_error_code::corrupt_file,
                 "DBI stream contained corrupt symbol record");
         }
-        if (opts::raw::DumpLineInfo) {
-          ListScope SS(P, "LineInfo");
+        if (!opts::shared::DumpModuleSubsections.empty()) {
+          ListScope SS(P, "Subsections");
           auto ExpectedTypes = initializeTypeDatabase(StreamIPI);
           if (!ExpectedTypes)
             return ExpectedTypes.takeError();

llvm/tools/llvm-pdbdump/YAMLOutputStyle.cpp

 }
 
 Error YAMLOutputStyle::dump() {
-  if (opts::pdb2yaml::All) {
-    opts::pdb2yaml::StreamMetadata = true;
-    opts::pdb2yaml::StreamDirectory = true;
-    opts::pdb2yaml::PdbStream = true;
-    opts::pdb2yaml::StringTable = true;
-    opts::pdb2yaml::DbiStream = true;
-    opts::pdb2yaml::DbiModuleInfo = true;
-    opts::pdb2yaml::DbiModuleSyms = true;
-    opts::pdb2yaml::DbiModuleSourceFileInfo = true;
-    opts::pdb2yaml::DbiModuleSourceLineInfo = true;
-    opts::pdb2yaml::TpiStream = true;
-    opts::pdb2yaml::IpiStream = true;
-  }
-
   if (opts::pdb2yaml::StreamDirectory)
     opts::pdb2yaml::StreamMetadata = true;
-  if (opts::pdb2yaml::DbiModuleSyms)
-    opts::pdb2yaml::DbiModuleInfo = true;
-
-  if (opts::pdb2yaml::DbiModuleSourceLineInfo)
-    opts::pdb2yaml::DbiModuleSourceFileInfo = true;
-
-  if (opts::pdb2yaml::DbiModuleSourceFileInfo)
-    opts::pdb2yaml::DbiModuleInfo = true;
-
-  if (opts::pdb2yaml::DbiModuleInfo)
-    opts::pdb2yaml::DbiStream = true;
-
-  // Some names from the module source file info get pulled from the string
-  // table, so if we're writing module source info, we have to write the string
-  // table as well.
-  if (opts::pdb2yaml::DbiModuleSourceLineInfo)
-    opts::pdb2yaml::StringTable = true;
 
   if (auto EC = dumpFileHeaders())
     return EC;

 }
 
 Error YAMLOutputStyle::dumpStringTable() {
-  bool RequiresStringTable = opts::pdb2yaml::DbiModuleSourceFileInfo ||
-                             opts::pdb2yaml::DbiModuleSourceLineInfo;
+  bool RequiresStringTable = opts::shared::DumpModuleFiles ||
+                             !opts::shared::DumpModuleSubsections.empty();
   bool RequestedStringTable = opts::pdb2yaml::StringTable;
   if (!RequiresStringTable && !RequestedStringTable)
     return Error::success();

   return Error::success();
 }
 
+static opts::ModuleSubsection convertSubsectionKind(DebugSubsectionKind K) {
+  switch (K) {
+  case DebugSubsectionKind::CrossScopeExports:
+    return opts::ModuleSubsection::CrossScopeExports;
+  case DebugSubsectionKind::CrossScopeImports:
+    return opts::ModuleSubsection::CrossScopeImports;
+  case DebugSubsectionKind::FileChecksums:
+    return opts::ModuleSubsection::FileChecksums;
+  case DebugSubsectionKind::InlineeLines:
+    return opts::ModuleSubsection::InlineeLines;
+  case DebugSubsectionKind::Lines:
+    return opts::ModuleSubsection::Lines;
+  default:
+    return opts::ModuleSubsection::Unknown;
+  }
+  llvm_unreachable("Unreachable!");
+}
+
 Error YAMLOutputStyle::dumpDbiStream() {
   if (!opts::pdb2yaml::DbiStream)
     return Error::success();

   Obj.DbiStream->PdbDllRbld = DS.getPdbDllRbld();
   Obj.DbiStream->PdbDllVersion = DS.getPdbDllVersion();
   Obj.DbiStream->VerHeader = DS.getDbiVersion();
-  if (opts::pdb2yaml::DbiModuleInfo) {
+  if (opts::shared::DumpModules) {
     const auto &Modules = DS.modules();
     for (uint32_t I = 0; I < Modules.getModuleCount(); ++I) {
       DbiModuleDescriptor MI = Modules.getModuleDescriptor(I);

 
       DMI.Mod = MI.getModuleName();
       DMI.Obj = MI.getObjFileName();
-      if (opts::pdb2yaml::DbiModuleSourceFileInfo) {
+      if (opts::shared::DumpModuleFiles) {
         auto Files = Modules.source_files(I);
         DMI.SourceFiles.assign(Files.begin(), Files.end());
       }

       auto ExpectedST = File.getStringTable();
       if (!ExpectedST)
         return ExpectedST.takeError();
-      if (opts::pdb2yaml::DbiModuleSourceLineInfo &&
+      if (!opts::shared::DumpModuleSubsections.empty() &&
           ModS.hasDebugSubsections()) {
         auto ExpectedChecksums = ModS.findChecksumsSubsection();
         if (!ExpectedChecksums)
           return ExpectedChecksums.takeError();
 
         for (const auto &SS : ModS.subsections()) {
+          opts::ModuleSubsection OptionKind = convertSubsectionKind(SS.kind());
+          if (!opts::checkModuleSubsection(OptionKind))
+            continue;
+
           auto Converted =
               CodeViewYAML::YAMLDebugSubsection::fromCodeViewSubection(
                   ExpectedST->getStringTable(), *ExpectedChecksums, SS);

         }
       }
 
-      if (opts::pdb2yaml::DbiModuleSyms) {
+      if (opts::shared::DumpModuleSyms) {
         DMI.Modi.emplace();
 
         DMI.Modi->Signature = ModS.signature();

llvm/tools/llvm-pdbdump/llvm-pdbdump.h

 
 namespace opts {
 
+enum class ModuleSubsection {
+  Unknown,
+  Lines,
+  FileChecksums,
+  InlineeLines,
+  CrossScopeImports,
+  CrossScopeExports,
+  All
+};
+
+bool checkModuleSubsection(ModuleSubsection Kind);
+
+template <typename... Ts>
+bool checkModuleSubsection(ModuleSubsection K1, ModuleSubsection K2,
+                           Ts &&... Rest) {
+  return checkModuleSubsection(K1) ||
+         checkModuleSubsection(K2, std::forward<Ts>(Rest)...);
+}
+
 namespace pretty {
 
 enum class ClassDefinitionFormat { None, Layout, All };

 extern llvm::cl::opt<bool> DumpTpiRecords;
 extern llvm::cl::opt<bool> DumpIpiRecords;
 extern llvm::cl::opt<bool> DumpIpiRecordBytes;
-extern llvm::cl::opt<bool> DumpModules;
-extern llvm::cl::opt<bool> DumpModuleFiles;
-extern llvm::cl::opt<bool> DumpModuleLines;
-extern llvm::cl::opt<bool> DumpModuleSyms;
 extern llvm::cl::opt<bool> DumpPublics;
 extern llvm::cl::opt<bool> DumpSectionContribs;
-extern llvm::cl::opt<bool> DumpLineInfo;
 extern llvm::cl::opt<bool> DumpSectionMap;
 extern llvm::cl::opt<bool> DumpSymRecordBytes;
 extern llvm::cl::opt<bool> DumpSectionHeaders;

 extern llvm::cl::opt<bool> StringTable;
 extern llvm::cl::opt<bool> PdbStream;
 extern llvm::cl::opt<bool> DbiStream;
-extern llvm::cl::opt<bool> DbiModuleInfo;
-extern llvm::cl::opt<bool> DbiModuleSyms;
-extern llvm::cl::opt<bool> DbiModuleSourceFileInfo;
-extern llvm::cl::opt<bool> DbiModuleSourceLineInfo;
 extern llvm::cl::opt<bool> TpiStream;
 extern llvm::cl::opt<bool> IpiStream;
 extern llvm::cl::list<std::string> InputFilename;
 }
+
+namespace shared {
+extern llvm::cl::opt<bool> DumpModules;
+extern llvm::cl::opt<bool> DumpModuleFiles;
+extern llvm::cl::list<ModuleSubsection> DumpModuleSubsections;
+extern llvm::cl::opt<bool> DumpModuleSyms;
+} // namespace shared
 }
 
 #endif

llvm/tools/llvm-pdbdump/llvm-pdbdump.cpp

 
 cl::OptionCategory MsfOptions("MSF Container Options");
 cl::OptionCategory TypeOptions("Type Record Options");
-cl::OptionCategory FileOptions("Module & File Options");
 cl::OptionCategory SymbolOptions("Symbol Options");
 cl::OptionCategory MiscOptions("Miscellaneous Options");
 

     cl::desc("dump CodeView type record raw bytes from IPI stream"),
     cl::cat(TypeOptions), cl::sub(RawSubcommand));
 
-// MODULE & FILE OPTIONS
-cl::opt<bool> DumpModules("modules", cl::desc("dump compiland information"),
-                          cl::cat(FileOptions), cl::sub(RawSubcommand));
-cl::opt<bool> DumpModuleFiles("module-files", cl::desc("dump file information"),
-                              cl::cat(FileOptions), cl::sub(RawSubcommand));
-cl::opt<bool> DumpLineInfo("line-info",
-                           cl::desc("dump file and line information"),
-                           cl::cat(FileOptions), cl::sub(RawSubcommand));
-
 // SYMBOL OPTIONS
 cl::opt<bool> DumpGlobals("globals", cl::desc("dump globals stream data"),
                           cl::cat(SymbolOptions), cl::sub(RawSubcommand));
-cl::opt<bool> DumpModuleSyms("module-syms", cl::desc("dump module symbols"),
-                             cl::cat(SymbolOptions), cl::sub(RawSubcommand));
 cl::opt<bool> DumpPublics("publics", cl::desc("dump Publics stream data"),
                           cl::cat(SymbolOptions), cl::sub(RawSubcommand));
 cl::opt<bool>

 cl::opt<bool> All("all",
                   cl::desc("Dump everything we know how to dump."),
                   cl::sub(PdbToYamlSubcommand), cl::init(false));
-cl::opt<bool>
-    NoFileHeaders("no-file-headers",
-                  cl::desc("Do not dump MSF file headers (you will not be able "
-                           "to generate a fresh PDB from the resulting YAML)"),
-                  cl::sub(PdbToYamlSubcommand), cl::init(false));
+cl::opt<bool> NoFileHeaders("no-file-headers",
+                            cl::desc("Do not dump MSF file headers"),
+                            cl::sub(PdbToYamlSubcommand), cl::init(false));
 cl::opt<bool> Minimal("minimal",
                       cl::desc("Don't write fields with default values"),
                       cl::sub(PdbToYamlSubcommand), cl::init(false));

                           cl::sub(PdbToYamlSubcommand), cl::init(false));
 
 cl::opt<bool> DbiStream("dbi-stream",
-                        cl::desc("Dump the DBI Stream (Stream 2)"),
+                        cl::desc("Dump the DBI Stream Headers (Stream 2)"),
                         cl::sub(PdbToYamlSubcommand), cl::init(false));
-cl::opt<bool>
-    DbiModuleInfo("dbi-module-info",
-                  cl::desc("Dump DBI Module Information (implies -dbi-stream)"),
-                  cl::sub(PdbToYamlSubcommand), cl::init(false));
-
-cl::opt<bool> DbiModuleSyms(
-    "dbi-module-syms",
-    cl::desc("Dump DBI Module Information (implies -dbi-module-info)"),
-    cl::sub(PdbToYamlSubcommand), cl::init(false));
-
-cl::opt<bool> DbiModuleSourceFileInfo(
-    "dbi-module-source-info",
-    cl::desc(
-        "Dump DBI Module Source File Information (implies -dbi-module-info)"),
-    cl::sub(PdbToYamlSubcommand), cl::init(false));
-
-cl::opt<bool>
-    DbiModuleSourceLineInfo("dbi-module-lines",
-                            cl::desc("Dump DBI Module Source Line Information "
-                                     "(implies -dbi-module-source-info)"),
-                            cl::sub(PdbToYamlSubcommand), cl::init(false));
 
 cl::opt<bool> TpiStream("tpi-stream",
                         cl::desc("Dump the TPI Stream (Stream 3)"),

                                     cl::sub(PdbToYamlSubcommand));
 }
 
+namespace shared {
+cl::OptionCategory FileOptions("Module & File Options");
+
+// MODULE & FILE OPTIONS
+cl::opt<bool> DumpModules("modules", cl::desc("dump compiland information"),
+                          cl::cat(FileOptions), cl::sub(RawSubcommand),
+                          cl::sub(PdbToYamlSubcommand));
+cl::opt<bool> DumpModuleFiles("module-files", cl::desc("dump file information"),
+                              cl::cat(FileOptions), cl::sub(RawSubcommand),
+                              cl::sub(PdbToYamlSubcommand));
+cl::list<ModuleSubsection> DumpModuleSubsections(
+    "subsections", cl::ZeroOrMore, cl::CommaSeparated,
+    cl::desc("dump subsections from each module's debug stream"),
+    cl::values(
+        clEnumValN(
+            ModuleSubsection::CrossScopeExports, "cme",
+            "Cross module exports (DEBUG_S_CROSSSCOPEEXPORTS subsection)"),
+        clEnumValN(
+            ModuleSubsection::CrossScopeImports, "cmi",
+            "Cross module imports (DEBUG_S_CROSSSCOPEIMPORTS subsection)"),
+        clEnumValN(ModuleSubsection::FileChecksums, "fc",
+                   "File checksums (DEBUG_S_CHECKSUMS subsection)"),
+        clEnumValN(ModuleSubsection::InlineeLines, "ilines",
+                   "Inlinee lines (DEBUG_S_INLINEELINES subsection)"),
+        clEnumValN(ModuleSubsection::Lines, "lines",
+                   "Lines (DEBUG_S_LINES subsection)"),
+        clEnumValN(ModuleSubsection::All, "all", "All known subsections")),
+    cl::cat(FileOptions), cl::sub(RawSubcommand), cl::sub(PdbToYamlSubcommand));
+cl::opt<bool> DumpModuleSyms("module-syms", cl::desc("dump module symbols"),
+                             cl::cat(FileOptions), cl::sub(RawSubcommand),
+                             cl::sub(PdbToYamlSubcommand));
+} // namespace shared
+
 namespace analyze {
 cl::opt<bool> StringTable("hash-collisions", cl::desc("Find hash collisions"),
                           cl::sub(AnalyzeSubcommand), cl::init(false));

 
 static ExitOnError ExitOnErr;
 
+bool opts::checkModuleSubsection(opts::ModuleSubsection MS) {
+  return any_of(opts::shared::DumpModuleSubsections,
+                [=](opts::ModuleSubsection M) {
+                  return M == MS || M == opts::ModuleSubsection::All;
+                });
+}
+
 static void yamlToPdb(StringRef Path) {
   BumpPtrAllocator Allocator;
   ErrorOr<std::unique_ptr<MemoryBuffer>> ErrorOrBuffer =

     }
   }
 
+  if ((opts::RawSubcommand && opts::raw::RawAll) ||
+      (opts::PdbToYamlSubcommand && opts::pdb2yaml::All)) {
+    opts::shared::DumpModules = true;
+    opts::shared::DumpModuleFiles = true;
+    opts::shared::DumpModuleSyms = true;
+    opts::shared::DumpModuleSubsections.push_back(opts::ModuleSubsection::All);
+    if (llvm::is_contained(opts::shared::DumpModuleSubsections,
+                           opts::ModuleSubsection::All)) {
+      opts::shared::DumpModuleSubsections.reset();
+      opts::shared::DumpModuleSubsections.push_back(
+          opts::ModuleSubsection::All);
+    }
+  }
+
+  if (opts::shared::DumpModuleSyms || opts::shared::DumpModuleFiles)
+    opts::shared::DumpModules = true;
+
+  if (opts::shared::DumpModules)
+    opts::pdb2yaml::DbiStream = true;
+
   if (opts::RawSubcommand) {
     if (opts::raw::RawAll) {
       opts::raw::DumpHeaders = true;
-      opts::raw::DumpModules = true;
-      opts::raw::DumpModuleFiles = true;
-      opts::raw::DumpModuleSyms = true;
       opts::raw::DumpGlobals = true;
       opts::raw::DumpPublics = true;
       opts::raw::DumpSectionHeaders = true;

       opts::raw::DumpIpiRecords = true;
       opts::raw::DumpSectionMap = true;
       opts::raw::DumpSectionContribs = true;
-      opts::raw::DumpLineInfo = true;
       opts::raw::DumpFpo = true;
       opts::raw::DumpStringTable = true;
     }

       exit(1);
     }
   }
+  if (opts::PdbToYamlSubcommand) {
+    if (opts::pdb2yaml::All) {
+      opts::pdb2yaml::StreamMetadata = true;
+      opts::pdb2yaml::StreamDirectory = true;
+      opts::pdb2yaml::PdbStream = true;
+      opts::pdb2yaml::StringTable = true;
+      opts::pdb2yaml::DbiStream = true;
+      opts::pdb2yaml::TpiStream = true;
+      opts::pdb2yaml::IpiStream = true;
+    }
+  }
 
   llvm::sys::InitializeCOMRAII COM(llvm::sys::COMThreadingMode::MultiThreaded);