Skip to content
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

[lldb] Use Lambda to simplify repeptitive code in DynamicLoaderDarwin (NFC) #126175

Merged
merged 1 commit into from
Feb 7, 2025
Merged

[lldb] Use Lambda to simplify repeptitive code in DynamicLoaderDarwin (NFC) #126175

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
20 changes: 11 additions & 9 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 @@ -1212,23 +1212,25 @@ bool DynamicLoaderDarwin::UseDYLDSPI(Process *process) {

llvm::VersionTuple version = process->GetHostOSVersion();
if (!version.empty()) {
const llvm::Triple::OSType os_type =
using namespace llvm;
const Triple::OSType os_type =
process->GetTarget().GetArchitecture().GetTriple().getOS();

// Older than macOS 10.12
if (os_type == llvm::Triple::MacOSX && version < llvm::VersionTuple(10, 12))
auto OlderThan = [os_type, version](llvm::Triple::OSType o,
llvm::VersionTuple v) -> bool {
return os_type == o && version < v;
};

if (OlderThan(Triple::MacOSX, VersionTuple(10, 12)))
use_new_spi_interface = false;

// Older than iOS 10
if (os_type == llvm::Triple::IOS && version < llvm::VersionTuple(10))
if (OlderThan(Triple::IOS, VersionTuple(10)))
use_new_spi_interface = false;

// Older than tvOS 10
if (os_type == llvm::Triple::TvOS && version < llvm::VersionTuple(10))
if (OlderThan(Triple::TvOS, VersionTuple(10)))
use_new_spi_interface = false;

// Older than watchOS 3
if (os_type == llvm::Triple::WatchOS && version < llvm::VersionTuple(3))
if (OlderThan(Triple::WatchOS, VersionTuple(3)))
use_new_spi_interface = false;

// llvm::Triple::BridgeOS and llvm::Triple::XROS always use the new
Expand Down