Skip to content

Commit e05f9c7

Browse files
JonWBedardJonWBedard
committed
Unreviewed, reverting 309177@main (d461e83)
https://bugs.webkit.org/show_bug.cgi?id=309866 rdar://172441906 REGRESSION(309177@main): method does not override any method from its superclass Reverted change: [Swift in WebKit] Enable InternalImportsByDefault and MemberImportVisibility https://bugs.webkit.org/show_bug.cgi?id=309759 rdar://172347735 309177@main (d461e83) Canonical link: https://commits.webkit.org/309180@main
1 parent a378965 commit e05f9c7

83 files changed

Lines changed: 164 additions & 167 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 & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,6 @@ WK_SWIFT_MEMORY_SAFETY_ERROR_FLAGS[sdk=*26.3*] = ;
122122
WK_SWIFT_CLANG_DEPLOYMENT_TARGET = $(WK_SWIFT_CLANG_DEPLOYMENT_TARGET_$(WK_PLATFORM_NAME);
123123
WK_SWIFT_CLANG_DEPLOYMENT_TARGET_macosx = -clang-target $(CURRENT_ARCH)-apple-macos$(MACOSX_DEPLOYMENT_TARGET);
124124

125-
OTHER_SWIFT_FLAGS = $(inherited) -Werror ExistentialAny -enable-upcoming-feature ExistentialAny $(WK_SWIFT_MEMORY_SAFETY_FLAGS) $(WK_SWIFT_MEMORY_SAFETY_ERROR_FLAGS) $(WK_SWIFT_CLANG_DEPLOYMENT_TARGET) $(WK_SANITIZER_OTHER_SWIFT_FLAGS) -enable-upcoming-feature InternalImportsByDefault -enable-upcoming-feature MemberImportVisibility;
125+
OTHER_SWIFT_FLAGS = $(inherited) -Werror ExistentialAny -enable-upcoming-feature ExistentialAny $(WK_SWIFT_MEMORY_SAFETY_FLAGS) $(WK_SWIFT_MEMORY_SAFETY_ERROR_FLAGS) $(WK_SWIFT_CLANG_DEPLOYMENT_TARGET) $(WK_SANITIZER_OTHER_SWIFT_FLAGS);
126126

127127
OTHER_LIBTOOLFLAGS = -no_warning_for_no_symbols;

‎Source/WebCore/Configurations/WebCore.xcconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ MODULE_VERIFIER_SUPPORTED_LANGUAGES = objective-c++;
278278
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = c++23;
279279
MODULE_VERIFIER_KIND = builtin;
280280

281-
OTHER_SWIFT_FLAGS = $(inherited) -Xcc -std=c++2b;
281+
OTHER_SWIFT_FLAGS = $(inherited) -Xcc -std=c++2b -enable-upcoming-feature InternalImportsByDefault -enable-upcoming-feature MemberImportVisibility;
282282

283283
SWIFT_DEFAULT_ACTOR_ISOLATION = nonisolated;
284284
SWIFT_STRICT_CONCURRENCY = complete;

‎Source/WebGPU/Configurations/WebGPU.xcconfig‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,9 @@ SWIFT_OBJC_INTEROP_MODE = $(WK_SWIFT_OBJC_INTEROP_MODE_$(ENABLE_WEBGPU_SWIFT))
139139
WK_SWIFT_OBJC_INTEROP_MODE_ENABLE_WEBGPU_SWIFT = objcxx;
140140
SWIFT_LIBRARY_LEVEL = spi;
141141

142+
// FIXME: reenable this once rdar://154887575 lands
143+
// SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES
144+
142145
// FIXME: broaden SafeInteropWrappers to all of WebKit; rdar://159439903
143146
OTHER_SWIFT_FLAGS = $(inherited) @$(BUILT_PRODUCTS_DIR)/DerivedSources/WebGPU/platform-enabled-swift-args.$(arch).resp -Xcc -std=c++2b -Xcc -D__WEBGPU__ -Xcc -DUCHAR_TYPE=char16_t -enable-experimental-feature SafeInteropWrappers -enable-experimental-feature LifetimeDependence -Xcc -fvisibility=hidden -no-verify-emitted-module-interface;
144147

‎Source/WebGPU/WebGPU/Buffer.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
// THE POSSIBILITY OF SUCH DAMAGE.
2323

2424
private import CxxStdlib
25-
import WebGPU_Internal.Buffer
25+
internal import WebGPU_Internal.Buffer
2626

2727
extension WebGPU.Buffer {
2828
func copy(from source: Span<UInt8>, offset: Int) {

‎Source/WebGPU/WebGPU/CommandEncoder.swift‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323

2424
private import CxxStdlib
2525
public import Metal
26-
import WebGPU_Internal.Buffer
27-
import WebGPU_Internal.CommandEncoder
28-
import WebGPU_Internal.CxxBridging
29-
import WebGPU_Internal.QuerySet
30-
import WebGPU_Internal.TextureOrTextureView
26+
internal import WebGPU_Internal.Buffer
27+
internal import WebGPU_Internal.CommandEncoder
28+
internal import WebGPU_Internal.CxxBridging
29+
internal import WebGPU_Internal.QuerySet
30+
internal import WebGPU_Internal.TextureOrTextureView
3131
public import WebGPU_Private.WebGPU
3232

3333
typealias String = Swift.String

‎Source/WebGPU/WebGPU/Queue.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
// THE POSSIBILITY OF SUCH DAMAGE.
2323

2424
public import Metal
25-
import WebGPU_Internal.Queue
25+
internal import WebGPU_Internal.Queue
2626

2727
private let largeBufferSize = 32 * 1024 * 1024
2828

‎Source/WebGPU/WebGPU/StdLibExtras.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
// FIXME (rdar://164119356): Move StdLibExtras.swift from WebGPU to WTF
2525

2626
private import CxxStdlib
27-
import WebGPU_Private.WebGPU
27+
internal import WebGPU_Private.WebGPU
2828

2929
// FIXME (rdar://162375123): This should be in the standard library.
3030
extension MutableSpan where Element: BitwiseCopyable {

‎Source/WebKit/GPUProcess/graphics/Model/ModelBridge.swift‎

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

24-
import Metal
24+
internal import Metal
2525
import WebKit
2626

2727
#if ENABLE_GPU_PROCESS_MODEL && canImport(RealityCoreRenderer, _version: 11) && compiler(>=6.2)
28-
@_weakLinked @_spi(UsdLoaderAPI) import _USDKit_RealityKit
28+
@_weakLinked @_spi(UsdLoaderAPI) internal import _USDKit_RealityKit
2929
@_spi(RealityCoreRendererAPI) import RealityKit
30-
@_weakLinked import USDKit
31-
@_weakLinked @_spi(SwiftAPI) import DirectResource
32-
@_weakLinked import _USDKit_RealityKit
33-
@_weakLinked import ShaderGraph
30+
@_weakLinked internal import USDKit
31+
@_weakLinked @_spi(SwiftAPI) internal import DirectResource
32+
@_weakLinked internal import _USDKit_RealityKit
33+
@_weakLinked internal import ShaderGraph
3434
#endif
3535

3636
@objc

‎Source/WebKit/GPUProcess/graphics/Model/ModelIBLTextures.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323

2424
#if ENABLE_GPU_PROCESS_MODEL && canImport(RealityCoreRenderer, _version: 11) && compiler(>=6.2)
2525

26-
import Metal
27-
@_weakLinked import USDKit
28-
@_weakLinked @_spi(UsdLoaderAPI) import _USDKit_RealityKit
26+
internal import Metal
27+
@_weakLinked internal import USDKit
28+
@_weakLinked @_spi(UsdLoaderAPI) internal import _USDKit_RealityKit
2929
@_spi(RealityCoreRendererAPI) import RealityKit
3030
@_spi(RealityCoreTextureProcessingAPI) import RealityKit
3131

‎Source/WebKit/GPUProcess/graphics/Model/ModelParameters.swift‎

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

2424
#if ENABLE_GPU_PROCESS_MODEL && canImport(RealityCoreRenderer, _version: 11) && compiler(>=6.2)
2525

26-
@_weakLinked import USDKit
27-
@_weakLinked @_spi(UsdLoaderAPI) import _USDKit_RealityKit
26+
@_weakLinked internal import USDKit
27+
@_weakLinked @_spi(UsdLoaderAPI) internal import _USDKit_RealityKit
2828
@_spi(RealityCoreRendererAPI) import RealityKit
2929

3030
func makeParameters(

0 commit comments

Comments
 (0)