Reland "Correctly emit dwoIDs after ASTFileSignature refactoring (D81347)"
authorRaphael Isemann <teemperor@gmail.com>
Fri, 21 Aug 2020 12:21:21 +0000 (14:21 +0200)
committerRaphael Isemann <teemperor@gmail.com>
Mon, 24 Aug 2020 12:52:53 +0000 (14:52 +0200)
commit105151ca5669a0536fb5bb1bc02bd3279cdbbfda
tree1db783d34d7c06dd4247920a86675ea3e122d2b4
parent577f8b157a03055821341146ed0617e3b103fdaf
Reland "Correctly emit dwoIDs after ASTFileSignature refactoring (D81347)"

The orignal patch with the missing 'REQUIRES: asserts' as there is a debug-only
flag used in the test.

Original summary:

D81347 changes the ASTFileSignature to be an array of 20 uint8_t instead of 5
uint32_t. However, it didn't update the code in ObjectFilePCHContainerOperations
that creates the dwoID in the module from the ASTFileSignature
(`Buffer->Signature` being the array subclass that is now `std::array<uint8_t,
20>` instead of `std::array<uint32_t, 5>`).

```
  uint64_t Signature = [..] (uint64_t)Buffer->Signature[1] << 32 | Buffer->Signature[0]
```

This code works with the old ASTFileSignature (where two uint32_t are enough to
fill the uint64_t), but after the patch this only took two bytes from the
ASTFileSignature and only partly filled the Signature uint64_t.

This caused that the dwoID in the module ref and the dwoID in the actual module
no longer match (which in turns causes that LLDB keeps warning about the dwoID's
not matching when debugging -gmodules-compiled binaries).

This patch just unifies the logic for turning the ASTFileSignature into an
uint64_t which makes the dwoID match again (and should prevent issues like that
in the future).

Reviewed By: aprantl, dang

Differential Revision: https://reviews.llvm.org/D84013
clang/include/clang/Basic/Module.h
clang/lib/CodeGen/CGDebugInfo.cpp
clang/lib/CodeGen/ObjectFilePCHContainerOperations.cpp
clang/test/Modules/Inputs/DebugDwoId.h [new file with mode: 0644]
clang/test/Modules/Inputs/module.map
clang/test/Modules/ModuleDebugInfoDwoId.cpp [new file with mode: 0644]