[PDB] Defer public serialization until PDB writing

[rnk]

Summary

This reduces peak memory on my test case from 1960.14MB to 1700.63MB
(-260MB, -13.2%) with no measurable impact on CPU time. I'm currently
working with a publics stream that is about 277MB. Before this change,
we would allocate 277MB of heap memory, serialize publics into them,
hold onto that heap memory, open the PDB, and commit into it. After
this change, we defer the serialization until commit time.

In the last change I made to public writing, I re-sorted the list of
publics multiple times in place to avoid allocating new temporary data
structures. Deferring serialization until later requires that we don't
reorder the publics. Instead of sorting the publics, I partially
construct the hash table data structures, store a publics index in them,
and then sort the hash table data structures. Later, I replace the index
with the symbol record offset.

This change also addresses a FIXME and moves the list of global and
public records from GSIHashStreamBuilder to GSIStreamBuilder. Now that
publics aren't being serialized, it makes even less sense to store them
as a list of CVSymbol records. The hash table used to deduplicate
globals is moved as well, since that is specific to globals, and not
publics.

[hans]

I'm not familiar with the PDB writing, but a scan of the code itself seemed fine.

llvm/lib/DebugInfo/PDB/Native/GSIStreamBuilder.cpp

43

I see this was just moved, but if the goal is to compute ceil(IPHR_HASH / 32) then I think +31 instead of +32 would be enough.

[aganea]

Thanks for doing this, that's a nice saving :-) A few minor things:

llvm/include/llvm/DebugInfo/PDB/Native/GSIStreamBuilder.h

122

PublicSymFlags needs 4 bits, you could take one from BucketIdx below since you don't need more than 12 bits for that - you're doing % IPHR_HASH below.

llvm/lib/DebugInfo/PDB/Native/GSIStreamBuilder.cpp

198

You could also do a one-liner uint32_t BucketStarts[IPHR_HASH] = {0};

203

This also could be:

for (unsigned I = 1; I < IPHR_HASH; ++I)
  BucketStarts[I] += BucketStarts[I-1];
BucketStarts[0] = 0;

213

Same as above: uint32_t BucketCursors[IPHR_HASH] = {0};

243

This comment got lost, could you please re-add it?

[rnk]

llvm/include/llvm/DebugInfo/PDB/Native/GSIStreamBuilder.h

122

Ah, true. I looked at the enum and thought it was a four value enum, not a four *flag* enum.

llvm/lib/DebugInfo/PDB/Native/GSIStreamBuilder.cpp

43

For some reason, the PDB on disk has IPHR_HASH + 1 buckets, and this needs to be reflected in the bitmap, which needs ceil(IPHR_HASH+1/32) words. The last bucket is always empty, since the hash is always calculated as crc32 % IPHR_HASH (not %IPHR_HASH+1).

I don't see any comments about this, but I thought they were in here somewhere, since I remember dealing with this edge case in the past. I'll add some.

198

Sure. I think I tend to shy away from this form, even though I like it, because different compilers tend to have conflicting warnings like -Wmissing-field-initializers -Wmissing-braces and others. I think they don't apply in this case, though.

203

I don't think that's quite the same. Suppose we have three buckets, all size 1. Your loop will produce: 0, 2, 3, but I think the desired start offsets are 0, 1, 2.

I think the fancy way to do this is std::exclusive_scan, but it's new in C++17:
https://en.cppreference.com/w/cpp/algorithm/exclusive_scan

213

The initialization stores would be made dead by the memcpy on the next line, though.

[rnk]

• update

[grimar]

llvm/lib/DebugInfo/PDB/Native/GSIStreamBuilder.cpp

228

69 lld/COFF tests fails for me with the same symptom here.

The problem is that BucketStarts[I]==1, BucketCursors[I]==1, but HashRecords has size of 1 too.
I.e. it tries to access past the end of Hashrtecords.

e.g:

218>********************
218>FAIL: lld :: COFF/used-lto.ll (358 of 2419)
218>******************** TEST 'lld :: COFF/used-lto.ll' FAILED ********************
218>Script:
218>--
218>: 'RUN: at line 2';   d:\work3\llvm\llvm-project\build\debug\bin\llvm-as.exe -o D:\Work3\LLVM\llvm-project\build\tools\lld\test\COFF\Output\used-lto.ll.tmp.obj D:\Work3\LLVM\llvm-project\lld\test\COFF\used-lto.ll
218>: 'RUN: at line 3';   d:\work3\llvm\llvm-project\build\debug\bin\lld-link.exe -dll -debug -opt:ref -noentry -out:D:\Work3\LLVM\llvm-project\build\tools\lld\test\COFF\Output\used-lto.ll.tmp.dll D:\Work3\LLVM\llvm-project\build\tools\lld\test\COFF\Output\used-lto.ll.tmp.obj
218>: 'RUN: at line 4';   d:\work3\llvm\llvm-project\build\debug\bin\llvm-pdbutil.exe dump -publics D:\Work3\LLVM\llvm-project\build\tools\lld\test\COFF\Output\used-lto.ll.tmp.pdb | d:\work3\llvm\llvm-project\build\debug\bin\filecheck.exe D:\Work3\LLVM\llvm-project\lld\test\COFF\used-lto.ll
218>--
218>Exit Code: 2147483651
218>
218>Command Output (stdout):
218>--
218>$ ":" "RUN: at line 2"
218>$ "d:\work3\llvm\llvm-project\build\debug\bin\llvm-as.exe" "-o" "D:\Work3\LLVM\llvm-project\build\tools\lld\test\COFF\Output\used-lto.ll.tmp.obj" "D:\Work3\LLVM\llvm-project\lld\test\COFF\used-lto.ll"
218>$ ":" "RUN: at line 3"
218>$ "d:\work3\llvm\llvm-project\build\debug\bin\lld-link.exe" "-dll" "-debug" "-opt:ref" "-noentry" "-out:D:\Work3\LLVM\llvm-project\build\tools\lld\test\COFF\Output\used-lto.ll.tmp.dll" "D:\Work3\LLVM\llvm-project\build\tools\lld\test\COFF\Output\used-lto.ll.tmp.obj"
218># command stderr:
218>PLEASE submit a bug report to https://bugs.llvm.org/ and include the crash backtrace.
218>
218>0x00007FF7902354DE (0x000000945F786798 0x0000000000000001 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC)0x00007FF7902354DE (0x000000945F786798 0x0000000000000001 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC)0x00007FF7902354DE (0x000000945F786798 0x0000000000000001 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC)0x00007FF7902354DE (0x000000945F786798 0x0000000000000001 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC)0x00007FF7902354DE (0x000000945F786798 0x0000000000000001 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC)0x00007FF7902354DE (0x000000945F786798 0x0000000000000001 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC)0x00007FF7902354DE (0x000000945F786798 0x0000000000000001 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC)0x00007FF7902354DE (0x000000945F786798 0x0000000000000001 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC)0x00007FF7902354DE (0x000000945F786798 0x0000000000000001 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC), std::vector<llvm::pdb::PSHashRecord,std::allocator<llvm::pdb::PSHashRecord> >::operator[]() + 0x6E bytes(s), std::vector<llvm::pdb::PSHashRecord,std::allocator<llvm::pdb::PSHashRecord> >::operator[]() + 0x6E bytes(s), std::vector<llvm::pdb::PSHashRecord,std::allocator<llvm::pdb::PSHashRecord> >::operator[]() + 0x6E bytes(s), std::vector<llvm::pdb::PSHashRecord,std::allocator<llvm::pdb::PSHashRecord> >::operator[]() + 0x6E bytes(s), std::vector<llvm::pdb::PSHashRecord,std::allocator<llvm::pdb::PSHashRecord> >::operator[]() + 0x6E bytes(s), std::vector<llvm::pdb::PSHashRecord,std::allocator<llvm::pdb::PSHashRecord> >::operator[]() + 0x6E bytes(s), std::vector<llvm::pdb::PSHashRecord,std::allocator<llvm::pdb::PSHashRecord> >::operator[]() + 0x6E bytes(s), std::vector<llvm::pdb::PSHashRecord,std::allocator<llvm::pdb::PSHashRecord> >::operator[]() + 0x6E bytes(s), std::vector<llvm::pdb::PSHashRecord,std::allocator<llvm::pdb::PSHashRecord> >::operator[]() + 0x6E bytes(s), c:\program files (x86)\microsoft visual studio\2017\community\vc\tools\msvc\14.16.27023\include\vector, line 1733, c:\program files (x86)\microsoft visual studio\2017\community\vc\tools\msvc\14.16.27023\include\vector, line 1733 + 0x4B byte(s)
218>
218> + 0x4B byte(s)
218>
218>0x00007FF7902364D70x00007FF7902364D7 (0x000000945F6C1750 0x0000000000000FEC 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC) (0x000000945F6C1750 0x0000000000000FF8 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC), <lambda_7cb86082a9071349385d17558456a913>::operator()() + 0x57 bytes(s), c:\program files (x86)\microsoft visual studio\2017\community\vc\tools\msvc\14.16.27023\include\vector, line 1733, d:\work3\llvm\llvm-project\llvm\lib\debuginfo\pdb\native\gsistreambuilder.cpp, line 235 + 0x4B byte(s)
218>
218> + 0x2D byte(s)
218>
218>0x00007FF790235F600x00007FF7902364D7 (0x000000945FA176D0 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC) (0x000000945F6C1750 0x0000000000000FF4 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC), <lambda_1df1271b34c55094de858467af96bfd2>::operator()() + 0x70 bytes(s), c:\program files (x86)\microsoft visual studio\2017\community\vc\tools\msvc\14.16.27023\include\vector, line 1733 + 0x4B byte(s)
218>
218>, d:\work3\llvm\llvm-project\llvm\include\llvm\support\parallel.h, line 152 + 0x12 byte(s)
218>
218>0x00007FF7902364D70x00007FF790227670 (0x000000945F6C1750 0x0000000000000FE4 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC) (0x000000945FA176D0 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC), <lambda_7cb86082a9071349385d17558456a913>::operator()() + 0x57 bytes(s), c:\program files (x86)\microsoft visual studio\2017\community\vc\tools\msvc\14.16.27023\include\vector, line 1733 + 0x4B byte(s)
218>
218>, <lambda_7cb86082a9071349385d17558456a913>::operator()() + 0x57 bytes(s), d:\work3\llvm\llvm-project\llvm\lib\debuginfo\pdb\native\gsistreambuilder.cpp, line 235 + 0x2D byte(s)
218>
218>0x00007FF7902364D7 (0x000000945F6C1750 0x0000000000000FF0 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC)0x00007FF790235F60, <lambda_7cb86082a9071349385d17558456a913>::operator()() + 0x57 bytes(s) (0x000000945FA168C0 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC), <lambda_1df1271b34c55094de858467af96bfd2>::operator()() + 0x70 bytes(s), d:\work3\llvm\llvm-project\llvm\include\llvm\support\parallel.h, line 152 + 0x12 byte(s)
218>
218>0x00007FF790227670 (0x000000945FA168C0 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC), std::_Invoker_functor::_Call<<lambda_1df1271b34c55094de858467af96bfd2> &>() + 0x30 bytes(s), c:\program files (x86)\microsoft visual studio\2017\community\vc\tools\msvc\14.16.27023\include\vector, line 1733 + 0x4B byte(s)
218>
218>, c:\program files (x86)\microsoft visuabuginfo\pdb\native\gsistreambuilder.cpp, line 16707566, c:\program files (x86)\microsoft visuabuginfo\pdb\native\gsistreambuilder.cpp, line 235 + 0x30 byte(s), d:\work3\llvm\llvm-project\llvm\lib\debuginfo\pdb\native\gsistreambuilder.cpp, line 235 + 0x2D byte(s)
218>
218>
218>
218> + 0x2D byte(s)
218>
218>, d:\work3\llvm\llvm-project\llvm\lib\debuginfo\pdb\native\gsistreambuilder.cpp, line 1733 + 0x4B byte(s)
218>
218>0x00007FF7902364D7 (0x000000945F6C1750 0x0000000000000FFC 0x000000945F6C1648 0x000000945F6C1558)0x00007FF79022EB700x00007FF790235F60 (0x000000945FA168C0 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC)0x00007FF790235F60 (0x000000945FA1DD30 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC) (0x000000945FA164D0 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC)0x00007FF7902364D7 (0x000000945F6C1750 0x0000000000000FE0 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC), <lambda_7cb86082a9071349385d17558456a913>::operator()() + 0x57 bytes(s), <lambda_7cb86082a9071349385d17558456a913>::operator()() + 0x57 bytes(s), std::_Invob86082a9071349385d17558456a913>::operator()() + 0x30 bytes(s), <lambda_1df1271b34c55094de858467af96bfd2>::operator()() + 0x70 bytes(s), c:\program files (x86)\microsoft visual studio\2017\community\vc\tools\msvc\14.16.27023\include\vector, line 1733, std::ia_7cb86082a9071349385d17558456a913>::operator()() + 0x30 bytes(s) + 0x4B byte(s)
218>
218>, d:\work3\llvm\llvm-project\llvm\include\llvm\support\parallel.h, line 152, <lambda_7cb86082a9071349385d17558456a913>::operator()() + 0x57 bytes(s) + 0x12 byte(s)
218>
218>, c:\program files (x86)\microsoft visual studio\2017\community\vc\tools\msvc\14.16.27023\include\type_traits, line 16707566 + 0x30 byte(s)
218>
218>, d:\work3\llvm\llvm-project\llvm\lib\debuginfo\pdb\native\gsistreambuilder.cpp, line 235 + 0x2D byte(s)
218>
218>0x00007FF7902364D7 (0x000000945F6C1750 0x0000000000000FE8 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC)0x00007FF790227670 (0x000000945FA164D0 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC), <lambda_7cb86082a9071349385d17558456a913>::operator()() + 0x57 bytes(s), d:\work3\llvm\llvm-project\llvm\lib\debuginfo\pdb\native\gsistreambuilder.cpp, line 235 + 0x2D byte(s)
218>
218>0x00007FF790235F60 (0x000000945FA169E0 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC), <lambda_1df1271b34c55094de858467af96bfd2>::operator()() + 0x70 bytes(s), d:\work3\llvm\llvm-project\llvm\include\llvm\support\parallel.h, line 152 + 0x12 byte(s)
218>
218>0x00007FF790235F60 (0x000000945FA16A70 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC)0x00007FF7902276C0, <lambda_1df1271b34c55094de858467af96bfd2>::operator()() + 0x70 bytes(s) (0x000000945FA168C0 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC)0x00007FF790227670 (0x000000945FA169E0 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC), std::_Invoker_ret<void,1>::_Call<<lambda_1df1271b34c55094de858467af96bfd2> &>() + 0x30 bytes(s), d:\work3\llvm\llvm-project\llvm\lib\debuginfo\pdb\native\gsistreambuilder.cpp, line 235 + 0x2D byte(s)
218>
218>, c:\program files (x86)\microsoft visual studio\2017\community\vc\tools\msvc\14.16.27023\include\type_traits, line 15732480
218>
218>, c:\program files (x86)\microsoft visual studio\2017\community\vc\tools\msvc\14.16.27023\include\type_traits, line 16707566 + 0x30 byte(s)
218>
218>0x00007FF790235F60 (0x000000945FA16710 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC)0x00007FF79022EB70 (0x000000945FA176D0 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC), <lambda_1df1271b34c55094de858467af96bfd2>::operator()() + 0x70 bytes(s), std::invoke<<lambda_1df1271b34c55094de858467af96bfd2> &>() + 0x30 bytes(s), c:\program files (x86)\microsoft visual studio\2017\community\vc\tools\msvc\14.16.27023\include\type_traits, line 16707566 + 0x30 byte(s)
218>
218>0x00007FF79023807F (0x000000945FA168B8 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC), std::_Func_impl_no_alloc<<lambda_1df1271b34c55094de858467af96bfd2>,void>::_Do_call() + 0x2F bytes(s)0x00007FF7902276C0 (0x000000945FA176D0 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC), c:\program files (x86)\microsoft visual studio\2017\community\vc\tools\msvc\14.16.27023\include\functional, line 15732480
218>
218>, std::_Invoker_ret<void,1>::_Call<<lambda_1df1271b34c55094de858467af96bfd2> &>() + 0x30 bytes(s), c:\program files (x86)\microsoft visual studio\2017\community\vc\tools\msvc\14.16.27023\include\type_traits, line 15732480
218>
218>0x00007FF78F80DD73 (0x000000945FA168B8 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC)0x00007FF79023807F (0x000000945FA176C8 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC), std::_Func_c271b34c55094de858467af() + 0x53 bytes(s), <lambda_1df1271b34c55094de858467af96bfd2>::operator()() + 0x70 bytes(s), c:\program files (x86)\microsoft visual studio\2017\community\vc\tools\msvc\14.16.27023\include\functional, line 15732480
218>
218>0x00007FF795FE2D0B (0x000000945FA168B8 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC), <lambda_d188c87ffa648e5c7e12759974b5a7a7>::operator()() + 0x2B bytes(s), d:\work3\llvm\llvm-project\llvm\lib\support\parallel.cpp, line 161
218>
218>0x00007FF795FDE3A0 (0x000000945FA168B8 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC), std::_Invoker_functor::_Call<<lambda_d188c87ffa648e5c7e12759974b5a7a7> &>() + 0x30 bytes(s), c:\program files (x86)\microsoft visual studio\2017\community\vc\tools\msvc\14.16.27023\include\type_traits, line 16707566 + 0x30 byte(s)
218>
218>0x00007FF795FE01C0 (0x000000945FA168B8 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC), std::invoke<<lambda_d188c87ffa648e5c7e12759974b5a7a7> &>() + 0x30 bytes(s), c:\program files (x86)\microsoft visual studio\2017\community\vc\tools\msvc\14.16.27023\include\type_traits, line 16707566 + 0x30 byte(s)
218>
218>0x00007FF795FDE3F0 (0x000000945FA168B8 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC), std::_Invoker_ret<void,1>::_Call<<lambda_d188c87ffa648e5c7e12759974b5a7a7> &>() + 0x30 bytes(s), c:\program files (x86)\microsoft visual studio\2017\community\vc\tools\msvc\14.16.27023\include\type_traits, line 15732480
218>
218>, d:\work3\llvm\llvm-project\llvm\include\llvm\support\parallel.h, line 152 + 0x12 byte(s)
218>
218>0x00007FF790227670 (0x000000945FA16A70 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC), std::_Invoker_functor::_Call<<lambda_1df1271b34c55094de858467af96bfd2> &>() + 0x30 bytes(s), c:\program files (x86)\microsoft visual studio\2017\community\vc\tools\msvc\14.16.27023\include\type_traits, line 16707566 + 0x30 byte(s)
218>
218>0x00007FF795FE3ABF (0x000000945FA168B0 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC)0x00007FF79022EB70 (0x000000945FA16A70 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC), std::_Func_impl_no_alloc<<lambda_d188c87ffa648e5c7e12759974b5a7a7>,void>::_Do_call() + 0x2F bytes(s), c:\program files (x86)\microsoft visual studio\2017\community\vc\tools\msvc\14.16.27023\include\functional, line 15732480
218>
218>, c:\program files (x86)\microsoft visual studio\2017\community\vc\tools\msvc\14.16.27023\include\vector, line 1733 + 0x4B byte(s)
218>
218>, std::_Invoker_functor::_Call<<lambda_1df1271b34c55094de858467af96bfd2> &>() + 0x30 bytes(s), d:\work3\llvm\llvm-project\llvm\include\llvm\support\parallel.h, line 152 + 0x12 byte(s)
218>
218>, c:\program files (x86)\microsoft visual studio\2017\community\vc\tools\msvc\14.16.27023\include\type_traits, line 16707566 + 0x30 byte(s)
218>
218>0x00007FF7902364D7 (0x000000945F6C1750 0x0000000000000C94 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC)0x00007FF790227670, <lambda_7cb86082a9071349385d17558456a913>::operator()() + 0x57 bytes(s) (0x000000945FA16710 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC)0x00007FF79022EB70 (0x000000945FA169E0 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC), std::_Invoker_functor::_Call<<lambda_1df1271b34c55094de858467af96bfd2> &>() + 0x30 bytes(s), d:\work3\llvm\llvm-project\llvm\lib\debuginfo\pdb\native\gsistreambuilder.cpp, line 235 + 0x2D byte(s)
218>
218>, std::_Invoker_functor::_Call<<lambda_1df1271b34c55094de858467af96bfd2> &>() + 0x30 bytes(s), c:\program files (x86)\microsoft visual studio\2017\community\vc\tools\msvc\14.16.27023\include\type_traits, line 16707566 + 0x30 byte(s)
218>
218>0x00007FF790230865 (0x0000000000000000 0x0000000000001000 0x000000945F6C1750 0xCCCCCCCCCCCCCCCC)0x00007FF78F80DD73 (0x00000094625CF9A0 0x000000945F9C0270 0x000000945F7B9680 0xCCCCCCCCCCCCCCCC)0x00007FF79022EB70, std::_Func_class<void>::operator()() + 0x53 bytes(s) (0x000000945FA164D0 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC), std::invoke<<lambda_1df1271b34c55094de858467af96bfd2> &>() + 0x30 bytes(s), std::invoke<<lambda_1df1271b34c55094de858467af96bfd2> &>() + 0x30 bytes(s), std::_Func_impl_no_alloc<<lambda_1df1271b34c55094de858467af96bfd2>,void>::_Do_call() + 0x2F bytes(s), d:\work3\llvm\llvm-project\llvm\include\llvm\support\parallel.h, line 152, d:\work3\llvm\llvm-project\llvm\include\llvm\support\parallel.h, line 16707566 + 0x12 byte(s), llvm::parallel::detail::parallel_for_each_n<unsigned __int64,<lambda_7cb86082a9071349385d17558456a913> >() + 0x185 bytes(s), c:\program files (x86)\microsoft visual studio\2017\community\vc\tools\msvc\14.16.27023\include\functional, line 15732480
218>
218>
218>
218> + 0x30 byte(s)
218>
218>, d:\work3\llvm\llvm-project\llvm\include\llvm\support\parallel.h, line 156 + 0x15 byte(s)
218>
218>0x00007FF790227670 (0x000000945FA1DD30 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC)0x00007FF79023011D0x00007FF79022EB70 (0x0000000000000000 0x0000000000001000 0x000000945F6C98C0 0x000000945F6C5840) (0x000000945FA16710 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC), std::_Invoker_functor::_Call<<lambda_1df1271b34c55094de858467af96bfd2> &>() + 0x30 bytes(s), std::invoke<<lambda_1df1271b34c55094de858467af96bfd2> &>() + 0x30 bytes(s), c:\program files (x86)\microsoft visual studio\2017\community\vc\tools\msvc\14.16.27023\include\functional, line 15732480
218>
218>, c:\program files (x86)\microsoft visual studio\2017\community\vc\tools\msvc\14.16.27023\include\type_traits, line 16707566 + 0x30 byte(s)
218>
218>0x00007FF78F80DD73 (0x000000945FA176C8 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC), std::_Func_class<void>::operator()() + 0x53 bytes(s), c:\program files (x86)\microsoft visual studio\2017\community\vc\tools\msvc\14.16.27023\include\functional, line 15732480
218>
218>0x00007FF795FE8119 (0x000000945F7B9680 0x0000000100000000 0xCCCCCCCC00000002 0xCCCCCCCCCCCCCCCC)0x00007FF7902276C0 (0x000000945FA16710 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC), llvm::parallel::detail::`anonymous namespace'::ThreadPoolExecutor::work() + 0x119 bytes(s), d:\work3\llvm\llvm-project\llvm\lib\support\parallel.cpp, line 109
218>
218>0x00007FF795FE2D0B (0x000000945FA176C8 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC), <lambda_d188c87ffa648e5c7e12759974b5a7a7>::operator()() + 0x2B bytes(s), d:\work3\llvm\llvm-project\llvm\lib\support\parallel.cpp, line 161
218>
218>0x00007FF795FE2CBD (0x000000945F7C6FA0 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC)0x00007FF795FDE3A0 (0x000000945FA176C8 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC), <lambda_bfb0101c2cc474fb421c6bb18c238958>::operator()() + 0x3D bytes(s), c:\program files (x86)\microsoft visual studio\2017\community\vc\tools\msvc\14.16.27023\include\type_traits, line 16707566, d:\work3\llvm\llvm-project\llvm\lib\support\parallel.cpp, line 52 + 0x30 byte(s) + 0x3D byte(s)
218>
218>
218>
218>0x00007FF795FDE490 (0x000000945F7C6FA0 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC), std::_Invoker_functor::_Call<<lambda_bfb0101c2cc474fb421c6bb18c238958> >() + 0x30 bytes(s), c:\program files (x86)\microsoft visual studio\2017\community\vc\tools\msvc\14.16.27023\include\type_traits, line 16707566 + 0x30 byte(s)
218>
218>0x00007FF7902276C0 (0x000000945FA164D0 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC), std::_Invoker_ret<void,1>::_Call<<lambda_1df1271b34c55094de858467af96bfd2> &>() + 0x30 bytes(s), c:\program files (x86)\microsoft visual studio\2017\community\vc\tools\msvc\14.16.27023\include\type_traits, line 15732480
218>
218>0x00007FF79023807F (0x000000945FA164C8 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC), std::_Func_impl_no_alloc<<lambda_1df1271b34c55094de858467af96bfd2>,void>::_Do_call() + 0x2F bytes(s)0x00007FF795FE0260, c:\program files (x86)\microsoft visual studio\2017\community\vc\tools\msvc\14.16.27023\include\functional, line 15732480
218>
218> (0x000000945F7C6FA0 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC), std::invoke<<lambda_bfb0101c2cc474fb421c6bb18c238958> >() + 0x30 bytes(s), c:\program files (x86)\microsoft visual studio\2017\community\vc\tools\msvc\14.16.27023\include\type_traits, line 16707566 + 0x30 byte(s)
218>
218>0x00007FF78F80DD73 (0x000000945FA164C8 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC)0x00007FF795FDECDC (0x000000945F7C6FA0 0x00000094612AF6CC 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC), std::_Func_class<void>::operator()() + 0x53 bytes(s), c:\program files (x86)\microsoft visual studio\2017\community\vc\tools\msvc\14.16.27023\include\functional, line 15732480
218>
218>0x00007FF795FE2D0B (0x000000945FA164C8 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC), <lambda_d188c87ffa648e5c7e12759974b5a7a7>::operator()() + 0x2B bytes(s), d:\work3\llvm\llvm-project\llvm\lib\support\parallel.cpp, line 161
218>
218>, c:\program files (x86)\microsoft visual studio\2017\community\vc\tools\msvc\14.16.27023\include\type_traits, line 16707566 + 0x30 byte(s)
218>
218>0x00007FF795FDE3A0 (0x000000945FA164C8 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC), std::_Invoker_functor::_Call<<lambda_d188c87ffa648e5c7e12759974b5a7a7> &>() + 0x30 bytes(s), c:\program files (x86)\microsoft visual studio\2017\community\vc\tools\msvc\14.16.27023\include\type_traits, line 16707566 + 0x30 byte(s)
218>
218>0x00007FF795FE01C0 (0x000000945FA164C8 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC), std::invoke<<lambda_d188c87ffa648e5c7e12759974b5a7a7> &>() + 0x30 bytes(s), c:\program files (x86)\microsoft visual studio\2017\community\vc\tools\msvc\14.16.27023\include\type_traits, line 16707566 + 0x30 byte(s)
218>
218>0x00007FF7902276C00x00007FF795FDE3F0 (0x000000945FA164C8 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC), std::_Invoker_ret<void,1>::_Call<<lambda_d188c87ffa648e5c7e12759974b5a7a7> &>() + 0x30 bytes(s), c:\program files (x86)\microsoft visual studio\2017\community\vc\tools\msvc\14.16.27023\include\type_traits, line 15732480
218>
218> (0x000000945FA169E0 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC), std::_Invoker_ret<void,1>::_Call<<lambda_1df1271b34c55094de858467af96bfd2> &>() + 0x30 bytes(s), c:\program files (x86)\microsoft visual studio\2017\community\vc\tools\msvc\14.16.27023\include\type_traits, line 15732480
218>
218>0x00007FF795FE3ABF (0x000000945FA164C0 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC), std::_Func_impl_no_alloc<<lambda_d188c87ffa648e5c7e12759974b5a7a7>,void>::_Do_call() + 0x2F bytes(s), c:\program files (x86)\microsoft visual studio\2017\community\vc\tools\msvc\14.16.27023\include\functional, line 15732480
218>
218>0x00007FF78F80DD73 (0x000000946434FB70 0x000000945F9BEC70 0x000000945F7B9680 0xCCCCCCCCCCCCCCCC), std::_Func_class<void>::operator()() + 0x53 bytes(s), c:\program files (x86)\microsoft visual studio\2017\community\vc\tools\msvc\14.16.27023\include\functional, line 15732480
218>
218>0x00007FF79023807F (0x000000945FA169D8 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC), std::_Func_impl_no_alloc<<lambda_1df1271b34c55094de858467af96bfd2>,void>::_Do_call() + 0x2F bytes(s)0x00007FF795FE8119 (0x000000945F7B9680 0x0000000100000000 0xCCCCCCCC00000004 0xCCCCCCCCCCCCCCCC), c:\program files (x86)\microsoft visual studio\2017\community\vc\tools\msvc\14.16.27023\include\functional, line 15732480
218>
218>, llvm::parallel::detail::`anonymous namespace'::ThreadPoolExecutor::work() + 0x119 bytes(s), d:\work3\llvm\llvm-project\llvm\lib\support\parallel.cpp, line 109
218>
218>0x00007FF78F80DD73 (0x000000945FA169D8 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC)0x00007FF795FE2CBD (0x000000945F7C6640 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC), std::_Func_class<void>::operator()() + 0x53 bytes(s), <lambda_bfb0101c2cc474fb421c6bb18c238958>::operator()() + 0x3D bytes(s), std::_Invoker_ret<void,1>::_Call<<lambda_1df1271b34c55094de858467af96bfd2> &>() + 0x30 bytes(s), std::_Invoker_functor::_Call<<lambda_d188c87ffa648e5c7e12759974b5a7a7> &>() + 0x30 bytes(s), d:\work3\llvm\llvm-project\llvm\lib\debuginfo\pdb\native\gsistreambuilder.cpp, line 235 + 0x2D byte(s)
218>
218>, c:\program files (x86)\microsoft visual studio\2017\community\vc\tools\msvc\14.16.27023\include\type_traits, line 16707566 + 0x30 byte(s)
218>
218>0x00007FF790235F60 (0x000000945F7E6DB0 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC), <lambda_1df1271b34c55094de858467af96bfd2>::operator()() + 0x70 bytes(s), d:\work3\llvm\llvm-project\llvm\include\llvm\support\parallel.h, line 152 + 0x12 byte(s)
218>
218>0x00007FF795FE01C0 (0x000000945FA176C8 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC), std::invoke<<lambda_d188c87ffa648e5c7e12759974b5a7a7> &>() + 0x30 bytes(s), c:\program files (x86)\microsoft visual studio\2017\community\vc\tools\msvc\14.16.27023\include\type_traits, line 16707566 + 0x30 byte(s)
218>
218>0x00007FF790227670 (0x000000945F7E6DB0 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC), std::_LaunchPad<std::unique_ptr<std::tuple<<lambda_bfb0101c2cc474fb421c6bb18c238958> >,std::default_delete<std::tuple<<lambda_bfb0101c2cc474fb421c6bb18c238958> > > > >::_Execute<0>() + 0x3C bytes(s), c:\program files (x86)\microsoft visual studio\2017\community\vc\tools\msvc\14.16.27023\include\type_traits, line 16707566 + 0x30 byte(s)
218>
218>, c:\program files (x86)\microsoft visual studio\2017\community\vc\tools\msvc\14.16.27023\include\thr\xthread, line 239
218>
218>0x00007FF795FDE3F0 (0x000000945FA176C8 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC)0x00007FF79022EB70 (0x000000945FA1DD30 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC), std::invoke<<lambda_1df1271b34c55094de858467af96bfd2> &>() + 0x30 bytes(s), c:\program files (x86)\microsoft visual studio\2017\community\vc\tools\msvc\14.16.27023\include\type_traits, line 16707566 + 0x30 byte(s)
218>
218>0x00007FF795FE5B8D (0x00000094612AF6A8 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC), std::_LaunchPad<std::unique_ptr<std::tuple<<lambda_bfb0101c2cc474fb421c6bb18c238958> >,std::default_delete<std::tuple<<lambda_bfb0101c2cc474fb421c6bb18c238958> > > > >::_Run() + 0x5D bytes(s), c:\program files (x86)\microsoft visual studio\2017\community\vc\tools\msvc\14.16.27023\include\thr\xthread, line 2470x00007FF7902276C0
218>
218> (0x000000945FA1DD30 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC), std::_Invoker_ret<void,1>::_Call<<lambda_1df1271b34c55094de858467af96bfd2> &>() + 0x30 bytes(s), c:\program files (x86)\microsoft visual studio\2017\community\vc\tools\msvc\14.16.27023\include\type_traits, line 15732480
218>
218>, llvm::parallelForEachN<<lambda_7cb86082a9071349385d17558456a913> >() + 0x5D bytes(s), d:\work3\llvm\llvm-project\llvm\include\llvm\support\parallel.h, line 194
218>
218>0x00007FF795FE45F8 (0x00000094612AF6A8 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC), std::_LaunchPad<std::unique_ptr<std::tuple<<lambda_bfb0101c2cc474fb421c6bb18c238958> >,std::default_delete<std::tuple<<lambda_bfb0101c2cc474fb421c6bb18c238958> > > > >::_Go() + 0x28 bytes(s), c:\program files (x86)\microsoft visual studio\2017\community\vc\tools\msvc\14.16.27023\include\thr\xthread, line 231
218>
218>0x00007FF790224B60 (0x000000945F786790 0x0000009400000000 0x000000945F6C9970 0xCCCCCCCCCCCCCCCC)0x00007FF79023807F (0x000000945FA1DD28 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC), llvm::pdb::GSIHashStreamBuilder::finalizeBuckets() + 0x390 bytes(s)0x00007FF795FE356D (0x00000094612AF6A8 0x00007FF97072AA1B 0x0000000000000000 0x0000000000000000), d:\work3\llvm\llvm-project\llvm\lib\debuginfo\pdb\native\gsistreambuilder.cpp, line 261
218>
218>0x00007FF7902239B1 (0x000000945F7420D0 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC), std::_Pad::_Call_func() + 0x2D bytes(s), llvm::pdb::GSIStreamBuilder::finalizePublicBuckets() + 0x71 bytes(s), d:\work3\llvm\llvm-project\llvm\lib\debuginfo\pdb\native, line 15732480, d:\work3\llvm\llvm-project\llvm\lib\debuginfo\pdb\native, line 52
218>
218>, d:\work3\llvm\llvm-project\llvm\lib\debuginfo\pdb\native\gsistreambuilder.cpp, line 171 + 0x3D byte(s)
218>
218>
218>
218>0x00007FF795FDE4900x00007FF795FE2D0B (0x000000945F7C6640 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC) (0x000000945FA169D8 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC)0x00007FF790222FA6 (0x000000945F7420D0 0x000000945F6C9A98 0x000000945F6C9CE0 0xCCCCCCCC00000000), std::_Invoker_functor::_Call<<lambda_bfb0101c2cc474fb421c6bb18c238958> >() + 0x30 bytes(s), llvm::pdb::GSIStreamBuilder::finalizeMsfLayout() + 0x36 bytes(s), d:\work3\llvm\llvm-project\llvm\lib\debuginfo\pdb\native\gsistreambuilder.cpp, line 306
218>
218>, std::_Invoker_functor:,1>::_Call<<lambda_d188c87ffa648e5c7e12759974b5a7a7() + 0x30 bytes(s), std::_Invoker_ret<void,1>::_Call<<lambda_d188c87ffa648e5c7e12759974b5a7a7> &>() + 0x30 bytes(s), std::_Func_impl_no_alloc<<lambda_1df1271b34c55094de858467af96bfd2>,void>::_Do_call() + 0x2F bytes(s), std::invoke<<lambda_1df1271b34c55094de858467af96bfd2> &>() + 0x30 bytes(s), c:\program files (x86)\microsoft visual studio\2017\community\vc\tools\msvc\14.16.27023\include\functional, line 15732480
218>
218>, c:\program files (x86)\microsoft visual studio\2017\community\vc\tools\msvc\14.16.27023\include\type_traits, line 167075660x00007FF79023F880 + 0x30 byte(s)
218>
218> (0x000000945F6CA690 0x000000945F6C9DF8 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC), llvm::pdb::PDBFileBuilder::finalizeMsfLayout() + 0x180 bytes(s)0x00007FF7902276C0 (0x000000945FA16A70 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC)0x00007FF78F80DD73 (0x000000945FA1DD28 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC), d:\work3\llvm\llvm-project\llvm\lib\debuginfo\pdb\native\pdbfilebuilder.cpp, line 141 + 0x21 byte(s)
218>
218>, c:\program files (x86)\microsoft visual studio\2017\community\vc\tools\msvc\14.16.27023\include\type_traits, line 16707566 + 0x30 byte(s)
218>
218>0x00007FF79023E378 (0x000000945F6CA690 0x000000945F6CA5C8 0x000000945F6CA5F0 0x000000945F6CAC68), llvm::pdb::PDBFileBuilder::commit() + 0x88 bytes(s)0x00007FF795FE0260 (0x000000945F7C6640 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC), d:\work3\llvm\llvm-project\llvm\lib\debuginfo\pdb\native\pdbfilebuilder.cpp, line 265 + 0x12 byte(s)
218>
218>, std::invoke<<lambda_bfb0101c2cc474fb421c6bb18c238958> >() + 0x30 bytes(s), c:\program files (x86)\microsoft visual studio\2017\community\vc\tools\msvc\14.16.27023\include\type_traits, line 16707566 + 0x30 byte(s)
218>
218>0x00007FF78F965956 (0x000000945F6CA688 0x000000945F6CAC68 0x000000945F6CACB0 0xCCCCCCCCCCCCCCCC)0x00007FF795FDECDC (0x000000945F7C6640 0x00000094612AF6CC 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC), `anonymous namespace'::PDBLinker::commit() + 0x116 bytes(s), c:\program files (x86)\microsoft visual studio\2017\community\vc\tools\msvc\14.16.27023\include\type_traits, line 16707566 + 0x30 byte(s)
218>
218>0x00007FF79022EB70 (0x000000945F7E6DB0 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC), d:\work3\llvm\llvm-project\lld\coff\pdb.cpp, line 1456 + 0x6E byte(s)
218>
218>, std::_Invoker_ret<void,1>::_Call<<lambda_1df1271b34c55094de858467af96bfd2> &>() + 0x30 bytes(s), std::_Func_class<void>::operator()() + 0x53 bytes(s), <lambda_d188c87ffa648e5c7e12759974b5a7a7>::operator()() + 0x2B bytes(s), std::_LaunchPad<std::unique_ptr<std::tuple<<lambda_bfb0101c2cc474fb421c6bb18c238958> >,std::default_delete<std::tuple<<lambda_bfb0101c2cc474fb421c6bb18c238958> > > > >::_Execute<0>() + 0x3C bytes(s), c:\program files (x86)\microsoft visual studio\2017\community\vc\tools\msvc\14.16.27023\include\type_traits, line 15732480
218>
218>, c:\program files (x86)\microsoft visual studio\2017\community\vc\tools\msvc\14.16.27023\include\thr\xthread, line 15732480
218>
218>, c:\program files (x86)\microsoft visual studio\2017\community\vc\tools\msvc\14.16.27023\include\thr\xthread, line 209
218>
218>, c:\program files (x86)\microsoft visual studio\2017\community\vc\tools\msvc\14.16.27023\include\thr\xthread, line 239
218>
218>0x00007FF970744FB8 (0x00007FF78F2FA8C9 0x00000094612AF6A8 0x0000000000000000 0x0000000000000000), _register_onexit_function() + 0x4A8 bytes(s)
218>
218>0x00007FF78F9632E3 (0x000000945F753FE0 0x000000945F6CAF80 0x000000945F6CAF90 0x000000945ED2061C), lld::coff::createPDB() + 0x143 bytes(s), d:\work3\llvm\llvm-project\lld\coff\pdb.cpp, line 1377
218>
218>0x00007FF970744BF1 (0x000000945F9C8DA0 0x0000000000000000 0x0000000000000000 0x0000000000000000), _register_onexit_function() + 0xE1 bytes(s)
218>
218>0x00007FF79023807F0x00007FF795FE3ABF (0x000000945FA16708 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC) (0x000000945FA176C0 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC), std::_Func_impl_no_alloc<<lambda_1df1271b34c55094de858467af96bfd2>,void>::_Do_call() + 0x2F bytes(s)0x00007FF9A00A13D2 (0x00007FF9A00A13B0 0x0000000000000000 0x0000000000000000 0x0000000000000000), c:\program files (x86)\microsoft visual studio\2017\community\vc\tools\msvc\14.16.27023\include\type_traits, line 157324800x00007FF78F90242F
218>
218>, BaseThreadInitThunk() + 0x22 bytes(s), c:\program files (x86)\microsoft visual studio\2017\community\vc\tools\msvc\14.16.27023\include\functional, line 15732480, c:\program files (x86)\microsoft visual studio\2017\community\vc\tools\msvc\14.16.27023\include\functional, line 15732480 (0x000000945F6CB020 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC)
218>
218>
218>
218>
218>
218>0x00007FF795FE5B8D (0x00000094612AF6A8 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC 0xCCCCCCCCCCCCCCCC)0x00007FF9A28654E4 (0x0000000000000000 0x0000000000000000 0x0000000000000000 0x0000000000000000), RtlUserThreadStart() + 0x34 bytes(s)
218>
218>
218>CUSTOMBUILD : error : command failed with exit status: 2147483651

[aganea]

@grimar Fixed in 23cd70d71c10dc0b31ac37a733349f9de2e9b84c

[grimar]

In D81296#2144162, @aganea wrote:

@grimar Fixed in 23cd70d71c10dc0b31ac37a733349f9de2e9b84c

Works fine for me now, thanks!

lld/COFF/PDB.cpp

static pdb::BulkPublic createPublic(Defined *def) {
 
   PublicSymFlags flags = PublicSymFlags::None;
   if (auto *d = dyn_cast<DefinedCOFF>(def)) {
     if (d->getCOFFSymbol().isFunctionDefinition())
       flags = PublicSymFlags::Function;
   } else if (isa<DefinedImportThunk>(def)) {
     flags = PublicSymFlags::Function;
   }
-  pub.Flags = static_cast<uint16_t>(flags);
+  pub.setFlags(flags);
 
   OutputSection *os = def->getChunk()->getOutputSection();
   assert(os && "all publics should be in final image");
   pub.Offset = def->getRVA() - os->getRVA();
-  pub.U.Segment = os->sectionIndex;
+  pub.Segment = os->sectionIndex;
   return pub;
 }
 
 // Add all object files to the PDB. Merge .debug$T sections into IpiData and
 // TpiData.
 void PDBLinker::addObjectsToPDB() {
   ScopedTimer t1(addObjectsTimer);
 

llvm/include/llvm/DebugInfo/PDB/Native/GSIStreamBuilder.h

 //===- GSIStreamBuilder.h - PDB Publics/Globals Stream Creation -*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #ifndef LLVM_DEBUGINFO_PDB_RAW_GSISTREAMBUILDER_H
 #define LLVM_DEBUGINFO_PDB_RAW_GSISTREAMBUILDER_H
 
+#include "llvm/ADT/DenseSet.h"
 #include "llvm/DebugInfo/CodeView/SymbolRecord.h"
 #include "llvm/DebugInfo/PDB/Native/GlobalsStream.h"
 #include "llvm/DebugInfo/PDB/Native/RawConstants.h"
 #include "llvm/DebugInfo/PDB/Native/RawTypes.h"
 #include "llvm/Support/BinaryByteStream.h"
 #include "llvm/Support/BinaryItemStream.h"
 #include "llvm/Support/BinaryStreamRef.h"
 #include "llvm/Support/BinaryStreamWriter.h"

 
 namespace msf {
 class MSFBuilder;
 struct MSFLayout;
 } // namespace msf
 namespace pdb {
 struct GSIHashStreamBuilder;
 struct BulkPublic;
+struct SymbolDenseMapInfo;
 
 class GSIStreamBuilder {
 
 public:
   explicit GSIStreamBuilder(msf::MSFBuilder &Msf);
   ~GSIStreamBuilder();
 
   GSIStreamBuilder(const GSIStreamBuilder &) = delete;
   GSIStreamBuilder &operator=(const GSIStreamBuilder &) = delete;
 
   Error finalizeMsfLayout();
 
   Error commit(const msf::MSFLayout &Layout, WritableBinaryStreamRef Buffer);
 
   uint32_t getPublicsStreamIndex() const { return PublicsStreamIndex; }
   uint32_t getGlobalsStreamIndex() const { return GlobalsStreamIndex; }
   uint32_t getRecordStreamIndex() const { return RecordStreamIndex; }
 
   // Add public symbols in bulk.
-  void addPublicSymbols(std::vector<BulkPublic> &&Publics);
+  void addPublicSymbols(std::vector<BulkPublic> &&PublicsIn);
 
   void addGlobalSymbol(const codeview::ProcRefSym &Sym);
   void addGlobalSymbol(const codeview::DataSym &Sym);
   void addGlobalSymbol(const codeview::ConstantSym &Sym);
+
+  // Add a pre-serialized global symbol record. The caller must ensure that the
+  // symbol data remains alive until the global stream is committed to disk.
   void addGlobalSymbol(const codeview::CVSymbol &Sym);
 
 private:
+  void finalizePublicBuckets();
+  void finalizeGlobalBuckets(uint32_t RecordZeroOffset);
+
+  template <typename T> void serializeAndAddGlobal(const T &Symbol);
+
   uint32_t calculatePublicsHashStreamSize() const;
   uint32_t calculateGlobalsHashStreamSize() const;
   Error commitSymbolRecordStream(WritableBinaryStreamRef Stream);
   Error commitPublicsHashStream(WritableBinaryStreamRef Stream);
   Error commitGlobalsHashStream(WritableBinaryStreamRef Stream);
 
   uint32_t PublicsStreamIndex = kInvalidStreamIndex;
   uint32_t GlobalsStreamIndex = kInvalidStreamIndex;
   uint32_t RecordStreamIndex = kInvalidStreamIndex;
   msf::MSFBuilder &Msf;
   std::unique_ptr<GSIHashStreamBuilder> PSH;
   std::unique_ptr<GSIHashStreamBuilder> GSH;
-  std::vector<support::ulittle32_t> PubAddrMap;
+
+  // List of all of the public records. These are stored unserialized so that we
+  // can defer copying the names until we are ready to commit the PDB.
+  std::vector<BulkPublic> Publics;
+
+  // List of all of the global records.
+  std::vector<codeview::CVSymbol> Globals;
+
+  // Hash table for deduplicating global typedef and constant records. Only used
+  // for globals.
+  llvm::DenseSet<codeview::CVSymbol, SymbolDenseMapInfo> GlobalsSeen;
 };
 
 /// This struct is equivalent to codeview::PublicSym32, but it has been
 /// optimized for size to speed up bulk serialization and sorting operations
 /// during PDB writing.
 struct BulkPublic {
+  BulkPublic() : Flags(0), BucketIdx(0) {}
+
   const char *Name = nullptr;
   uint32_t NameLen = 0;
 
   // Offset of the symbol record in the publics stream.
   uint32_t SymOffset = 0;
 
   // Section offset of the symbol in the image.
   uint32_t Offset = 0;
 
-  union {
-    // Section index of the section containing the symbol.
-    uint16_t Segment;
+  uint16_t Segment = 0;
 
-    // GSI hash table bucket index.
-    uint16_t BucketIdx;
-  } U{0};
+  // PublicSymFlags.
+  uint16_t Flags : 3;
 
-  // PublicSymFlags or hash bucket index
-  uint16_t Flags = 0;
+  // GSI hash table bucket index. The maximum value is IPHR_HASH.
+  uint16_t BucketIdx : 13;
+
+  void setFlags(codeview::PublicSymFlags F) {
+    Flags = uint32_t(F);
+    assert(Flags == uint32_t(F) && "truncated");
+  }
+
+  void setBucketIdx(uint16_t B) {
+    assert(B < IPHR_HASH);
+    BucketIdx = B;
+  }
 
   StringRef getName() const { return StringRef(Name, NameLen); }
 };
 
 static_assert(sizeof(BulkPublic) <= 24, "unexpected size increase");
 static_assert(std::is_trivially_copyable<BulkPublic>::value,
               "should be trivial");
 
 } // namespace pdb
 } // namespace llvm
 
 #endif

llvm/lib/DebugInfo/PDB/Native/GSIStreamBuilder.cpp

 //===- DbiStreamBuilder.cpp - PDB Dbi Stream Creation -----------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 //
 // The data structures defined in this file are based on the reference
 // implementation which is available at
 // https://github.com/Microsoft/microsoft-pdb/blob/master/PDB/dbi/gsi.cpp
 //
 //===----------------------------------------------------------------------===//
 
 #include "llvm/DebugInfo/PDB/Native/GSIStreamBuilder.h"
-
-#include "llvm/ADT/DenseSet.h"
 #include "llvm/DebugInfo/CodeView/RecordName.h"
 #include "llvm/DebugInfo/CodeView/SymbolDeserializer.h"
 #include "llvm/DebugInfo/CodeView/SymbolRecord.h"
 #include "llvm/DebugInfo/CodeView/SymbolSerializer.h"
 #include "llvm/DebugInfo/MSF/MSFBuilder.h"
 #include "llvm/DebugInfo/MSF/MSFCommon.h"
 #include "llvm/DebugInfo/MSF/MappedBlockStream.h"
 #include "llvm/DebugInfo/PDB/Native/GlobalsStream.h"
 #include "llvm/DebugInfo/PDB/Native/Hash.h"
 #include "llvm/Support/BinaryItemStream.h"
 #include "llvm/Support/BinaryStreamWriter.h"
 #include "llvm/Support/Parallel.h"
 #include "llvm/Support/xxhash.h"
 #include <algorithm>
 #include <vector>
 
 using namespace llvm;
 using namespace llvm::msf;
 using namespace llvm::pdb;
 using namespace llvm::codeview;
 
+// Helper class for building the public and global PDB hash table buckets.
 struct llvm::pdb::GSIHashStreamBuilder {
-  struct SymbolDenseMapInfo {
-    static inline CVSymbol getEmptyKey() {
-      static CVSymbol Empty;
-      return Empty;
-    }
-    static inline CVSymbol getTombstoneKey() {
-      static CVSymbol Tombstone(
-          DenseMapInfo<ArrayRef<uint8_t>>::getTombstoneKey());
-      return Tombstone;
-    }
-    static unsigned getHashValue(const CVSymbol &Val) {
-      return xxHash64(Val.RecordData);
-    }
-    static bool isEqual(const CVSymbol &LHS, const CVSymbol &RHS) {
-      return LHS.RecordData == RHS.RecordData;
-    }
-  };
+  // Sum of the size of all public or global records.
+  uint32_t RecordByteSize = 0;
+
+  std::vector<PSHashRecord> HashRecords;
+  std::array<support::ulittle32_t, (IPHR_HASH + 32) / 32> HashBitmap;
+  std::vector<support::ulittle32_t> HashBuckets;
+
+  uint32_t calculateSerializedLength() const;
+  Error commit(BinaryStreamWriter &Writer);
+
+  void finalizePublicBuckets();
+  void finalizeGlobalBuckets(uint32_t RecordZeroOffset);
+
+  // Assign public and global symbol records into hash table buckets.
+  // Modifies the list of records to store the bucket index, but does not
+  // change the order.
+  void finalizeBuckets(uint32_t RecordZeroOffset,
+                       MutableArrayRef<BulkPublic> Globals);
+};
+
+// DenseMapInfo implementation for deduplicating symbol records.
+struct llvm::pdb::SymbolDenseMapInfo {
 
-  std::vector<CVSymbol> Records;
-  llvm::DenseSet<CVSymbol, SymbolDenseMapInfo> SymbolHashes;
-  std::vector<PSHashRecord> HashRecords;
-  std::array<support::ulittle32_t, (IPHR_HASH + 32) / 32> HashBitmap;
-  std::vector<support::ulittle32_t> HashBuckets;
-
-  uint32_t calculateSerializedLength() const;
-  uint32_t calculateRecordByteSize() const;
-  Error commit(BinaryStreamWriter &Writer);
-
-  void finalizeBuckets(uint32_t RecordZeroOffset);
-
-  // Finalize public symbol buckets.
-  void finalizeBuckets(uint32_t RecordZeroOffset,
-                       std::vector<BulkPublic> &&Publics);
-
-  template <typename T> void addSymbol(const T &Symbol, MSFBuilder &Msf) {
-    T Copy(Symbol);
-    addSymbol(SymbolSerializer::writeOneSymbol(Copy, Msf.getAllocator(),
-                                               CodeViewContainer::Pdb));
-  }
-  void addSymbol(const CVSymbol &Symbol);
-};
-
-void GSIHashStreamBuilder::addSymbol(const codeview::CVSymbol &Symbol) {
-  // Ignore duplicate typedefs and constants.
-  if (Symbol.kind() == S_UDT || Symbol.kind() == S_CONSTANT) {
-    auto Iter = SymbolHashes.insert(Symbol);
-    if (!Iter.second)
-      return;
-  }
-  Records.push_back(Symbol);
-}
-
 namespace {
 LLVM_PACKED_START
 struct PublicSym32Layout {
   RecordPrefix Prefix;
   PublicSym32Header Pub;
   // char Name[];
 };
 LLVM_PACKED_END
uint32_t NameLen = std::min(
       Pub.NameLen, uint32_t(MaxRecordLength - sizeof(PublicSym32Layout) - 1));
   size_t Size = alignTo(sizeof(PublicSym32Layout) + NameLen + 1, 4);
   assert(Size == sizeOfPublic(Pub));
   auto *FixedMem = reinterpret_cast<PublicSym32Layout *>(Mem);
   FixedMem->Prefix.RecordKind = static_cast<uint16_t>(codeview::S_PUB32);
   FixedMem->Prefix.RecordLen = static_cast<uint16_t>(Size - 2);
   FixedMem->Pub.Flags = Pub.Flags;
   FixedMem->Pub.Offset = Pub.Offset;
-  FixedMem->Pub.Segment = Pub.U.Segment;
+  FixedMem->Pub.Segment = Pub.Segment;
   char *NameMem = reinterpret_cast<char *>(FixedMem + 1);
   memcpy(NameMem, Pub.Name, NameLen);
   // Zero the null terminator and remaining bytes.
   memset(&NameMem[NameLen], 0, Size - sizeof(PublicSym32Layout) - NameLen);
   return CVSymbol(makeArrayRef(reinterpret_cast<uint8_t *>(Mem), Size));
 }
 
 uint32_t GSIHashStreamBuilder::calculateSerializedLength() const {
   uint32_t Size = sizeof(GSIHashHeader);
   Size += HashRecords.size() * sizeof(PSHashRecord);
   Size += HashBitmap.size() * sizeof(uint32_t);
   Size += HashBuckets.size() * sizeof(uint32_t);
   return Size;
 }
 
-uint32_t GSIHashStreamBuilder::calculateRecordByteSize() const {
-  uint32_t Size = 0;
-  for (const auto &Sym : Records)
-    Size += Sym.length();
-  return Size;
-}
-
 Error GSIHashStreamBuilder::commit(BinaryStreamWriter &Writer) {
   GSIHashHeader Header;
   Header.VerSignature = GSIHashHeader::HdrSignature;
   Header.VerHdr = GSIHashHeader::HdrVersion;
   Header.HrSize = HashRecords.size() * sizeof(PSHashRecord);
   Header.NumBuckets = HashBitmap.size() * 4 + HashBuckets.size() * 4;
 
   if (auto EC = Writer.writeObject(Header))
static int gsiRecordCmp(StringRef S1, StringRef S2) {
   // If either string contains non ascii characters, memcmp them.
   if (LLVM_UNLIKELY(!isAsciiString(S1) || !isAsciiString(S2)))
     return memcmp(S1.data(), S2.data(), LS);
 
   // Both strings are ascii, perform a case-insenstive comparison.
   return S1.compare_lower(S2.data());
 }
 
-void GSIHashStreamBuilder::finalizeBuckets(uint32_t RecordZeroOffset) {
-  // Build up a list of globals to be bucketed. This repurposes the BulkPublic
-  // struct with different meanings for the fields to avoid reallocating a new
-  // vector during public symbol table hash construction.
-  std::vector<BulkPublic> Globals;
-  Globals.resize(Records.size());
+void GSIStreamBuilder::finalizePublicBuckets() {
+  PSH->finalizeBuckets(0, Publics);
+}
+
+void GSIStreamBuilder::finalizeGlobalBuckets(uint32_t RecordZeroOffset) {
+  // Build up a list of globals to be bucketed. Use the BulkPublic data
+  // structure for this purpose, even though these are global records, not
+  // public records. Most of the same fields are required:
+  // - Name
+  // - NameLen
+  // - SymOffset
+  // - BucketIdx
+  // The dead fields are Offset, Segment, and Flags.
+  std::vector<BulkPublic> Records;
+  Records.resize(Globals.size());
   uint32_t SymOffset = RecordZeroOffset;
-  for (size_t I = 0, E = Records.size(); I < E; ++I) {
-    StringRef Name = getSymbolName(Records[I]);
-    Globals[I].Name = Name.data();
-    Globals[I].NameLen = Name.size();
-    Globals[I].SymOffset = SymOffset;
-    SymOffset += Records[I].length();
-  }
-
-  finalizeBuckets(RecordZeroOffset, std::move(Globals));
-}
-
-void GSIHashStreamBuilder::finalizeBuckets(uint32_t RecordZeroOffset,
-                                           std::vector<BulkPublic> &&Globals) {
-  // Hash every name in parallel. The Segment field is no longer needed, so
-  // store the BucketIdx in a union.
-  parallelForEachN(0, Globals.size(), [&](size_t I) {
-    Globals[I].U.BucketIdx = hashStringV1(Globals[I].Name) % IPHR_HASH;
+  for (size_t I = 0, E = Globals.size(); I < E; ++I) {
+    StringRef Name = getSymbolName(Globals[I]);
+    Records[I].Name = Name.data();
+    Records[I].NameLen = Name.size();
+    Records[I].SymOffset = SymOffset;
+    SymOffset += Globals[I].length();
+  }
+
+  GSH->finalizeBuckets(RecordZeroOffset, Records);
+}
+
+void GSIHashStreamBuilder::finalizeBuckets(
+    uint32_t RecordZeroOffset, MutableArrayRef<BulkPublic> Records) {
+  // Hash every name in parallel.
+  parallelForEachN(0, Records.size(), [&](size_t I) {
+    Records[I].setBucketIdx(hashStringV1(Records[I].Name) % IPHR_HASH);
   });
 
-  // Parallel sort by bucket index, then name within the buckets. Within the
-  // buckets, sort each bucket by memcmp of the symbol's name.  It's important
-  // that we use the same sorting algorithm as is used by the reference
-  // implementation to ensure that the search for a record within a bucket can
-  // properly early-out when it detects the record won't be found.  The
-  // algorithm used here corredsponds to the function
+  // Count up the size of each bucket. Then, use a prefix sum to calculate the
+  // bucket start offsets.
+  uint32_t BucketStarts[IPHR_HASH];
+  memset(&BucketStarts[0], 0, sizeof(BucketStarts));
+  for (const BulkPublic &P : Records)
+    ++BucketStarts[P.BucketIdx];
+  uint32_t Sum = 0;
+  for (uint32_t &B : BucketStarts) {
+    uint32_t Size = B;
+    B = Sum;
+    Sum += Size;
+  }
+
+  // Place globals into the hash table in bucket order. When placing a global,
+  // update the bucket start. Every hash table slot should be filled. Always use
+  // a refcount of one for now.
+  HashRecords.resize(Records.size());
+  uint32_t BucketCursors[IPHR_HASH];
+  memcpy(BucketCursors, BucketStarts, sizeof(BucketCursors));
+  for (int I = 0, E = Records.size(); I < E; ++I) {
+    uint32_t HashIdx = BucketCursors[Records[I].BucketIdx]++;
+    HashRecords[HashIdx].Off = I;
+    HashRecords[HashIdx].CRef = 1;
+  }
+
+  // Within the buckets, sort each bucket by memcmp of the symbol's name.  It's
+  // important that we use the same sorting algorithm as is used by the
+  // reference implementation to ensure that the search for a record within a
+  // bucket can properly early-out when it detects the record won't be found.
+  // The algorithm used here corresponds to the function
   // caseInsensitiveComparePchPchCchCch in the reference implementation.
-  auto BucketCmp = [](const BulkPublic &L, const BulkPublic &R) {
-    if (L.U.BucketIdx != R.U.BucketIdx)
-      return L.U.BucketIdx < R.U.BucketIdx;
+  parallelForEachN(0, IPHR_HASH, [&](size_t I) {
+    auto B = &HashRecords[BucketStarts[I]];
+    auto E = &HashRecords[BucketCursors[I]];
+    auto BucketCmp = [Records](const PSHashRecord &LHash,
+                               const PSHashRecord &RHash) {
+      const BulkPublic &L = Records[uint32_t(LHash.Off)];
+      const BulkPublic &R = Records[uint32_t(RHash.Off)];
+      assert(L.BucketIdx == R.BucketIdx);
       int Cmp = gsiRecordCmp(L.getName(), R.getName());
       if (Cmp != 0)
         return Cmp < 0;
       // This comparison is necessary to make the sorting stable in the presence
       // of two static globals with the same name. The easiest way to observe
       // this is with S_LDATA32 records.
       return L.SymOffset < R.SymOffset;
     };
-  parallelSort(Globals, BucketCmp);
+    llvm::sort(B, E, BucketCmp);
 
-  // Zero out the bucket index bitmap.
-  for (ulittle32_t &Word : HashBitmap)
-    Word = 0;
-
-  // Compute the three tables: the hash records in bucket and chain order, the
-  // bucket presence bitmap, and the bucket chain start offsets.
-  HashRecords.reserve(Globals.size());
-  uint32_t LastBucketIdx = ~0U;
-  for (const BulkPublic &Global : Globals) {
-    // If this is a new bucket, add it to the bitmap and the start offset map.
-    uint32_t BucketIdx = Global.U.BucketIdx;
-    if (LastBucketIdx != BucketIdx) {
-      HashBitmap[BucketIdx / 32] |= 1U << (BucketIdx % 32);
-
-      // Calculate what the offset of the first hash record in the chain would
-      // be if it were inflated to contain 32-bit pointers. On a 32-bit system,
-      // each record would be 12 bytes. See HROffsetCalc in gsi.h.
+    // After we are done sorting, replace the global indices with the stream
+    // offsets of each global. Add one when writing symbol offsets to disk.
+    // See GSI1::fixSymRecs.
+    for (PSHashRecord &HRec : make_range(B, E))
+      HRec.Off = Records[uint32_t(HRec.Off)].SymOffset + 1;
+  });
+
+  // For each non-empty bucket, push the bucket start offset into HashBuckets
+  // and set a bit in the hash bitmap.
+  for (uint32_t I = 0; I < HashBitmap.size(); ++I) {
+    uint32_t Word = 0;
+    for (uint32_t J = 0; J < 32; ++J) {
+      // Skip empty buckets.
+      uint32_t BucketIdx = I * 32 + J;
+      if (BucketIdx >= IPHR_HASH ||
+          BucketStarts[BucketIdx] == BucketCursors[BucketIdx])
+        continue;
+      Word |= (1U << J);
       const int SizeOfHROffsetCalc = 12;
       ulittle32_t ChainStartOff =
-          ulittle32_t(HashRecords.size() * SizeOfHROffsetCalc);
+          ulittle32_t(BucketStarts[BucketIdx] * SizeOfHROffsetCalc);
       HashBuckets.push_back(ChainStartOff);
-      LastBucketIdx = BucketIdx;
     }
-
-    // Create the hash record. Add one when writing symbol offsets to disk.
-    // See GSI1::fixSymRecs. Always use a refcount of 1 for now.
-    PSHashRecord HRec;
-    HRec.Off = Global.SymOffset + 1;
-    HRec.CRef = 1;
-    HashRecords.push_back(HRec);
+    HashBitmap[I] = Word;
   }
 }
 
 GSIStreamBuilder::GSIStreamBuilder(msf::MSFBuilder &Msf)
     : Msf(Msf), PSH(std::make_unique<GSIHashStreamBuilder>()),
       GSH(std::make_unique<GSIHashStreamBuilder>()) {}
 
 GSIStreamBuilder::~GSIStreamBuilder() {}
 
 uint32_t GSIStreamBuilder::calculatePublicsHashStreamSize() const {
   uint32_t Size = 0;
   Size += sizeof(PublicsStreamHeader);
   Size += PSH->calculateSerializedLength();
-  Size += PubAddrMap.size() * sizeof(uint32_t); // AddrMap
+  Size += Publics.size() * sizeof(uint32_t); // AddrMap
   // FIXME: Add thunk map and section offsets for incremental linking.
 
   return Size;
 }
 
 uint32_t GSIStreamBuilder::calculateGlobalsHashStreamSize() const {
   return GSH->calculateSerializedLength();
 }
 
 Error GSIStreamBuilder::finalizeMsfLayout() {
   // First we write public symbol records, then we write global symbol records.
-  uint32_t PublicsSize = PSH->calculateRecordByteSize();
-  uint32_t GlobalsSize = GSH->calculateRecordByteSize();
-  GSH->finalizeBuckets(PublicsSize);
+  finalizePublicBuckets();
+  finalizeGlobalBuckets(PSH->RecordByteSize);
 
   Expected<uint32_t> Idx = Msf.addStream(calculateGlobalsHashStreamSize());
   if (!Idx)
     return Idx.takeError();
   GlobalsStreamIndex = *Idx;
 
   Idx = Msf.addStream(calculatePublicsHashStreamSize());
   if (!Idx)
     return Idx.takeError();
   PublicsStreamIndex = *Idx;
 
-  uint32_t RecordBytes = PublicsSize + GlobalsSize;
+  uint32_t RecordBytes = PSH->RecordByteSize + GSH->RecordByteSize;
 
   Idx = Msf.addStream(RecordBytes);
   if (!Idx)
     return Idx.takeError();
   RecordStreamIndex = *Idx;
   return Error::success();
 }
 
-void GSIStreamBuilder::addPublicSymbols(std::vector<BulkPublic> &&Publics) {
+void GSIStreamBuilder::addPublicSymbols(std::vector<BulkPublic> &&PublicsIn) {
+  assert(Publics.empty() && PSH->RecordByteSize == 0 &&
+         "publics can only be added once");
+  Publics = std::move(PublicsIn);
+
   // Sort the symbols by name. PDBs contain lots of symbols, so use parallelism.
   parallelSort(Publics, [](const BulkPublic &L, const BulkPublic &R) {
     return L.getName() < R.getName();
   });
 
-  // Assign offsets and allocate one contiguous block of memory for all public
-  // symbols.
+  // Assign offsets and calculate the length of the public symbol records.
   uint32_t SymOffset = 0;
   for (BulkPublic &Pub : Publics) {
     Pub.SymOffset = SymOffset;
     SymOffset += sizeOfPublic(Pub);
   }
-  uint8_t *Mem =
-      reinterpret_cast<uint8_t *>(Msf.getAllocator().Allocate(SymOffset, 4));
-
-  // Instead of storing individual CVSymbol records, store them as one giant
-  // buffer.
-  // FIXME: This is kind of a hack. This makes Records.size() wrong, and we have
-  // to account for that elsewhere.
-  PSH->Records.push_back(CVSymbol(makeArrayRef(Mem, SymOffset)));
-
-  // Serialize them in parallel.
-  parallelForEachN(0, Publics.size(), [&](size_t I) {
-    const BulkPublic &Pub = Publics[I];
-    serializePublic(Mem + Pub.SymOffset, Pub);
-  });
-
-  // Re-sort the publics by address so we can build the address map. We no
-  // longer need the original ordering.
-  auto AddrCmp = [](const BulkPublic &L, const BulkPublic &R) {
-    if (L.U.Segment != R.U.Segment)
-      return L.U.Segment < R.U.Segment;
-    if (L.Offset != R.Offset)
-      return L.Offset < R.Offset;
-    // parallelSort is unstable, so we have to do name comparison to ensure
-    // that two names for the same location come out in a determinstic order.
-    return L.getName() < R.getName();
-  };
-  parallelSort(Publics, AddrCmp);
-
-  // Fill in the symbol offsets in the appropriate order.
-  PubAddrMap.reserve(Publics.size());
-  for (const BulkPublic &Pub : Publics)
-    PubAddrMap.push_back(ulittle32_t(Pub.SymOffset));
 
-  // Finalize public symbol buckets immediately after they have been added.
-  // They should all be warm in the cache at this point, so go ahead and do it
-  // now.
-  PSH->finalizeBuckets(0, std::move(Publics));
+  // Remember the length of the public stream records.
+  PSH->RecordByteSize = SymOffset;
 }
 
 void GSIStreamBuilder::addGlobalSymbol(const ProcRefSym &Sym) {
-  GSH->addSymbol(Sym, Msf);
+  serializeAndAddGlobal(Sym);
 }
 
 void GSIStreamBuilder::addGlobalSymbol(const DataSym &Sym) {
-  GSH->addSymbol(Sym, Msf);
+  serializeAndAddGlobal(Sym);
 }
 
 void GSIStreamBuilder::addGlobalSymbol(const ConstantSym &Sym) {
-  GSH->addSymbol(Sym, Msf);
+  serializeAndAddGlobal(Sym);
 }
 
-void GSIStreamBuilder::addGlobalSymbol(const codeview::CVSymbol &Sym) {
-  GSH->addSymbol(Sym);
+template <typename T>
+void GSIStreamBuilder::serializeAndAddGlobal(const T &Symbol) {
+  T Copy(Symbol);
+  addGlobalSymbol(SymbolSerializer::writeOneSymbol(Copy, Msf.getAllocator(),
+                                                   CodeViewContainer::Pdb));
+}
+
+void GSIStreamBuilder::addGlobalSymbol(const codeview::CVSymbol &Symbol) {
+  // Ignore duplicate typedefs and constants.
+  if (Symbol.kind() == S_UDT || Symbol.kind() == S_CONSTANT) {
+    auto Iter = GlobalsSeen.insert(Symbol);
+    if (!Iter.second)
+      return;
+  }
+  GSH->RecordByteSize += Symbol.length();
+  Globals.push_back(Symbol);
+}
+
+// Serialize each public and write it.
+static Error writePublics(BinaryStreamWriter &Writer,
+                          ArrayRef<BulkPublic> Publics) {
+  std::vector<uint8_t> Storage;
+  for (const BulkPublic &Pub : Publics) {
+    Storage.resize(sizeOfPublic(Pub));
+    serializePublic(Storage.data(), Pub);
+    if (Error E = Writer.writeBytes(Storage))
+      return E;
+  }
+  return Error::success();
 }
 
 static Error writeRecords(BinaryStreamWriter &Writer,
                           ArrayRef<CVSymbol> Records) {
   BinaryItemStream<CVSymbol> ItemStream(support::endianness::little);
   ItemStream.setItems(Records);
   BinaryStreamRef RecordsRef(ItemStream);
   return Writer.writeStreamRef(RecordsRef);
 }
 
 Error GSIStreamBuilder::commitSymbolRecordStream(
     WritableBinaryStreamRef Stream) {
   BinaryStreamWriter Writer(Stream);
 
   // Write public symbol records first, followed by global symbol records.  This
   // must match the order that we assume in finalizeMsfLayout when computing
   // PSHZero and GSHZero.
-  if (auto EC = writeRecords(Writer, PSH->Records))
+  if (auto EC = writePublics(Writer, Publics))
     return EC;
-  if (auto EC = writeRecords(Writer, GSH->Records))
+  if (auto EC = writeRecords(Writer, Globals))
     return EC;
 
   return Error::success();
 }
 
+static std::vector<support::ulittle32_t>
+computeAddrMap(ArrayRef<BulkPublic> Publics) {
+  // Build a parallel vector of indices into the Publics vector, and sort it by
+  // address.
+  std::vector<ulittle32_t> PubAddrMap;
+  PubAddrMap.reserve(Publics.size());
+  for (int I = 0, E = Publics.size(); I < E; ++I)
+    PubAddrMap.push_back(ulittle32_t(I));
+
+  auto AddrCmp = [Publics](const ulittle32_t &LIdx, const ulittle32_t &RIdx) {
+    const BulkPublic &L = Publics[LIdx];
+    const BulkPublic &R = Publics[RIdx];
+    if (L.Segment != R.Segment)
+      return L.Segment < R.Segment;
+    if (L.Offset != R.Offset)
+      return L.Offset < R.Offset;
+    // parallelSort is unstable, so we have to do name comparison to ensure
+    // that two names for the same location come out in a deterministic order.
+    return L.getName() < R.getName();
+  };
+  parallelSort(PubAddrMap, AddrCmp);
+
+  // Rewrite the public symbol indices into symbol offsets.
+  for (ulittle32_t &Entry : PubAddrMap)
+    Entry = Publics[Entry].SymOffset;
+  return PubAddrMap;
+}
+
 Error GSIStreamBuilder::commitPublicsHashStream(
     WritableBinaryStreamRef Stream) {
   BinaryStreamWriter Writer(Stream);
   PublicsStreamHeader Header;
 
   // FIXME: Fill these in. They are for incremental linking.
   Header.SymHash = PSH->calculateSerializedLength();
-  Header.AddrMap = PubAddrMap.size() * 4;
+  Header.AddrMap = Publics.size() * 4;
   Header.NumThunks = 0;
   Header.SizeOfThunk = 0;
   Header.ISectThunkTable = 0;
   memset(Header.Padding, 0, sizeof(Header.Padding));
   Header.OffThunkTable = 0;
   Header.NumSections = 0;
   if (auto EC = Writer.writeObject(Header))
     return EC;
 
   if (auto EC = PSH->commit(Writer))
     return EC;
 
+  std::vector<support::ulittle32_t> PubAddrMap = computeAddrMap(Publics);
+  assert(PubAddrMap.size() == Publics.size());
   if (auto EC = Writer.writeArray(makeArrayRef(PubAddrMap)))
     return EC;
 
   return Error::success();
 }
 
 Error GSIStreamBuilder::commitGlobalsHashStream(
     WritableBinaryStreamRef Stream) {