Author: Jason Molenda Date: 2020-12-09T14:19:55-08:00 New Revision: 2cedc44a92337ccc0e8173b4dbf4cfe5650da8cd
URL: https://github.com/llvm/llvm-project/commit/2cedc44a92337ccc0e8173b4dbf4cfe5650da8cd DIFF: https://github.com/llvm/llvm-project/commit/2cedc44a92337ccc0e8173b4dbf4cfe5650da8cd.diff LOG: Ignore DBGArchitecture from dsymForUUID's plist When the architecture from the returned plist differs from the architecture lldb will pick when loading the binary file, lldb will reject the binary as not matching. We are working with UUID's in this case, so an architecture is not disambiguating anything; it just opens this possibility for failing to load the specified binary. Stop reading the architecture from the plist. <rdar://problem/71612561> Differential revision: https://reviews.llvm.org/D92692 Added: Modified: lldb/source/Symbol/LocateSymbolFileMacOSX.cpp lldb/test/API/macosx/lc-note/firmware-corefile/TestFirmwareCorefiles.py Removed: ################################################################################ diff --git a/lldb/source/Symbol/LocateSymbolFileMacOSX.cpp b/lldb/source/Symbol/LocateSymbolFileMacOSX.cpp index 344bac8e0632..2655e4de9063 100644 --- a/lldb/source/Symbol/LocateSymbolFileMacOSX.cpp +++ b/lldb/source/Symbol/LocateSymbolFileMacOSX.cpp @@ -342,13 +342,6 @@ static bool GetModuleSpecInfoFromUUIDDictionary(CFDictionaryRef uuid_dict, } } - cf_str = (CFStringRef)CFDictionaryGetValue((CFDictionaryRef)uuid_dict, - CFSTR("DBGArchitecture")); - if (cf_str && CFGetTypeID(cf_str) == CFStringGetTypeID()) { - if (CFCString::FileSystemRepresentation(cf_str, str)) - module_spec.GetArchitecture().SetTriple(str.c_str()); - } - std::string DBGBuildSourcePath; std::string DBGSourcePath; diff --git a/lldb/test/API/macosx/lc-note/firmware-corefile/TestFirmwareCorefiles.py b/lldb/test/API/macosx/lc-note/firmware-corefile/TestFirmwareCorefiles.py index 79a79056476b..7055fa698382 100644 --- a/lldb/test/API/macosx/lc-note/firmware-corefile/TestFirmwareCorefiles.py +++ b/lldb/test/API/macosx/lc-note/firmware-corefile/TestFirmwareCorefiles.py @@ -85,7 +85,7 @@ def test_lc_note(self): 'fi', 'echo "<dict><key>$uuid</key><dict>"', '', - 'echo "<key>DBGArchitecture</key><string>x86_64</string>"', + 'echo "<key>DBGArchitecture</key><string>i386</string>"', 'echo "<key>DBGDSYMPath</key><string>$dsym</string>"', 'echo "<key>DBGSymbolRichExecutable</key><string>$bin</string>"', 'echo "</dict></dict></plist>"', _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
