summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRui Ueyama <ruiu@google.com>2016-10-05 22:08:58 +0000
committerRui Ueyama <ruiu@google.com>2016-10-05 22:08:58 +0000
commit8d3fb5da7bda246013edbebe358bbc1f50d4c0c5 (patch)
tree88ade947e130dba8c9c28dae1246a88d9172dd80
parentd22a94377f7554a7e9df050f6dfc3ee42384e3fe (diff)
downloadbcm5719-llvm-8d3fb5da7bda246013edbebe358bbc1f50d4c0c5.tar.gz
bcm5719-llvm-8d3fb5da7bda246013edbebe358bbc1f50d4c0c5.zip
Add exact number of streams for reserved stream #s.
llvm-svn: 283397
-rw-r--r--lld/COFF/PDB.cpp9
-rw-r--r--lld/test/COFF/pdb.test14
2 files changed, 11 insertions, 12 deletions
diff --git a/lld/COFF/PDB.cpp b/lld/COFF/PDB.cpp
index 2b9a39fde27..6d55d95ae74 100644
--- a/lld/COFF/PDB.cpp
+++ b/lld/COFF/PDB.cpp
@@ -35,11 +35,10 @@ void coff::createPDB(StringRef Path) {
pdb::PDBFileBuilder Builder(Alloc);
ExitOnErr(Builder.initialize(4096)); // 4096 is blocksize
- ExitOnErr(Builder.getMsfBuilder().addStream(1));
- ExitOnErr(Builder.getMsfBuilder().addStream(1));
- ExitOnErr(Builder.getMsfBuilder().addStream(1));
- ExitOnErr(Builder.getMsfBuilder().addStream(1));
- ExitOnErr(Builder.getMsfBuilder().addStream(1));
+ // Create streams in MSF for predefined streams, namely
+ // PDB, TPI, DBI and IPI.
+ for (int I = 0; I < (int)pdb::kSpecialStreamCount; ++I)
+ ExitOnErr(Builder.getMsfBuilder().addStream(0));
// Add an Info stream.
auto &InfoBuilder = Builder.getInfoBuilder();
diff --git a/lld/test/COFF/pdb.test b/lld/test/COFF/pdb.test
index 83de50333bb..17e24d8de15 100644
--- a/lld/test/COFF/pdb.test
+++ b/lld/test/COFF/pdb.test
@@ -7,21 +7,21 @@
# CHECK-NEXT: SuperBlock:
# CHECK-NEXT: BlockSize: 4096
# CHECK-NEXT: FreeBlockMap:
-# CHECK-NEXT: NumBlocks: 10
-# CHECK-NEXT: NumDirectoryBytes: 44
+# CHECK-NEXT: NumBlocks: 8
+# CHECK-NEXT: NumDirectoryBytes: 36
# CHECK-NEXT: Unknown1: 0
# CHECK-NEXT: BlockMapAddr: 3
# CHECK-NEXT: NumDirectoryBlocks: 1
-# CHECK-NEXT: DirectoryBlocks: [ 9 ]
+# CHECK-NEXT: DirectoryBlocks: [ 7 ]
# CHECK-NEXT: NumStreams: 5
-# CHECK-NEXT: FileSize: 40960
-# CHECK-NEXT: StreamSizes: [ 1, 48, 56, 1, 56 ]
+# CHECK-NEXT: FileSize: 32768
+# CHECK-NEXT: StreamSizes: [ 0, 48, 56, 0, 56 ]
# CHECK-NEXT: StreamMap:
+# CHECK-NEXT: - Stream: [ ]
# CHECK-NEXT: - Stream: [ 4 ]
# CHECK-NEXT: - Stream: [ 5 ]
+# CHECK-NEXT: - Stream: [ ]
# CHECK-NEXT: - Stream: [ 6 ]
-# CHECK-NEXT: - Stream: [ 7 ]
-# CHECK-NEXT: - Stream: [ 8 ]
# CHECK-NEXT: PdbStream:
# CHECK-NEXT: Age: 1
# CHECK-NEXT: Guid: '{00000000-0000-0000-0000-000000000000}'
OpenPOWER on IntegriCloud