From d8388aaecbefec83a2e900903c04a1e63ebcfedb Mon Sep 17 00:00:00 2001 From: Rui Ueyama Date: Wed, 20 Jul 2016 19:41:47 +0000 Subject: [PATCH] [pdbdump] Use the "flow" style to print out a sequence of uint32_t. Summary: Lists can be written either with "-" or "[]" in YAML. Differential Revision: https://reviews.llvm.org/D22579 llvm-svn: 276168 --- llvm/test/DebugInfo/PDB/pdbdump-yaml.test | 73 +++++++---------------- llvm/tools/llvm-pdbdump/PdbYaml.h | 2 +- 2 files changed, 21 insertions(+), 54 deletions(-) diff --git a/llvm/test/DebugInfo/PDB/pdbdump-yaml.test b/llvm/test/DebugInfo/PDB/pdbdump-yaml.test index 51e3a818c927..7d0c429fd1bf 100644 --- a/llvm/test/DebugInfo/PDB/pdbdump-yaml.test +++ b/llvm/test/DebugInfo/PDB/pdbdump-yaml.test @@ -13,62 +13,29 @@ ; YAML-NEXT: Unknown1: 0 ; YAML-NEXT: BlockMapAddr: 24 ; YAML-NEXT: NumDirectoryBlocks: 1 -; YAML-NEXT: DirectoryBlocks: -; YAML-NEXT: - 23 +; YAML-NEXT: DirectoryBlocks: [ 23 ] ; YAML-NEXT: NumStreams: 17 ; YAML-NEXT: FileSize: 102400 -; YAML-NEXT: StreamSizes: -; YAML-NEXT: - 40 -; YAML-NEXT: - 118 -; YAML-NEXT: - 5392 -; YAML-NEXT: - 739 -; YAML-NEXT: - 784 -; YAML-NEXT: - 0 -; YAML-NEXT: - 556 -; YAML-NEXT: - 604 -; YAML-NEXT: - 104 -; YAML-NEXT: - 0 -; YAML-NEXT: - 160 -; YAML-NEXT: - 32 -; YAML-NEXT: - 308 -; YAML-NEXT: - 239 -; YAML-NEXT: - 520 -; YAML-NEXT: - 308 -; YAML-NEXT: - 68 +; YAML-NEXT: StreamSizes: [ 40, 118, 5392, 739, 784, 0, 556, 604, 104, 0, 160, 32, +; YAML-NEXT: 308, 239, 520, 308, 68 ] ; YAML-NEXT: StreamMap: -; YAML-NEXT: - Stream: -; YAML-NEXT: - 8 -; YAML-NEXT: - Stream: -; YAML-NEXT: - 19 -; YAML-NEXT: - Stream: -; YAML-NEXT: - 18 -; YAML-NEXT: - 17 -; YAML-NEXT: - Stream: -; YAML-NEXT: - 14 -; YAML-NEXT: - Stream: -; YAML-NEXT: - 20 -; YAML-NEXT: - Stream: -; YAML-NEXT: - Stream: -; YAML-NEXT: - 11 -; YAML-NEXT: - Stream: -; YAML-NEXT: - 13 -; YAML-NEXT: - Stream: -; YAML-NEXT: - 12 -; YAML-NEXT: - Stream: -; YAML-NEXT: - Stream: -; YAML-NEXT: - 10 -; YAML-NEXT: - Stream: -; YAML-NEXT: - 15 -; YAML-NEXT: - Stream: -; YAML-NEXT: - 6 -; YAML-NEXT: - Stream: -; YAML-NEXT: - 16 -; YAML-NEXT: - Stream: -; YAML-NEXT: - 7 -; YAML-NEXT: - Stream: -; YAML-NEXT: - 21 -; YAML-NEXT: - Stream: -; YAML-NEXT: - 22 +; YAML-NEXT: - Stream: [ 8 ] +; YAML-NEXT: - Stream: [ 19 ] +; YAML-NEXT: - Stream: [ 18, 17 ] +; YAML-NEXT: - Stream: [ 14 ] +; YAML-NEXT: - Stream: [ 20 ] +; YAML-NEXT: - Stream: [ ] +; YAML-NEXT: - Stream: [ 11 ] +; YAML-NEXT: - Stream: [ 13 ] +; YAML-NEXT: - Stream: [ 12 ] +; YAML-NEXT: - Stream: [ ] +; YAML-NEXT: - Stream: [ 10 ] +; YAML-NEXT: - Stream: [ 15 ] +; YAML-NEXT: - Stream: [ 6 ] +; YAML-NEXT: - Stream: [ 16 ] +; YAML-NEXT: - Stream: [ 7 ] +; YAML-NEXT: - Stream: [ 21 ] +; YAML-NEXT: - Stream: [ 22 ] ; YAML-NEXT: PdbStream: ; YAML-NEXT: Age: 1 ; YAML-NEXT: Guid: '{0B355641-86A0-A249-896F-9988FAE52FF0}' diff --git a/llvm/tools/llvm-pdbdump/PdbYaml.h b/llvm/tools/llvm-pdbdump/PdbYaml.h index a7389af22057..08150832ca56 100644 --- a/llvm/tools/llvm-pdbdump/PdbYaml.h +++ b/llvm/tools/llvm-pdbdump/PdbYaml.h @@ -105,7 +105,7 @@ template <> struct MappingTraits { } } -LLVM_YAML_IS_SEQUENCE_VECTOR(uint32_t) +LLVM_YAML_IS_FLOW_SEQUENCE_VECTOR(uint32_t) LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::pdb::yaml::NamedStreamMapping) LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::pdb::yaml::StreamBlockList)