diff options
3 files changed, 28 insertions, 40 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump/TestMiniDump.py b/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump/TestMiniDump.py index fe13871ddac..f6a7d7c7ff3 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump/TestMiniDump.py +++ b/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump/TestMiniDump.py @@ -51,27 +51,27 @@ class MiniDumpTestCase(TestBase): expected_modules = [ { 'filename' : r"C:\Users\amccarth\Documents\Visual Studio 2013\Projects\fizzbuzz\Debug/fizzbuzz.exe", - 'uuid' : '91B7450F-969A-F946-BF8F-2D6076EA421A-11000000', + 'uuid' : '0F45B791-9A96-46F9-BF8F-2D6076EA421A-00000011', }, { 'filename' : r"C:\Windows\SysWOW64/ntdll.dll", - 'uuid' : '6A84B0BB-2C40-5240-A16B-67650BBFE6B0-02000000', + 'uuid' : 'BBB0846A-402C-4052-A16B-67650BBFE6B0-00000002', }, { 'filename' : r"C:\Windows\SysWOW64/kernel32.dll", - 'uuid' : '1B7ECBE5-5E00-1341-AB98-98D6913B52D8-02000000', + 'uuid' : 'E5CB7E1B-005E-4113-AB98-98D6913B52D8-00000002', }, { 'filename' : r"C:\Windows\SysWOW64/KERNELBASE.dll", - 'uuid' : '4152F90B-0DCB-D44B-AC5D-186A6452E522-01000000', + 'uuid' : '0BF95241-CB0D-4BD4-AC5D-186A6452E522-00000001', }, { 'filename' : r"C:\Windows\System32/MSVCP120D.dll", - 'uuid' : '6E51053C-E757-EB40-8D3F-9722C5BD80DD-01000000', + 'uuid' : '3C05516E-57E7-40EB-8D3F-9722C5BD80DD-00000001', }, { 'filename' : r"C:\Windows\System32/MSVCR120D.dll", - 'uuid' : '86FB8263-C446-4640-AE42-8D97B3F91FF2-01000000', + 'uuid' : '6382FB86-46C4-4046-AE42-8D97B3F91FF2-00000001', }, ] self.assertEqual(self.target.GetNumModules(), len(expected_modules)) diff --git a/lldb/source/Plugins/Process/minidump/MinidumpParser.cpp b/lldb/source/Plugins/Process/minidump/MinidumpParser.cpp index 11203f2bfcf..30d795b1aa3 100644 --- a/lldb/source/Plugins/Process/minidump/MinidumpParser.cpp +++ b/lldb/source/Plugins/Process/minidump/MinidumpParser.cpp @@ -66,40 +66,23 @@ UUID MinidumpParser::GetModuleUUID(const minidump::Module *module) { Status error = consumeObject(cv_record, pdb70_uuid); if (error.Fail()) return UUID(); - // If the age field is not zero, then include the entire pdb70_uuid struct - if (pdb70_uuid->Age != 0) - return UUID::fromData(pdb70_uuid, sizeof(*pdb70_uuid)); - - // Many times UUIDs are all zeroes. This can cause more than one module - // to claim it has a valid UUID of all zeroes and causes the files to all - // merge into the first module that claims this valid zero UUID. - bool all_zeroes = true; - for (size_t i = 0; all_zeroes && i < sizeof(pdb70_uuid->Uuid); ++i) - all_zeroes = pdb70_uuid->Uuid[i] == 0; - if (all_zeroes) - return UUID(); - - if (GetArchitecture().GetTriple().getVendor() == llvm::Triple::Apple) { - // Breakpad incorrectly byte swaps the first 32 bit and next 2 16 bit - // values in the UUID field. Undo this so we can match things up - // with our symbol files - uint8_t apple_uuid[16]; - // Byte swap the first 32 bits - apple_uuid[0] = pdb70_uuid->Uuid[3]; - apple_uuid[1] = pdb70_uuid->Uuid[2]; - apple_uuid[2] = pdb70_uuid->Uuid[1]; - apple_uuid[3] = pdb70_uuid->Uuid[0]; - // Byte swap the next 16 bit value - apple_uuid[4] = pdb70_uuid->Uuid[5]; - apple_uuid[5] = pdb70_uuid->Uuid[4]; - // Byte swap the next 16 bit value - apple_uuid[6] = pdb70_uuid->Uuid[7]; - apple_uuid[7] = pdb70_uuid->Uuid[6]; - for (size_t i = 8; i < sizeof(pdb70_uuid->Uuid); ++i) - apple_uuid[i] = pdb70_uuid->Uuid[i]; - return UUID::fromData(apple_uuid, sizeof(apple_uuid)); + + CvRecordPdb70 swapped; + if (!GetArchitecture().GetTriple().isOSBinFormatELF()) { + // LLDB's UUID class treats the data as a sequence of bytes, but breakpad + // interprets it as a sequence of little-endian fields, which it converts + // to big-endian when converting to text. Swap the bytes to big endian so + // that the string representation comes out right. + swapped = *pdb70_uuid; + llvm::sys::swapByteOrder(swapped.Uuid.Data1); + llvm::sys::swapByteOrder(swapped.Uuid.Data2); + llvm::sys::swapByteOrder(swapped.Uuid.Data3); + llvm::sys::swapByteOrder(swapped.Age); + pdb70_uuid = &swapped; } - return UUID::fromData(pdb70_uuid->Uuid, sizeof(pdb70_uuid->Uuid)); + if (pdb70_uuid->Age != 0) + return UUID::fromOptionalData(pdb70_uuid, sizeof(*pdb70_uuid)); + return UUID::fromOptionalData(&pdb70_uuid->Uuid, sizeof(pdb70_uuid->Uuid)); } else if (cv_signature == CvSignature::ElfBuildId) return UUID::fromOptionalData(cv_record); diff --git a/lldb/source/Plugins/Process/minidump/MinidumpTypes.h b/lldb/source/Plugins/Process/minidump/MinidumpTypes.h index 711636b81e6..4b6bf671306 100644 --- a/lldb/source/Plugins/Process/minidump/MinidumpTypes.h +++ b/lldb/source/Plugins/Process/minidump/MinidumpTypes.h @@ -44,7 +44,12 @@ enum class CvSignature : uint32_t { // Reference: // https://crashpad.chromium.org/doxygen/structcrashpad_1_1CodeViewRecordPDB70.html struct CvRecordPdb70 { - uint8_t Uuid[16]; + struct { + llvm::support::ulittle32_t Data1; + llvm::support::ulittle16_t Data2; + llvm::support::ulittle16_t Data3; + uint8_t Data4[8]; + } Uuid; llvm::support::ulittle32_t Age; // char PDBFileName[]; }; |
