Skip to content

Commit e9f71fd

Browse files
committed
[Driver] We don't need arclite on pre-10.14 after all
Reverts the effects of df974b2, but keeps the refactoring and nicer tests.
1 parent a2c1aa3 commit e9f71fd

File tree

2 files changed

+11
-12
lines changed

2 files changed

+11
-12
lines changed

lib/Driver/DarwinToolChains.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -208,13 +208,14 @@ static bool wantsObjCRuntime(const llvm::Triple &triple) {
208208
// When updating the versions listed here, please record the most recent
209209
// feature being depended on and when it was introduced:
210210
//
211-
// - The hook to override class_getImageName (macOS 10.14 and equivalent)
211+
// - Make assigning 'nil' to an NSMutableDictionary subscript delete the
212+
// entry, like it does for Swift.Dictionary, rather than trap.
212213
if (triple.isiOS())
213-
return triple.isOSVersionLT(12);
214+
return triple.isOSVersionLT(9);
214215
if (triple.isMacOSX())
215-
return triple.isMacOSXVersionLT(10, 14);
216+
return triple.isMacOSXVersionLT(10, 11);
216217
if (triple.isWatchOS())
217-
return triple.isOSVersionLT(5);
218+
return false;
218219
llvm_unreachable("unknown Darwin OS");
219220
}
220221

test/Driver/linker-arclite.swift

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,12 @@
1616
// IOS_ARCLITE: -o {{[^ ]+}}
1717

1818

19-
// RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-macosx10.14 %S/../Inputs/empty.swift | %FileCheck -check-prefix NO_ARCLITE %s
20-
// RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-macosx10.13 %S/../Inputs/empty.swift | %FileCheck -check-prefix ANY_ARCLITE %s
21-
// RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-ios12 %S/../Inputs/empty.swift | %FileCheck -check-prefix NO_ARCLITE %s
22-
// RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-ios11 %S/../Inputs/empty.swift | %FileCheck -check-prefix ANY_ARCLITE %s
23-
// RUN: %swiftc_driver -driver-print-jobs -target arm64-apple-tvos12 %S/../Inputs/empty.swift | %FileCheck -check-prefix NO_ARCLITE %s
24-
// RUN: %swiftc_driver -driver-print-jobs -target arm64-apple-tvos11 %S/../Inputs/empty.swift | %FileCheck -check-prefix ANY_ARCLITE %s
25-
// RUN: %swiftc_driver -driver-print-jobs -target armv7k-apple-watchos5 %S/../Inputs/empty.swift | %FileCheck -check-prefix NO_ARCLITE %s
26-
// RUN: %swiftc_driver -driver-print-jobs -target armv7k-apple-watchos4 %S/../Inputs/empty.swift | %FileCheck -check-prefix ANY_ARCLITE %s
19+
// RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-macosx10.11 %S/../Inputs/empty.swift | %FileCheck -check-prefix NO_ARCLITE %s
20+
// RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-macosx10.10 %S/../Inputs/empty.swift | %FileCheck -check-prefix ANY_ARCLITE %s
21+
// RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-ios9 %S/../Inputs/empty.swift | %FileCheck -check-prefix NO_ARCLITE %s
22+
// RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-ios8 %S/../Inputs/empty.swift | %FileCheck -check-prefix ANY_ARCLITE %s
23+
// RUN: %swiftc_driver -driver-print-jobs -target arm64-apple-tvos9 %S/../Inputs/empty.swift | %FileCheck -check-prefix NO_ARCLITE %s
24+
// RUN: %swiftc_driver -driver-print-jobs -target armv7k-apple-watchos2 %S/../Inputs/empty.swift | %FileCheck -check-prefix NO_ARCLITE %s
2725

2826
// NO_ARCLITE: bin/ld{{"? }}
2927
// NO_ARCLITE-NOT: arclite

0 commit comments

Comments
 (0)