Skip to content

Commit 7a107d6

Browse files
rr-codesrr-codes
committed
[Swift in WebKit] Remove some macOS 14 exclusive compilation conditions that are no longer needed
https://bugs.webkit.org/show_bug.cgi?id=306248 rdar://168897793 Reviewed by Abrar Rahman Protyasha. Tests: Tools/TestWebKitAPI/Configurations/Base.xcconfig Tools/TestWebKitAPI/Configurations/TestWebKitAPIBundle.xcconfig Tools/TestWebKitAPI/Configurations/TestWebKitAPILibrary.xcconfig Tools/TestWebKitAPI/TestPDFDocument.swift Tools/TestWebKitAPI/Tests/WebKit Swift/TestWebKitAPIBundle-Bridging-Header.h Tools/TestWebKitAPI/Tests/WebKit Swift/WebPageTransferableTests.swift Tools/TestWebKitAPI/Tests/WebKitCocoa/SmartListsSupport.swift * Configurations/CommonBase.xcconfig: * Source/JavaScriptCore/Configurations/Base.xcconfig: * Source/JavaScriptCore/Configurations/JavaScriptCore.xcconfig: * Source/WTF/Configurations/WTF.xcconfig: * Source/WebCore/Configurations/WebCore.xcconfig: * Source/WebCore/PAL/Configurations/PAL.xcconfig: * Source/WebCore/PAL/pal/PALSwift/CryptoKitShim.swift: * Source/WebCore/PAL/pal/PALSwift/UnsafeOverlays.swift: * Source/WebCore/PAL/pal/pal.swift: * Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h: * Source/WebCore/PAL/pal/spi/cocoa/NetworkSPI.h: * Source/WebCore/PAL/pal/spi/mac/MediaRemoteSPI.h: * Source/WebKit/Configurations/Base.xcconfig: * Source/WebKit/Configurations/WebKit.xcconfig: * Source/WebKit/UIProcess/API/Cocoa/WKContextMenuElementInfoAdapter.swift: * Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration+Extras.swift: * Source/WebKit/UIProcess/API/Cocoa/WKWebpagePreferences+Extras.swift: * Source/WebKit/UIProcess/API/Cocoa/_WKRectEdge+Extras.swift: * Source/WebKit/UIProcess/API/Cocoa/_WKTextExtraction.swift: * Source/WebKit/UIProcess/API/Swift/URLSchemeHandler.swift: * Source/WebKit/UIProcess/API/Swift/WebPage+BackForwardList.swift: * Source/WebKit/UIProcess/API/Swift/WebPage+Configuration.swift: * Source/WebKit/UIProcess/API/Swift/WebPage+DialogPresenting.swift: * Source/WebKit/UIProcess/API/Swift/WebPage+FrameInfo.swift: * Source/WebKit/UIProcess/API/Swift/WebPage+Navigation.swift: * Source/WebKit/UIProcess/API/Swift/WebPage+NavigationDeciding.swift: * Source/WebKit/UIProcess/API/Swift/WebPage+NavigationPreferences.swift: * Source/WebKit/UIProcess/API/Swift/WebPage+Transferable.swift: * Source/WebKit/UIProcess/API/Swift/WebPage.swift: * Source/WebKit/UIProcess/Cocoa/Foundation+Extras.swift: * Source/WebKit/UIProcess/Cocoa/Separated/WKSeparatedImageView+Analysis.swift: * Source/WebKit/UIProcess/Cocoa/Separated/WKSeparatedImageView+Generation.swift: * Source/WebKit/UIProcess/Cocoa/Separated/WKSeparatedImageView+Rendering.swift: * Source/WebKit/UIProcess/Cocoa/Separated/WKSeparatedImageView+Surface.swift: * Source/WebKit/UIProcess/Cocoa/Separated/WKSeparatedImageView.swift: * Source/WebKit/UIProcess/Cocoa/Separated/WKSeparatedImageViewConstants.swift: * Source/WebKit/UIProcess/Cocoa/TextExtraction/WKWebView+TextExtraction.swift: * Source/WebKit/UIProcess/Cocoa/WKNavigationDelegateAdapter.swift: * Source/WebKit/UIProcess/Cocoa/WKScrollGeometryAdapter.swift: * Source/WebKit/UIProcess/Cocoa/WKUIDelegateAdapter.swift: * Source/WebKit/UIProcess/Cocoa/WKURLSchemeHandlerAdapter.swift: * Source/WebKit/UIProcess/Cocoa/WebPageWebView.swift: * Source/WebKit/WebKitSwift/GroupActivities/WKGroupSession.swift: (WKGroupSession.stateChanged(_:)): (WKGroupSessionObserver.receivedSession(_:)): * Source/WebKit/WebKitSwift/LinearMediaKit/LinearMediaPlayer.swift: * Source/WebKit/WebKitSwift/TextAnimation/WKTextAnimationManagerIOS.swift: * Source/WebKit/WebKitSwift/WritingTools/PlatformIntelligenceTextEffectView.swift: * Source/bmalloc/Configurations/bmalloc.xcconfig: * Tools/MiniBrowser/Configurations/Base.xcconfig: * Tools/SwiftBrowser/Configurations/Base.xcconfig: * Tools/TestWebKitAPI/Configurations/Base.xcconfig: * Tools/TestWebKitAPI/Configurations/TestWebKitAPIBundle.xcconfig: * Tools/TestWebKitAPI/Configurations/TestWebKitAPILibrary.xcconfig: * Tools/TestWebKitAPI/TestPDFDocument.swift: * Tools/TestWebKitAPI/Tests/WebKit Swift/TestWebKitAPIBundle-Bridging-Header.h: * Tools/TestWebKitAPI/Tests/WebKit Swift/WebPageTransferableTests.swift: * Tools/TestWebKitAPI/Tests/WebKitCocoa/SmartListsSupport.swift: Canonical link: https://commits.webkit.org/306576@main
1 parent 018237b commit 7a107d6

51 files changed

Lines changed: 83 additions & 260 deletions

File tree

Some content is hidden

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

‎Configurations/CommonBase.xcconfig‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -54,16 +54,12 @@ WK_COMMON_OTHER_CFLAGS = $(WK_SANITIZER_OTHER_CFLAGS) $(WK_COMMON_OTHER_CFLAGS_P
5454
// Work around rdar://141760829 until the fix is available on all clang-1700
5555
// based toolchains.
5656
WK_COMMON_OTHER_CFLAGS_PGO_YES = -mllvm -system-headers-coverage;
57-
WK_COMMON_OTHER_CFLAGS_PGO_YES[sdk=macosx13.*] = ;
58-
WK_COMMON_OTHER_CFLAGS_PGO_YES[sdk=macosx14.*] = ;
5957
OTHER_CFLAGS = $(inherited) $(WK_COMMON_OTHER_CFLAGS);
6058

6159
WK_COMMON_OTHER_CPLUSPLUSFLAGS = $(WK_LIBCPP_ASSERTIONS_CFLAGS);
6260
OTHER_CPLUSPLUSFLAGS = $(inherited) $(WK_COMMON_OTHER_CPLUSPLUSFLAGS);
6361

64-
_EXPERIMENTAL_SWIFT_EXPLICIT_MODULES = $(WK_DEFAULT_SWIFT_ENABLE_EXPLICIT_MODULES);
65-
WK_DEFAULT_SWIFT_ENABLE_EXPLICIT_MODULES = YES;
66-
WK_DEFAULT_SWIFT_ENABLE_EXPLICIT_MODULES[sdk=macosx14*] = ;
62+
_EXPERIMENTAL_SWIFT_EXPLICIT_MODULES = YES;
6763

6864
WK_DEFAULT_COMPILATION_CACHE_ENABLE_CACHING = YES;
6965
COMPILATION_CACHE_ENABLE_CACHING = $(WK_DEFAULT_COMPILATION_CACHE_ENABLE_CACHING);
@@ -103,13 +99,6 @@ WARNING_CFLAGS = $(inherited) $(WK_COMMON_WARNING_CFLAGS) $(WK_SANITIZER_WARNING
10399

104100
CLANG_CXX_STANDARD_LIBRARY_HARDENING = extensive;
105101

106-
// Setting CLANG_CXX_STANDARD_LIBRARY_HARDENING is sufficient in recent XCode versions but we want to keep
107-
// the libcpp assertion enabled on downlevels so use `-D_LIBCPP_ENABLE_ASSERTIONS=1` as well.
108-
WK_LIBCPP_ASSERTIONS_CFLAGS[sdk=iphone*17*] = -D_LIBCPP_ENABLE_ASSERTIONS=1;
109-
WK_LIBCPP_ASSERTIONS_CFLAGS[sdk=macosx14*] = -D_LIBCPP_ENABLE_ASSERTIONS=1;
110-
WK_LIBCPP_ASSERTIONS_CFLAGS[sdk=appletv*17*] = -D_LIBCPP_ENABLE_ASSERTIONS=1;
111-
WK_LIBCPP_ASSERTIONS_CFLAGS[sdk=watch*10*] = -D_LIBCPP_ENABLE_ASSERTIONS=1;
112-
113102
// Enable strict memory safety in Swift, and treat any such warnings as errors.
114103
// Enable for sufficiently recent Xcode only.
115104
WK_SWIFT_MEMORY_SAFETY_FLAGS = $(WK_SWIFT_MEMORY_SAFETY_FLAGS_$(WK_XCODE_BEFORE_17));

‎Source/JavaScriptCore/Configurations/Base.xcconfig‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,8 +157,6 @@ WK_USE_RESTRICTED_ENTITLEMENTS = $(USE_INTERNAL_SDK);
157157

158158
JSC_SEC_LD_FLAGS[sdk=iphoneos*] = -weak_framework BrowserEngineCore;
159159
JSC_SEC_LD_FLAGS[sdk=macosx*] = -weak_framework BrowserEngineCore;
160-
JSC_SEC_LD_FLAGS[sdk=macosx13*] = ;
161-
JSC_SEC_LD_FLAGS[sdk=macosx14*] = ;
162160
JSC_SEC_LD_FLAGS[sdk=appletv*] = ;
163161
JSC_SEC_LD_FLAGS[sdk=watch*] = ;
164162
JSC_SEC_LD_FLAGS[sdk=xr*] = ;

‎Source/JavaScriptCore/Configurations/JavaScriptCore.xcconfig‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ MODULEMAP_FILE = $(SRCROOT)/JavaScriptCore.modulemap;
3232

3333
WK_HAS_VALID_JSC_PRIVATE_MODULE = YES;
3434

35-
WK_HAS_VALID_JSC_PRIVATE_MODULE[sdk=macosx14*] = ;
3635
WK_HAS_VALID_JSC_PRIVATE_MODULE[sdk=macosx15*] = ;
3736
WK_HAS_VALID_JSC_PRIVATE_MODULE[sdk=macosx26.0*] = ;
3837
WK_HAS_VALID_JSC_PRIVATE_MODULE[sdk=macosx26.1*] = ;

‎Source/WTF/Configurations/WTF.xcconfig‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,16 +54,12 @@ WK_HEADERS_VFS_FILE = $(CPP_HEADERMAP_PRODUCT_HEADERS_VFS_FILE);
5454

5555
GENERATE_WTF_MODULEMAP = YES;
5656

57-
//GENERATE_WTF_MODULEMAP[sdk=macosx14*] = ;
58-
//GENERATE_WTF_MODULEMAP[sdk=macosx15*] = ;
59-
6057
// The WTF module is ill-formed on bridgeOS.
6158
GENERATE_WTF_MODULEMAP[sdk=bridgeos*] = ;
6259

6360
ENABLE_WK_LIBRARY_MODULE_VERIFIER = $(GENERATE_WTF_MODULEMAP);
6461

6562
// The WTF module is ill-formed in these configurations, but are needed for backward compatibility.
66-
ENABLE_WK_LIBRARY_MODULE_VERIFIER[sdk=macosx14*] = ;
6763
ENABLE_WK_LIBRARY_MODULE_VERIFIER[sdk=macosx15*] = ;
6864

6965
ENABLE_WK_LIBRARY_MODULE_VERIFIER[sdk=macosx26.0*] = ;

‎Source/WebCore/Configurations/WebCore.xcconfig‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -169,8 +169,6 @@ WK_APPLEJPEGXL_LDFLAGS_YES = -weak_framework AppleJPEGXL;
169169

170170
JSC_SEC_LD_FLAGS[sdk=iphoneos*] = -weak_framework BrowserEngineCore;
171171
JSC_SEC_LD_FLAGS[sdk=macosx*] = -weak_framework BrowserEngineCore;
172-
JSC_SEC_LD_FLAGS[sdk=macosx13*] = ;
173-
JSC_SEC_LD_FLAGS[sdk=macosx14*] = ;
174172
JSC_SEC_LD_FLAGS[sdk=appletv*] = ;
175173
JSC_SEC_LD_FLAGS[sdk=watch*] = ;
176174
JSC_SEC_LD_FLAGS[sdk=xr*] = ;
@@ -230,7 +228,6 @@ WK_HAVE_URL_FORMATTING_macosx = $(WK_HAVE_URL_FORMATTING$(WK_MACOS_1014));
230228
WK_HAVE_URL_FORMATTING_MACOS_SINCE_1014 = YES;
231229

232230
SWIFT_VERSION = 6.0;
233-
SWIFT_VERSION[sdk=macosx14*] = 5.0;
234231

235232
SWIFT_INSTALL_OBJC_HEADER = NO;
236233
BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
@@ -267,9 +264,7 @@ WK_VERIFY_WEBCORE_MODULE[sdk=xr*26.3*] = ;
267264

268265
ENABLE_MODULE_VERIFIER = $(WK_VERIFY_WEBCORE_MODULE);
269266
MODULE_VERIFIER_SUPPORTED_LANGUAGES = objective-c++;
270-
MODULE_VERIFIER_SUPPORTED_LANGUAGES[sdk=macosx14*] = ;
271267
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = c++23;
272-
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS[sdk=macosx14*] = ;
273268
MODULE_VERIFIER_KIND = builtin;
274269

275270
OTHER_SWIFT_FLAGS = $(inherited) -Xcc -std=c++2b -enable-upcoming-feature InternalImportsByDefault -enable-upcoming-feature MemberImportVisibility -enable-upcoming-feature ExistentialAny -enable-upcoming-feature InferIsolatedConformances -enable-upcoming-feature NonisolatedNonsendingByDefault;

‎Source/WebCore/PAL/Configurations/PAL.xcconfig‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ OTHER_SWIFT_FLAGS_WK_SWIFT_EXPLICIT_MODULES_ALLOW_CXX_INTEROP_ = -no-verify-emit
8181

8282
WK_SWIFT_EXPLICIT_MODULES_ALLOW_CXX_INTEROP = YES;
8383

84-
WK_SWIFT_EXPLICIT_MODULES_ALLOW_CXX_INTEROP[sdk=macosx14*] = ;
8584
WK_SWIFT_EXPLICIT_MODULES_ALLOW_CXX_INTEROP[sdk=macosx15*] = ;
8685
WK_SWIFT_EXPLICIT_MODULES_ALLOW_CXX_INTEROP[sdk=macosx26.0*] = ;
8786
WK_SWIFT_EXPLICIT_MODULES_ALLOW_CXX_INTEROP[sdk=macosx26.1*] = ;

‎Source/WebCore/PAL/pal/PALSwift/CryptoKitShim.swift‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,11 @@
2121
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
2222
// THE POSSIBILITY OF SUCH DAMAGE.
2323

24-
#if swift(>=5.9)
25-
2624
import CryptoKit
2725
import Foundation
2826

29-
#if swift(>=6.0)
3027
public import pal.Core.PALSwift
3128
public import pal.Core.crypto.CryptoDigestHashFunction
32-
#else
33-
import pal.Core.PALSwift
34-
import pal.Core.crypto.CryptoDigestHashFunction
35-
#endif
3629

3730
// FIXME: PALSwift should have no public symbols.
3831
// swift-format-ignore: AllPublicDeclarationsHaveDocumentation
@@ -931,5 +924,3 @@ public class HKDF {
931924
return returnValue
932925
}
933926
}
934-
935-
#endif

‎Source/WebCore/PAL/pal/PALSwift/UnsafeOverlays.swift‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,10 @@
2121
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
2222
// THE POSSIBILITY OF SUCH DAMAGE.
2323

24-
#if swift(>=5.9)
25-
2624
import Foundation
2725
import CryptoKit
2826

29-
#if swift(>=6.0)
3027
public import pal.Core.PALSwift
31-
#else
32-
import pal.Core.PALSwift
33-
#endif
3428

3529
enum UnsafeErrors: Error {
3630
case invalidLength
@@ -347,5 +341,3 @@ extension CryptoKit.HKDF {
347341
.copyToVectorUInt8()
348342
}
349343
}
350-
351-
#endif

‎Source/WebCore/PAL/pal/pal.swift‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,4 @@
2323

2424
// The Swift module shadows the Clang module and the Swift module therefore needs to publicly import and re-export the underlying Clang module.
2525

26-
#if swift(>=6.0)
2726
@_exported public import pal
28-
#else
29-
@_exported import pal
30-
#endif

‎Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@
2828
#include <wtf/Compiler.h>
2929
#include <wtf/Platform.h>
3030

31-
// FIXME: Remove when support for macOS 14 is no longer required.
32-
#if !__has_feature(modules) || !PLATFORM(MAC) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 150000
33-
3431
DECLARE_SYSTEM_HEADER
3532

3633
#include <CFNetwork/CFNetwork.h>
@@ -618,5 +615,3 @@ WTF_EXTERN_C_END
618615
@end
619616

620617
#endif // defined(__OBJC__)
621-
622-
#endif // !__has_feature(modules) || !PLATFORM(MAC) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 150000

0 commit comments

Comments
 (0)