averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

NCGenerics: begin process of removing compat hack

Browse Source 
The reverse-condfail workaround needs to be removed, and this is the
first step to allowing the stdlib to build with conditionally escapable
types.

resolves rdar://132453000
This commit is contained in:
Kavon Farvardin
2024-07-29 17:27:17 -07:00
parent 72ad780578
commit 972373b129
4 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/swift/Basic/Features.def
View File

@@ -392,7 +392,7 @@ EXPERIMENTAL_FEATURE(DebugDescriptionMacro, true)
EXPERIMENTAL_FEATURE(ReinitializeConsumeInMultiBlockDefer, false)
EXPERIMENTAL_FEATURE(SE427NoInferenceOnExtension, false)
EXPERIMENTAL_FEATURE(SE427NoInferenceOnExtension, true)
EXPERIMENTAL_FEATURE(Extern, true)

1
stdlib/cmake/modules/SwiftSource.cmake
View File

@@ -627,6 +627,7 @@ function(_compile_swift_files
list(APPEND swift_flags "-enable-experimental-feature" "NoncopyableGenerics2")
list(APPEND swift_flags "-enable-experimental-feature" "SuppressedAssociatedTypes")
list(APPEND swift_flags "-enable-experimental-feature" "SE427NoInferenceOnExtension")
if(SWIFT_ENABLE_EXPERIMENTAL_NONESCAPABLE_TYPES)
list(APPEND swift_flags "-enable-experimental-feature" "NonescapableTypes")

9
test/ModuleInterface/Inputs/NoncopyableGenerics_Misc.swift
View File

@@ -142,3 +142,12 @@ public struct RegularTwice: ~Copyable, ~Copyable {}
public struct Continuation<T: ~Copyable, E: Error> {
public func resume(returning value: consuming T) where E == Never {}
}
// coverage for rdar://132453000 (Can't make a type both conditionally Copyable and conditionally Escapable)
@frozen
public enum Moptional<Wrapped: ~Copyable & ~Escapable>: ~Copyable, ~Escapable {
case none
case some(Wrapped)
}
extension Moptional: Copyable where Wrapped: Copyable {}
extension Moptional: Escapable where Wrapped: Escapable {}

8
test/ModuleInterface/noncopyable_generics.swift
View File

@@ -1,8 +1,5 @@
// RUN: %empty-directory(%t)
// Due to SE427NoInferenceOnExtension not being in production
// REQUIRES: asserts
// RUN: %target-swift-frontend -swift-version 5 -enable-library-evolution -emit-module \
// RUN: -enable-experimental-feature SuppressedAssociatedTypes \
// RUN: -enable-experimental-feature NonescapableTypes \
@@ -159,6 +156,11 @@ import NoncopyableGenerics_Misc
// CHECK-MISC-NEXT: }
// CHECK-MISC-NEXT: public struct Continuation<T, E> where E : Swift.Error, T : ~Copyable {
// CHECK-MISC: @frozen public enum Moptional<Wrapped> : ~Swift.Copyable, ~Swift.Escapable where Wrapped : ~Copyable, Wrapped : ~Escapable {
// CHECK-MISC: extension {{.*}}.Moptional : Swift.Copyable where Wrapped : Swift.Copyable {
// CHECK-MISC: extension {{.*}}.Moptional : Swift.Escapable where Wrapped : Swift.Escapable {
// CHECK-MISC-NOT: ~
// NOTE: below are extensions emitted at the end of NoncopyableGenerics_Misc.swift