Skip to content

Commit af24464

Browse files
parkeraparkera
authored
Adopt Swift 6 and audit for Sendable (swiftlang#5000)
* Adopt Sendable, fix Sendable related warnings, and fix other warnings in both Swift and C code * Upgrade to Swift 6 - Fix associated warnings * Remove Sendable annotation from NSAffineTransform * Cleanup some unused types in Utilities and use a Mutex instead of NSLock * Remove some warnings for Windows builds * Add version 6 and warning flags to CMake file * Adapt to some changes in how unchecked Sendable conformance is declared * Update swift-foundation dependency * Update locking strategy for DateFormatter and NumberFormatter - keep the CF type inside the lock * Add annotations for Core and CFSocketRef * Resolve a warning in TestDecimal * Use noncopyable State type for DateFormatter and NumberFormatter * Mark DirectoryEnumerator as non-Sendable * Work around compiler crashes when using ~Copyable types * Clarify comment of _nonSendable with a message explaining the remaining warning
1 parent fa2b3ad commit af24464

File tree

185 files changed

+4206
-3473
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

185 files changed

+4206
-3473
lines changed

Diff for: ‎CMakeLists.txt

+5-1
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ list(APPEND _Foundation_common_build_flags
112112
"-Wno-unused-function"
113113
"-Wno-microsoft-enum-forward-reference"
114114
"-Wno-int-conversion"
115+
"-Wno-switch"
115116
"-fblocks")
116117

117118
if(NOT "${CMAKE_C_SIMULATE_ID}" STREQUAL "MSVC")
@@ -139,8 +140,11 @@ endif()
139140
# Swift build flags (Foundation, FoundationNetworking, FoundationXML)
140141
set(_Foundation_swift_build_flags)
141142
list(APPEND _Foundation_swift_build_flags
143+
"-swift-version 6"
142144
"-DDEPLOYMENT_RUNTIME_SWIFT"
143-
"-DSWIFT_CORELIBS_FOUNDATION_HAS_THREADS")
145+
"-DSWIFT_CORELIBS_FOUNDATION_HAS_THREADS"
146+
"-Xfrontend"
147+
"-require-explicit-sendable")
144148

145149
if(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "Android")
146150
list(APPEND _Foundation_common_build_flags

Diff for: ‎Package.swift

+39-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version: 5.9
1+
// swift-tools-version: 6.0
22
// The swift-tools-version declares the minimum version of Swift required to build this package.
33

44
import PackageDescription
@@ -34,6 +34,7 @@ let coreFoundationBuildSettings: [CSetting] = [
3434
"-Wno-unused-function",
3535
"-Wno-microsoft-enum-forward-reference",
3636
"-Wno-int-conversion",
37+
"-Wno-switch",
3738
"-fconstant-cfstrings",
3839
"-fexceptions", // TODO: not on OpenBSD
3940
"-fdollars-in-identifiers",
@@ -77,6 +78,11 @@ let interfaceBuildSettings: [CSetting] = [
7778
let swiftBuildSettings: [SwiftSetting] = [
7879
.define("DEPLOYMENT_RUNTIME_SWIFT"),
7980
.define("SWIFT_CORELIBS_FOUNDATION_HAS_THREADS"),
81+
.swiftLanguageVersion(.v6),
82+
.unsafeFlags([
83+
"-Xfrontend",
84+
"-require-explicit-sendable",
85+
])
8086
]
8187

8288
var dependencies: [Package.Dependency] {
@@ -96,7 +102,7 @@ var dependencies: [Package.Dependency] {
96102
from: "0.0.9"),
97103
.package(
98104
url: "https://github.com/apple/swift-foundation",
99-
revision: "35d896ab47ab5e487cfce822fbe40d2b278c51d6")
105+
revision: "d59046871c6b69a13595f18d334afa1553e0ba50")
100106
]
101107
}
102108
}
@@ -121,6 +127,9 @@ let package = Package(
121127
"CoreFoundation"
122128
],
123129
path: "Sources/Foundation",
130+
exclude: [
131+
"CMakeLists.txt"
132+
],
124133
swiftSettings: swiftBuildSettings
125134
),
126135
.target(
@@ -132,6 +141,9 @@ let package = Package(
132141
"_CFXMLInterface"
133142
],
134143
path: "Sources/FoundationXML",
144+
exclude: [
145+
"CMakeLists.txt"
146+
],
135147
swiftSettings: swiftBuildSettings
136148
),
137149
.target(
@@ -143,15 +155,21 @@ let package = Package(
143155
"_CFURLSessionInterface"
144156
],
145157
path: "Sources/FoundationNetworking",
146-
swiftSettings:swiftBuildSettings
158+
exclude: [
159+
"CMakeLists.txt"
160+
],
161+
swiftSettings: swiftBuildSettings
147162
),
148163
.target(
149164
name: "CoreFoundation",
150165
dependencies: [
151166
.product(name: "_FoundationICU", package: "swift-foundation-icu"),
152167
],
153168
path: "Sources/CoreFoundation",
154-
exclude: ["BlockRuntime"],
169+
exclude: [
170+
"BlockRuntime",
171+
"CMakeLists.txt"
172+
],
155173
cSettings: coreFoundationBuildSettings
156174
),
157175
.target(
@@ -161,6 +179,9 @@ let package = Package(
161179
"Clibxml2",
162180
],
163181
path: "Sources/_CFXMLInterface",
182+
exclude: [
183+
"CMakeLists.txt"
184+
],
164185
cSettings: interfaceBuildSettings
165186
),
166187
.target(
@@ -170,6 +191,9 @@ let package = Package(
170191
"Clibcurl",
171192
],
172193
path: "Sources/_CFURLSessionInterface",
194+
exclude: [
195+
"CMakeLists.txt"
196+
],
173197
cSettings: interfaceBuildSettings
174198
),
175199
.systemLibrary(
@@ -192,6 +216,12 @@ let package = Package(
192216
name: "plutil",
193217
dependencies: [
194218
"Foundation"
219+
],
220+
exclude: [
221+
"CMakeLists.txt"
222+
],
223+
swiftSettings: [
224+
.swiftLanguageVersion(.v6)
195225
]
196226
),
197227
.executableTarget(
@@ -200,6 +230,9 @@ let package = Package(
200230
"Foundation",
201231
"FoundationXML",
202232
"FoundationNetworking"
233+
],
234+
swiftSettings: [
235+
.swiftLanguageVersion(.v6)
203236
]
204237
),
205238
.target(
@@ -226,7 +259,8 @@ let package = Package(
226259
.copy("Foundation/Resources")
227260
],
228261
swiftSettings: [
229-
.define("NS_FOUNDATION_ALLOWS_TESTABLE_IMPORT")
262+
.define("NS_FOUNDATION_ALLOWS_TESTABLE_IMPORT"),
263+
.swiftLanguageVersion(.v6)
230264
]
231265
),
232266
]

Diff for: ‎Sources/CoreFoundation/CFBundle_Resources.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -294,9 +294,9 @@ CF_PRIVATE _CFBundleVersion _CFBundleGetBundleVersionForURL(CFURLRef url) {
294294
foundSupportFiles2 = true;
295295
} else if (fileNameLen == supportFilesDirectoryLength && CFStringCompareWithOptions(fileName, _CFBundleSupportFilesDirectoryName1, CFRangeMake(0, supportFilesDirectoryLength), kCFCompareCaseInsensitive) == kCFCompareEqualTo) {
296296
foundSupportFiles1 = true;
297-
} else if (fileNameLen == wrapperDirLength && CFStringCompareWithOptions(fileName, _CFBundleWrapperDirectoryName, CFRangeMake(0, wrapperDirLength), kCFCompareEqualTo) == kCFCompareEqualTo) {
297+
} else if (fileNameLen == wrapperDirLength && CFStringCompareWithOptions(fileName, _CFBundleWrapperDirectoryName, CFRangeMake(0, wrapperDirLength), 0) == kCFCompareEqualTo) {
298298
foundAppWrapperDirectory = true;
299-
} else if (fileType == DT_LNK && fileNameLen == wrapperLinkLength && CFStringCompareWithOptions(fileName, _CFBundleWrapperLinkName, CFRangeMake(0, wrapperLinkLength), kCFCompareEqualTo) == kCFCompareEqualTo) {
299+
} else if (fileType == DT_LNK && fileNameLen == wrapperLinkLength && CFStringCompareWithOptions(fileName, _CFBundleWrapperLinkName, CFRangeMake(0, wrapperLinkLength), 0) == kCFCompareEqualTo) {
300300
foundAppWrapperLink = true;
301301
}
302302
} else if (fileType == DT_UNKNOWN) {

Diff for: ‎Sources/CoreFoundation/CFDate.c

+3
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,11 @@ double __CFTSRRate = 0.0;
4848
static double __CF1_TSRRate = 0.0;
4949

5050
CF_PRIVATE uint64_t __CFTimeIntervalToTSR(CFTimeInterval ti) {
51+
#pragma GCC diagnostic push
52+
#pragma GCC diagnostic ignored "-Wimplicit-const-int-float-conversion"
5153
if ((ti * __CFTSRRate) > INT64_MAX / 2) return (INT64_MAX / 2);
5254
return (uint64_t)(ti * __CFTSRRate);
55+
#pragma GCC diagnostic pop
5356
}
5457

5558
CF_PRIVATE CFTimeInterval __CFTSRToTimeInterval(uint64_t tsr) {

Diff for: ‎Sources/CoreFoundation/CFNumber.c

+3
Original file line numberDiff line numberDiff line change
@@ -534,6 +534,8 @@ static Boolean __CFNumberGetValue(CFNumberRef number, CFNumberType type, void *v
534534
}
535535
}
536536
return true;
537+
#pragma GCC diagnostic push
538+
#pragma GCC diagnostic ignored "-Wimplicit-const-int-float-conversion"
537539
case kCFNumberSInt32Type:
538540
if (floatBit) {
539541
if (!storageBit) {
@@ -564,6 +566,7 @@ static Boolean __CFNumberGetValue(CFNumberRef number, CFNumberType type, void *v
564566
}
565567
}
566568
return true;
569+
#pragma GCC diagnostic pop
567570
case kCFNumberSInt128Type:
568571
if (floatBit) {
569572
if (!storageBit) {

Diff for: ‎Sources/CoreFoundation/CFPlatform.c

+1
Original file line numberDiff line numberDiff line change
@@ -1814,6 +1814,7 @@ CF_CROSS_PLATFORM_EXPORT int _CFThreadSetName(_CFThreadRef thread, const char *_
18141814
#endif
18151815
}
18161816

1817+
// `buf` must be null-terminated
18171818
CF_CROSS_PLATFORM_EXPORT int _CFThreadGetName(char *buf, int length) {
18181819
#if SWIFT_CORELIBS_FOUNDATION_HAS_THREADS
18191820
#if TARGET_OS_MAC

Diff for: ‎Sources/CoreFoundation/CFPreferences.c

+6
Original file line numberDiff line numberDiff line change
@@ -234,14 +234,20 @@ CFDictionaryRef CFPreferencesCopyMultiple(CFArrayRef keysToFetch, CFStringRef ap
234234
__CFGenericValidateType(host, CFStringGetTypeID());
235235

236236
domain = _CFPreferencesStandardDomain(appName, user, host);
237+
#pragma GCC diagnostic push
238+
#pragma GCC diagnostic ignored "-Wnonnull"
237239
if (!domain) return NULL;
240+
#pragma GCC diagnostic pop
238241
if (!keysToFetch) {
239242
return _CFPreferencesDomainDeepCopyDictionary(domain);
240243
} else {
241244
__CFGenericValidateType(keysToFetch, CFArrayGetTypeID());
242245
count = CFArrayGetCount(keysToFetch);
243246
result = CFDictionaryCreateMutable(CFGetAllocator(domain), count, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
247+
#pragma GCC diagnostic push
248+
#pragma GCC diagnostic ignored "-Wnonnull"
244249
if (!result) return NULL;
250+
#pragma GCC diagnostic pop
245251
for (idx = 0; idx < count; idx ++) {
246252
CFStringRef key = (CFStringRef)CFArrayGetValueAtIndex(keysToFetch, idx);
247253
CFPropertyListRef value;

Diff for: ‎Sources/CoreFoundation/CFPropertyList.c

+3-1
Original file line numberDiff line numberDiff line change
@@ -1587,6 +1587,8 @@ static Boolean parseDictTag(_CFXMLPlistParseInfo * _Nonnull pInfo, CFTypeRef * _
15871587

15881588
static Boolean parseDataTag(_CFXMLPlistParseInfo *pInfo, CFTypeRef *out) {
15891589
const char *base = pInfo->curr;
1590+
#pragma GCC diagnostic push
1591+
#pragma GCC diagnostic ignored "-Wgnu-folding-constant"
15901592
static const unsigned char dataDecodeTableSize = 128;
15911593
static const signed char dataDecodeTable[dataDecodeTableSize] = {
15921594
/* 000 */ -1, -1, -1, -1, -1, -1, -1, -1,
@@ -1606,7 +1608,7 @@ static Boolean parseDataTag(_CFXMLPlistParseInfo *pInfo, CFTypeRef *out) {
16061608
/* 'p' */ 41, 42, 43, 44, 45, 46, 47, 48,
16071609
/* 'x' */ 49, 50, 51, -1, -1, -1, -1, -1
16081610
};
1609-
1611+
#pragma GCC diagnostic pop
16101612
int tmpbufpos = 0;
16111613
int tmpbuflen = 256;
16121614
uint8_t *tmpbuf = pInfo->skip ? NULL : (uint8_t *)CFAllocatorAllocate(pInfo->allocator, tmpbuflen, 0);

Diff for: ‎Sources/CoreFoundation/CFRelativeDateTimeFormatter.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ struct __CFRelativeDateTimeFormatter {
2323
CFRelativeDateTimeFormattingContext _formattingContext;
2424
};
2525

26-
static UDateRelativeDateTimeFormatterStyle icuRelativeDateTimeStyleFromUnitsStyle(CFRelativeDateTimeFormatterStyle style) {
26+
static UDateRelativeDateTimeFormatterStyle icuRelativeDateTimeStyleFromUnitsStyle(CFRelativeDateTimeFormatterUnitsStyle style) {
2727
switch (style) {
2828
case CFRelativeDateTimeFormatterUnitsStyleSpellOut:
2929
case CFRelativeDateTimeFormatterUnitsStyleFull:

Diff for: ‎Sources/CoreFoundation/CFRuntime.c

+4
Original file line numberDiff line numberDiff line change
@@ -1774,11 +1774,15 @@ struct _NSCFXMLBridgeUntyped __NSCFXMLBridgeUntyped = {
17741774
CFDataGetBytePtr,
17751775
CFDictionaryCreateMutable,
17761776
CFDictionarySetValue,
1777+
// We cannot use the real types here because eventually it winds up exposed as API using CF types in Swift, which we do not want
1778+
#pragma GCC diagnostic push
1779+
#pragma GCC diagnostic ignored "-Wincompatible-pointer-types-discards-qualifiers"
17771780
&kCFAllocatorSystemDefault,
17781781
&kCFAllocatorNull,
17791782
&kCFCopyStringDictionaryKeyCallBacks,
17801783
&kCFTypeDictionaryValueCallBacks,
17811784
&kCFErrorLocalizedDescriptionKey,
1785+
#pragma GCC diagnostic pop
17821786
};
17831787

17841788
// Call out to the CF-level finalizer, because the object is going to go away.

Diff for: ‎Sources/CoreFoundation/include/ForSwiftFoundationOnly.h

+7-4
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
#define NOMINMAX
3636
#define VC_EXTRALEAN
3737
#define WIN32_LEAN_AND_MEAN
38+
#define _CRT_NONSTDC_NO_DEPRECATE
3839
#include <Windows.h>
3940
#elif !TARGET_OS_WASI
4041
#include <fts.h>
@@ -59,6 +60,8 @@
5960

6061
#if TARGET_OS_LINUX
6162
#include <sys/sysmacros.h>
63+
#include <fcntl.h>
64+
#include <sys/stat.h>
6265
#endif
6366

6467
#if TARGET_OS_ANDROID
@@ -335,10 +338,10 @@ struct _NSCFXMLBridgeUntyped {
335338
void *kCFErrorLocalizedDescriptionKey;
336339
};
337340

338-
CF_EXPORT struct _NSCFXMLBridgeStrong __NSCFXMLBridgeStrong;
339-
CF_EXPORT struct _NSCFXMLBridgeUntyped __NSCFXMLBridgeUntyped;
341+
CF_EXPORT struct _NSCFXMLBridgeStrong __NSCFXMLBridgeStrong __attribute__((swift_attr("nonisolated(unsafe)")));
342+
CF_EXPORT struct _NSCFXMLBridgeUntyped __NSCFXMLBridgeUntyped __attribute__((swift_attr("nonisolated(unsafe)")));
340343

341-
CF_EXPORT struct _CFSwiftBridge __CFSwiftBridge;
344+
CF_EXPORT struct _CFSwiftBridge __CFSwiftBridge __attribute__((swift_attr("nonisolated(unsafe)")));
342345

343346
CF_EXPORT void *_Nullable _CFSwiftRetain(void *_Nullable t);
344347
CF_EXPORT void _CFSwiftRelease(void *_Nullable t);
@@ -407,7 +410,7 @@ typedef void *_CFThreadSpecificKey;
407410
#endif
408411

409412
CF_CROSS_PLATFORM_EXPORT Boolean _CFIsMainThread(void);
410-
CF_EXPORT _CFThreadRef _CFMainPThread;
413+
CF_EXPORT _CFThreadRef _CFMainPThread __attribute__((swift_attr("nonisolated(unsafe)")));
411414

412415
CF_EXPORT CFHashCode __CFHashDouble(double d);
413416

0 commit comments

Comments
 (0)