From: Pavel Labath Date: Thu, 21 Jun 2018 15:40:33 +0000 (+0000) Subject: Fix macos build for r335244 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9092cc96d4266530e82fac2e22d5ce2400f6dcc9;p=platform%2Fupstream%2Fllvm.git Fix macos build for r335244 I've made the code accept only 16 byte UUIDs, which is technically not NFC (previously it would also accept 20 byte ones, but use only the first 16 bytes), but this should be more correct as mac UUIDs are always 16 byte long. llvm-svn: 335247 --- diff --git a/lldb/source/Host/macosx/Symbols.cpp b/lldb/source/Host/macosx/Symbols.cpp index b82fea5..b01c48e 100644 --- a/lldb/source/Host/macosx/Symbols.cpp +++ b/lldb/source/Host/macosx/Symbols.cpp @@ -76,8 +76,8 @@ int LocateMacOSXFilesUsingDebugSymbols(const ModuleSpec &module_spec, if (uuid && uuid->IsValid()) { // Try and locate the dSYM file using DebugSymbols first - const UInt8 *module_uuid = (const UInt8 *)uuid->GetBytes(); - if (module_uuid != NULL) { + llvm::ArrayRef module_uuid = uuid->GetBytes(); + if (module_uuid.size() == 16) { CFCReleaser module_uuid_ref(::CFUUIDCreateWithBytes( NULL, module_uuid[0], module_uuid[1], module_uuid[2], module_uuid[3], module_uuid[4], module_uuid[5], module_uuid[6], module_uuid[7],