summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonas Devlieghere <jonas@devlieghere.com>2019-02-11 17:19:26 +0000
committerJonas Devlieghere <jonas@devlieghere.com>2019-02-11 17:19:26 +0000
commitcc2a16783b5ec7f450fdd0670688f347547b06e4 (patch)
tree7bb5c4fc22efcf7616bb77adf2ac0493f668de68
parentf472f31876e0b021c50ac23c5ab48c536263fc37 (diff)
downloadbcm5719-llvm-cc2a16783b5ec7f450fdd0670688f347547b06e4.tar.gz
bcm5719-llvm-cc2a16783b5ec7f450fdd0670688f347547b06e4.zip
Update SymbolVendorMacOSX for new GetUUID interface
The interface changed in r353714. llvm-svn: 353721
-rw-r--r--lldb/source/Plugins/SymbolVendor/MacOSX/SymbolVendorMacOSX.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/lldb/source/Plugins/SymbolVendor/MacOSX/SymbolVendorMacOSX.cpp b/lldb/source/Plugins/SymbolVendor/MacOSX/SymbolVendorMacOSX.cpp
index 4451bfa9e0f..bb69b7fab7e 100644
--- a/lldb/source/Plugins/SymbolVendor/MacOSX/SymbolVendorMacOSX.cpp
+++ b/lldb/source/Plugins/SymbolVendor/MacOSX/SymbolVendorMacOSX.cpp
@@ -39,9 +39,8 @@ static bool UUIDsMatch(Module *module, ObjectFile *ofile,
lldb_private::Stream *feedback_strm) {
if (module && ofile) {
// Make sure the UUIDs match
- lldb_private::UUID dsym_uuid;
-
- if (!ofile->GetUUID(&dsym_uuid)) {
+ lldb_private::UUID dsym_uuid = ofile->GetUUID();
+ if (!dsym_uuid) {
if (feedback_strm) {
feedback_strm->PutCString(
"warning: failed to get the uuid for object file: '");
@@ -162,8 +161,8 @@ SymbolVendorMacOSX::CreateInstance(const lldb::ModuleSP &module_sp,
char dsym_path[PATH_MAX];
if (module_sp->GetSourceMappingList().IsEmpty() &&
dsym_fspec.GetPath(dsym_path, sizeof(dsym_path))) {
- lldb_private::UUID dsym_uuid;
- if (dsym_objfile_sp->GetUUID(&dsym_uuid)) {
+ lldb_private::UUID dsym_uuid = dsym_objfile_sp->GetUUID();
+ if (dsym_uuid) {
std::string uuid_str = dsym_uuid.GetAsString();
if (!uuid_str.empty()) {
char *resources = strstr(dsym_path, "/Contents/Resources/");
OpenPOWER on IntegriCloud