Author: Adrian Prantl Date: 2020-06-02T16:55:50-07:00 New Revision: 2d2a603d663328e25774982947e3a8a65e098678
URL: https://github.com/llvm/llvm-project/commit/2d2a603d663328e25774982947e3a8a65e098678 DIFF: https://github.com/llvm/llvm-project/commit/2d2a603d663328e25774982947e3a8a65e098678.diff LOG: Remove redundant code (NFC) This has no effect on the testsuite and was only needed in an early prototype from before debugserver was able to report the correct platform. Added: Modified: lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwin.cpp Removed: ################################################################################ diff --git a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwin.cpp b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwin.cpp index f2735212dff9..6f3e8b637cf2 100644 --- a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwin.cpp +++ b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwin.cpp @@ -685,15 +685,8 @@ bool DynamicLoaderDarwin::AddModulesUsingImageInfos( // Update the module's platform with the DYLD info. ArchSpec dyld_spec = image_infos[idx].GetArchitecture(); if (dyld_spec.GetTriple().getOS() == llvm::Triple::IOS && - dyld_spec.GetTriple().getEnvironment() == llvm::Triple::MacABI) { + dyld_spec.GetTriple().getEnvironment() == llvm::Triple::MacABI) image_module_sp->MergeArchitecture(dyld_spec); - const auto &target_triple = target.GetArchitecture().GetTriple(); - // If dyld reports the process as being loaded as MACCATALYST, - // force-update the target's architecture to MACCATALYST. - if (!(target_triple.getOS() == llvm::Triple::IOS && - target_triple.getEnvironment() == llvm::Triple::MacABI)) - target.SetArchitecture(dyld_spec); - } } } _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
