Skip to content

Remove redundant code (NFC) #1303

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 2, 2020
Merged

Remove redundant code (NFC) #1303

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -684,15 +684,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);
}
}
}

Expand Down