Skip to content

Commit bf8f9ac

Browse files
authored
Merge pull request #71581 from hborla/swift-6-noasserts
2 parents 5dac5e2 + 6a3bacd commit bf8f9ac

File tree

62 files changed

+6
-102
lines changed

Some content is hidden

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

62 files changed

+6
-102
lines changed

include/swift/Basic/Features.def

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ EXPERIMENTAL_FEATURE(ReferenceBindings, true)
219219
EXPERIMENTAL_FEATURE(BuiltinModule, true)
220220

221221
/// Region Based Isolation testing using the TransferNonSendable pass
222-
EXPERIMENTAL_FEATURE(RegionBasedIsolation, false)
222+
EXPERIMENTAL_FEATURE(RegionBasedIsolation, true)
223223

224224
/// Enable extended callbacks (with additional parameters) to be used when the
225225
/// "playground transform" is enabled.

include/swift/Basic/Version.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,8 @@ class Version {
134134

135135
// List of backward-compatibility versions that we permit passing as
136136
// -swift-version <vers>
137-
static std::array<StringRef, 3> getValidEffectiveVersions() {
138-
return {{"4", "4.2", "5"}};
137+
static std::array<StringRef, 4> getValidEffectiveVersions() {
138+
return {{"4", "4.2", "5", "6"}};
139139
};
140140
};
141141

lib/Basic/Version.cpp

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -180,16 +180,7 @@ llvm::Optional<Version> Version::getEffectiveLanguageVersion() const {
180180
"getCurrentLanguageVersion is no longer correct here");
181181
return Version::getCurrentLanguageVersion();
182182
case 6:
183-
// Allow version '6' in asserts compilers *only* so that we can start
184-
// testing changes slated for Swift 6. Note that it's still not listed in
185-
// `Version::getValidEffectiveVersions()`.
186-
// FIXME: When Swift 6 becomes real, remove 'REQUIRES: asserts' from tests
187-
// using '-swift-version 6'.
188-
#ifdef NDEBUG
189-
LLVM_FALLTHROUGH;
190-
#else
191183
return Version{6};
192-
#endif
193184
default:
194185
return llvm::None;
195186
}

test/ClangImporter/incomplete_objc_types_availability.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
// REQUIRES: objc_interop
1212
// REQUIRES: executable_test
13-
// REQUIRES: asserts
1413

1514
// Verify that Clang declarations referencing either of the forward declares types "ForwardDeclaredInterface" or
1615
// "ForwardDeclaredProtocol" are usable from Swift.

test/ClangImporter/incomplete_objc_types_base_interface_swift_6.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
// REQUIRES: objc_interop
99
// REQUIRES: executable_test
1010
// REQUIRES: OS=macosx
11-
// REQUIRES: asserts
1211

1312
import Foundation
1413
import IncompleteTypeLibrary1

test/ClangImporter/incomplete_objc_types_compatibility_complete_incomplete.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
// REQUIRES: objc_interop
1313
// REQUIRES: executable_test
14-
// REQUIRES: asserts
1514

1615
// "ForwardDeclaredInterface" and "ForwardDeclaredProtocol" are forward declared in IncompleteTypeLibrary1/2, and
1716
// completely declared in CompleteTypes. This test verifies that instances of the complete types can be passed

test/ClangImporter/incomplete_objc_types_compatibility_incomplete_incomplete.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
// REQUIRES: objc_interop
1313
// REQUIRES: executable_test
14-
// REQUIRES: asserts
1514

1615
// Both libraries "IncompleteTypeConsumer1" and "IncompleteTypeConsumer2" forward declare an interface "ForwardDeclaredInterface"
1716
// and a protocol "ForwardDeclaredProtocol". This test verifies that the synthesized Swift declaration created to represent

test/ClangImporter/incomplete_objc_types_full_availability_swift_6.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
// REQUIRES: objc_interop
99
// REQUIRES: executable_test
10-
// REQUIRES: asserts
1110

1211
import IncompleteTypeLibrary1
1312
import CompleteTypes

test/ClangImporter/incomplete_objc_types_importing_limitations_diagnostics.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
// RUN: not %target-swift-frontend -swift-version 6 -enable-objc-interop -typecheck -I %S/Inputs/custom-modules/IncompleteTypes %s 2>&1 | %FileCheck %s
33

44
// REQUIRES: objc_interop
5-
// REQUIRES: asserts
65

76
import IncompleteTypeLibrary1
87
import IncompleteNoRootTypeProtocolLibrary

test/ClangImporter/incomplete_objc_types_no_reference.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
// RUN: not %target-swift-frontend -swift-version 6 -enable-objc-interop -typecheck -I %S/Inputs/custom-modules/IncompleteTypes %s 2>&1 | %FileCheck %s
33

44
// REQUIRES: objc_interop
5-
// REQUIRES: asserts
65

76
import IncompleteTypeLibrary1
87

0 commit comments

Comments
 (0)