@@ -1212,23 +1212,25 @@ bool DynamicLoaderDarwin::UseDYLDSPI(Process *process) {
1212
1212
1213
1213
llvm::VersionTuple version = process->GetHostOSVersion ();
1214
1214
if (!version.empty ()) {
1215
- const llvm::Triple::OSType os_type =
1215
+ using namespace llvm ;
1216
+ const Triple::OSType os_type =
1216
1217
process->GetTarget ().GetArchitecture ().GetTriple ().getOS ();
1217
1218
1218
- // Older than macOS 10.12
1219
- if (os_type == llvm::Triple::MacOSX && version < llvm::VersionTuple (10 , 12 ))
1219
+ auto OlderThan = [os_type, version](llvm::Triple::OSType o,
1220
+ llvm::VersionTuple v) -> bool {
1221
+ return os_type == o && version < v;
1222
+ };
1223
+
1224
+ if (OlderThan (Triple::MacOSX, VersionTuple (10 , 12 )))
1220
1225
use_new_spi_interface = false ;
1221
1226
1222
- // Older than iOS 10
1223
- if (os_type == llvm::Triple::IOS && version < llvm::VersionTuple (10 ))
1227
+ if (OlderThan (Triple::IOS, VersionTuple (10 )))
1224
1228
use_new_spi_interface = false ;
1225
1229
1226
- // Older than tvOS 10
1227
- if (os_type == llvm::Triple::TvOS && version < llvm::VersionTuple (10 ))
1230
+ if (OlderThan (Triple::TvOS, VersionTuple (10 )))
1228
1231
use_new_spi_interface = false ;
1229
1232
1230
- // Older than watchOS 3
1231
- if (os_type == llvm::Triple::WatchOS && version < llvm::VersionTuple (3 ))
1233
+ if (OlderThan (Triple::WatchOS, VersionTuple (3 )))
1232
1234
use_new_spi_interface = false ;
1233
1235
1234
1236
// llvm::Triple::BridgeOS and llvm::Triple::XROS always use the new
0 commit comments