Skip to content

Commit 46510a5

Browse files
tkremenektkremenek
committed
Bump compiler version to Swift 5.
Main pieces: - Bump swift-version to 5 - Remove -swift-version 3 support
1 parent d6206d5 commit 46510a5

16 files changed

+123
-61
lines changed

‎CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ set_property(CACHE SWIFT_ANALYZE_CODE_COVERAGE PROPERTY
128128
# SWIFT_VERSION is deliberately /not/ cached so that an existing build directory
129129
# can be reused when a new version of Swift comes out (assuming the user hasn't
130130
# manually set it as part of their own CMake configuration).
131-
set(SWIFT_VERSION "4.2")
131+
set(SWIFT_VERSION "5.0")
132132

133133
set(SWIFT_VENDOR "" CACHE STRING
134134
"The vendor name of the Swift compiler")

‎include/swift/Basic/Version.h

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

153153
// List of backward-compatibility versions that we permit passing as
154154
// -swift-version <vers>
155-
static std::array<StringRef, 4> getValidEffectiveVersions() {
156-
return {{"3", "4", "4.2", "5"}};
155+
static std::array<StringRef, 3> getValidEffectiveVersions() {
156+
return {{"4", "4.2", "5"}};
157157
};
158158
};
159159

‎lib/Basic/Version.cpp

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -324,21 +324,17 @@ Optional<Version> Version::getEffectiveLanguageVersion() const {
324324
// set apply it to the "3" case, so that Swift 4.0.1 will automatically
325325
// have a compatibility mode of 3.2.1.
326326
switch (Components[0]) {
327-
case 3:
328-
#ifdef SWIFT_VERSION_PATCHLEVEL
329-
return Version{3, 4, SWIFT_VERSION_PATCHLEVEL};
330-
#else
331-
return Version{3, 4};
332-
#endif
333327
case 4:
334-
static_assert(SWIFT_VERSION_MAJOR == 4,
335-
"getCurrentLanguageVersion is no longer correct here");
336328
// Version '4' on its own implies '4.1.50'.
337329
if (size() == 1)
338330
return Version{4, 1, 50};
339-
return Version::getCurrentLanguageVersion();
331+
// This should be true because of the check up above.
332+
assert(size() == 2 && Components[0] == 4 && Components[1] == 2);
333+
return Version{4, 2};
340334
case 5:
341-
return Version{5, 0};
335+
static_assert(SWIFT_VERSION_MAJOR == 5,
336+
"getCurrentLanguageVersion is no longer correct here");
337+
return Version::getCurrentLanguageVersion();
342338
default:
343339
return None;
344340
}

‎lib/ClangImporter/ImportEnumInfo.cpp

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -33,19 +33,6 @@ STATISTIC(EnumInfoNumCacheMisses, "# of times the enum info cache was missed");
3333
using namespace swift;
3434
using namespace importer;
3535

36-
static void rememberToChangeThisBehaviorInSwift5() {
37-
// Note: Once the compiler starts advertising itself as Swift 5, even
38-
// Swift 4 mode is supposed to treat C enums as non-exhaustive. Because
39-
// it's Swift 4 mode, failing to switch over the whole enum will only
40-
// produce a warning, not an error.
41-
//
42-
// This is an assertion rather than a condition because we /want/ to be
43-
// reminded to take it out when we're ready for the Swift 5 release.
44-
assert(version::getSwiftNumericVersion().first < 5 &&
45-
"When the compiler starts advertising itself as Swift 5, even "
46-
"Swift 4 mode is supposed to treat C enums as non-exhaustive.");
47-
}
48-
4936
/// Find the last extensibility attribute on \p decl as arranged by source
5037
/// location...unless there's an API note, in which case that one wins.
5138
///
@@ -61,18 +48,6 @@ getBestExtensibilityAttr(clang::Preprocessor &pp, const clang::EnumDecl *decl) {
6148
return next;
6249
}
6350

64-
// Temporarily ignore enum_extensibility attributes inside CF_ENUM and
65-
// similar. In the Swift 5 release we can start respecting this annotation,
66-
// meaning this entire block can be dropped.
67-
{
68-
rememberToChangeThisBehaviorInSwift5();
69-
auto loc = next->getLocation();
70-
if (loc.isMacroID() &&
71-
pp.getImmediateMacroName(loc) == "__CF_ENUM_ATTRIBUTES") {
72-
continue;
73-
}
74-
}
75-
7651
if (!bestSoFar ||
7752
sourceMgr.isBeforeInTranslationUnit(bestSoFar->getLocation(),
7853
next->getLocation())) {

‎test/Driver/swift-version-default.swift

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,19 @@ aoeu // expected-error {{use of unresolved identifier}}
3030
htn
3131
#endif
3232

33+
#if swift(>=4.2)
34+
aoeu // expected-error {{use of unresolved identifier}}
35+
#else
36+
htn
37+
#endif
38+
3339
#if swift(>=5)
40+
aoeu // expected-error {{use of unresolved identifier}}
41+
#else
42+
htn
43+
#endif
44+
45+
#if swift(>=6)
3446
aoeu
3547
#else
3648
htn // expected-error {{use of unresolved identifier}}

‎test/Driver/swift-version.swift

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,37 +4,33 @@
44
// RUN: not %target-swiftc_driver -swift-version 2.3 %s 2>&1 | %FileCheck --check-prefix BAD %s
55
// RUN: not %target-swiftc_driver -swift-version 7 %s 2>&1 | %FileCheck --check-prefix BAD %s
66
// RUN: not %target-swiftc_driver -swift-version 7.2 %s 2>&1 | %FileCheck --check-prefix BAD %s
7-
// RUN: not %target-swiftc_driver -swift-version 3.0 %s 2>&1 | %FileCheck --check-prefix FIXIT_3 %s
8-
// RUN: not %target-swiftc_driver -swift-version 3.3 %s 2>&1 | %FileCheck --check-prefix FIXIT_3 %s
7+
// RUN: not %target-swiftc_driver -swift-version 3.0 %s 2>&1 | %FileCheck --check-prefix BAD %s
8+
// RUN: not %target-swiftc_driver -swift-version 3.3 %s 2>&1 | %FileCheck --check-prefix BAD %s
99
// RUN: not %target-swiftc_driver -swift-version 4.3 %s 2>&1 | %FileCheck --check-prefix FIXIT_4 %s
1010
// RUN: not %target-swiftc_driver -swift-version 5.1 %s 2>&1 | %FileCheck --check-prefix FIXIT_5 %s
1111

12-
// RUN: not %target-swiftc_driver -swift-version 3 -typecheck %s 2>&1 | %FileCheck --check-prefix ERROR_3 %s
1312
// RUN: not %target-swiftc_driver -swift-version 4 -typecheck %s 2>&1 | %FileCheck --check-prefix ERROR_4 %s
1413
// RUN: not %target-swiftc_driver -swift-version 5 -typecheck %s 2>&1 | %FileCheck --check-prefix ERROR_5 %s
1514

1615
// BAD: invalid value
17-
// BAD: note: valid arguments to '-swift-version' are '3', '4', '4.2', '5'
16+
// BAD: note: valid arguments to '-swift-version' are '4', '4.2', '5'
1817

19-
// FIXIT_3: use major version, as in '-swift-version 3'
2018
// FIXIT_4: use major version, as in '-swift-version 4'
2119
// FIXIT_5: use major version, as in '-swift-version 5'
2220

2321

2422
#if swift(>=3)
2523
asdf
26-
// ERROR_3: [[@LINE-1]]:1: error: {{use of unresolved identifier}}
27-
// ERROR_4: [[@LINE-2]]:1: error: {{use of unresolved identifier}}
28-
// ERROR_5: [[@LINE-3]]:1: error: {{use of unresolved identifier}}
24+
// ERROR_4: [[@LINE-1]]:1: error: {{use of unresolved identifier}}
25+
// ERROR_5: [[@LINE-2]]:1: error: {{use of unresolved identifier}}
2926
#else
3027
jkl
3128
#endif
3229

3330
#if swift(>=3.1)
3431
asdf
35-
// ERROR_3: [[@LINE-1]]:1: error: {{use of unresolved identifier}}
36-
// ERROR_4: [[@LINE-2]]:1: error: {{use of unresolved identifier}}
37-
// ERROR_5: [[@LINE-3]]:1: error: {{use of unresolved identifier}}
32+
// ERROR_4: [[@LINE-1]]:1: error: {{use of unresolved identifier}}
33+
// ERROR_5: [[@LINE-2]]:1: error: {{use of unresolved identifier}}
3834
#else
3935
jkl
4036
#endif
@@ -44,7 +40,7 @@ asdf
4440
// ERROR_4: [[@LINE-1]]:1: error: {{use of unresolved identifier}}
4541
// ERROR_5: [[@LINE-2]]:1: error: {{use of unresolved identifier}}
4642
#else
47-
jkl // ERROR_3: [[@LINE]]:1: error: {{use of unresolved identifier}}
43+
jkl
4844
#endif
4945

5046
#if swift(>=4.1)
@@ -53,14 +49,12 @@ asdf
5349
// ERROR_5: [[@LINE-2]]:1: error: {{use of unresolved identifier}}
5450
#else
5551
jkl
56-
// ERROR_3: [[@LINE-1]]:1: error: {{use of unresolved identifier}}
5752
#endif
5853

5954
#if swift(>=5)
6055
asdf
6156
// ERROR_5: [[@LINE-1]]:1: error: {{use of unresolved identifier}}
6257
#else
6358
jkl
64-
// ERROR_3: [[@LINE-1]]:1: error: {{use of unresolved identifier}}
65-
// ERROR_4: [[@LINE-2]]:1: error: {{use of unresolved identifier}}
59+
// ERROR_4: [[@LINE-1]]:1: error: {{use of unresolved identifier}}
6660
#endif

‎test/Migrator/DoubleEditAPI.json renamed to ‎test/Migrator/Inputs/DoubleEditAPI.json

File renamed without changes.

‎test/Migrator/no_ast_passes_after_swift4.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// REQUIRES: objc_interop
2-
// RUN: %empty-directory(%t) && %target-swift-frontend -c -update-code -primary-file %s -F %S/mock-sdk -api-diff-data-file %S/Inputs/DoubleEditAPI.json -emit-migrated-file-path %t/no_ast_passes_after_swift4.swift.result -emit-remap-file-path %t/no_ast_passes_after_swift4.swift.remap -o /dev/null -swift-version 4.2
2+
// RUN: %empty-directory(%t) && %target-swift-frontend -c -update-code -primary-file %s -F %S/mock-sdk -emit-migrated-file-path %t/no_ast_passes_after_swift4.swift.result -emit-remap-file-path %t/no_ast_passes_after_swift4.swift.remap -o /dev/null -swift-version 4.2
33
// RUN: diff -u %S/no_ast_passes_after_swift4.swift.expected %t/no_ast_passes_after_swift4.swift.result
44
// RUN: %target-swift-frontend -typecheck -F %S/mock-sdk -swift-version 4 %t/no_ast_passes_after_swift4.swift.result
55

‎test/Migrator/no_ast_passes_after_swift4.swift.expected

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// REQUIRES: objc_interop
2-
// RUN: %empty-directory(%t) && %target-swift-frontend -c -update-code -primary-file %s -F %S/mock-sdk -api-diff-data-file %S/Inputs/DoubleEditAPI.json -emit-migrated-file-path %t/no_ast_passes_after_swift4.swift.result -emit-remap-file-path %t/no_ast_passes_after_swift4.swift.remap -o /dev/null -swift-version 4.2
2+
// RUN: %empty-directory(%t) && %target-swift-frontend -c -update-code -primary-file %s -F %S/mock-sdk -emit-migrated-file-path %t/no_ast_passes_after_swift4.swift.result -emit-remap-file-path %t/no_ast_passes_after_swift4.swift.remap -o /dev/null -swift-version 4.2
33
// RUN: diff -u %S/no_ast_passes_after_swift4.swift.expected %t/no_ast_passes_after_swift4.swift.result
44
// RUN: %target-swift-frontend -typecheck -F %S/mock-sdk -swift-version 4 %t/no_ast_passes_after_swift4.swift.result
55

‎test/Migrator/no_double_edit_ast_pass.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// REQUIRES: objc_interop
33
// RUN: %target-swift-frontend -typecheck %s -F %S/mock-sdk
44
// RUN: %empty-directory(%t)
5-
// RUN: %target-swift-frontend -c -F %S/mock-sdk -api-diff-data-file %S/DoubleEditAPI.json -update-code -primary-file %s -emit-migrated-file-path %t/no_double_edit_ast_pass.result -o /dev/null
5+
// RUN: %target-swift-frontend -c -F %S/mock-sdk -api-diff-data-file %S/Inputs/DoubleEditAPI.json -update-code -primary-file %s -emit-migrated-file-path %t/no_double_edit_ast_pass.result -o /dev/null
66
// RUN: diff -u %s.expected %t/no_double_edit_ast_pass.result
77

88
import Bar

‎test/Migrator/no_double_edit_ast_pass.swift.expected

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// REQUIRES: objc_interop
33
// RUN: %target-swift-frontend -typecheck %s -F %S/mock-sdk
44
// RUN: %empty-directory(%t)
5-
// RUN: %target-swift-frontend -c -F %S/mock-sdk -api-diff-data-file %S/DoubleEditAPI.json -update-code -primary-file %s -emit-migrated-file-path %t/no_double_edit_ast_pass.result -o /dev/null
5+
// RUN: %target-swift-frontend -c -F %S/mock-sdk -api-diff-data-file %S/Inputs/DoubleEditAPI.json -update-code -primary-file %s -emit-migrated-file-path %t/no_double_edit_ast_pass.result -o /dev/null
66
// RUN: diff -u %s.expected %t/no_double_edit_ast_pass.result
77

88
import Bar

‎test/SILOptimizer/loweraggregateinstrs_expandall.sil

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ struct S {
3737
}
3838

3939
enum E {
40-
case NoElement()
40+
case NoElement(Void)
4141
case TrivialElement(Builtin.Int64)
4242
case ReferenceElement(C1)
4343
case StructNonTrivialElt(S)

‎test/Serialization/version-mismatches.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import Library
1212
// TOO-NEW: :[[@LINE-2]]:8: error: module file was created by a newer version of the compiler: {{.*}}too-new/Library.swiftmodule{{$}}
1313

1414
// Update this line when the compiler version changes.
15-
// LANGUAGE: :[[@LINE-5]]:8: error: module compiled with Swift X.Y cannot be imported by the Swift 4.{{.+}} compiler: {{.*}}too-{{old|new}}-language/Library.swiftmodule{{$}}
15+
// LANGUAGE: :[[@LINE-5]]:8: error: module compiled with Swift X.Y cannot be imported by the Swift 5.{{.+}} compiler: {{.*}}too-{{old|new}}-language/Library.swiftmodule{{$}}
1616

1717
// Compiler thinks that the module is empty in all cases.
1818
// CHECK: :[[@LINE+1]]:1: error: module 'Library' has no member named 'foo'

‎test/api-digester/Outputs/stability-stdlib-source.swift.expected

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,100 @@ Protocol StringProtocol has generic signature change from <Self : BidirectionalC
55
/* RawRepresentable Changes */
66

77
/* Removed Decls */
8+
Constructor ClosedRange.init(_:) has been removed (deprecated)
9+
Constructor Range.init(_:) has been removed (deprecated)
810
Constructor String.init(stringInterpolationSegment:) has been removed
11+
Func Collection.distance(from:to:) has been removed (deprecated)
12+
Func Collection.flatMap(_:) has been removed (deprecated)
13+
Func Collection.formIndex(_:offsetBy:) has been removed (deprecated)
14+
Func Collection.formIndex(_:offsetBy:limitedBy:) has been removed (deprecated)
15+
Func Collection.index(_:offsetBy:) has been removed (deprecated)
16+
Func Collection.index(_:offsetBy:limitedBy:) has been removed (deprecated)
917
Func Collection.prefix(through:) has been removed
1018
Func Collection.prefix(upTo:) has been removed
1119
Func Collection.suffix(from:) has been removed
20+
Func LazyCollectionProtocol.flatMap(_:) has been removed (deprecated)
1221
Func Sequence.filter(_:) has been removed
1322
Func Sequence.forEach(_:) has been removed
1423
Func Sequence.map(_:) has been removed
24+
Func String.withMutableCharacters(_:) has been removed (deprecated)
25+
Func Substring.withMutableCharacters(_:) has been removed (deprecated)
26+
Func UnsafeMutablePointer.deallocate(capacity:) has been removed (deprecated)
27+
Func UnsafeMutablePointer.deinitialize() has been removed (deprecated)
28+
Func UnsafeMutablePointer.initialize(from:) has been removed (deprecated)
29+
Func UnsafeMutablePointer.initialize(to:count:) has been removed (deprecated)
30+
Func UnsafeMutableRawBufferPointer.allocate(count:) has been removed (deprecated)
31+
Func UnsafeMutableRawBufferPointer.copyBytes(from:) has been removed (deprecated)
32+
Func UnsafeMutableRawPointer.allocate(bytes:alignedTo:) has been removed (deprecated)
33+
Func UnsafeMutableRawPointer.copyBytes(from:count:) has been removed (deprecated)
34+
Func UnsafeMutableRawPointer.deallocate(bytes:alignedTo:) has been removed (deprecated)
35+
Func UnsafeMutableRawPointer.initializeMemory(as:at:count:to:) has been removed (deprecated)
36+
Func UnsafeMutableRawPointer.initializeMemory(as:from:) has been removed (deprecated)
1537
Func _SequenceWrapper.filter(_:) has been removed
1638
Func _SequenceWrapper.forEach(_:) has been removed
1739
Func _SequenceWrapper.map(_:) has been removed
40+
TypeAlias ArrayLiteralConvertible has been removed (deprecated)
41+
TypeAlias BidirectionalIndexable has been removed (deprecated)
42+
TypeAlias BidirectionalSlice has been removed (deprecated)
43+
TypeAlias BooleanLiteralConvertible has been removed (deprecated)
44+
TypeAlias ClosedRangeIndex has been removed (deprecated)
45+
TypeAlias CustomPlaygroundQuickLookable has been removed (deprecated)
46+
TypeAlias DefaultBidirectionalIndices has been removed (deprecated)
47+
TypeAlias DefaultRandomAccessIndices has been removed (deprecated)
48+
TypeAlias DictionaryLiteralConvertible has been removed (deprecated)
49+
TypeAlias EmptyIterator has been removed (deprecated)
1850
TypeAlias ExpressibleByStringInterpolation has been removed (deprecated)
51+
TypeAlias ExtendedGraphemeClusterLiteralConvertible has been removed (deprecated)
52+
TypeAlias FlattenBidirectionalCollection has been removed (deprecated)
53+
TypeAlias FlattenBidirectionalCollectionIndex has been removed (deprecated)
54+
TypeAlias FlattenCollectionIndex has been removed (deprecated)
55+
TypeAlias FloatLiteralConvertible has been removed (deprecated)
56+
TypeAlias Indexable has been removed (deprecated)
57+
TypeAlias IndexableBase has been removed (deprecated)
58+
TypeAlias IntegerLiteralConvertible has been removed (deprecated)
59+
TypeAlias IteratorOverOne has been removed (deprecated)
60+
TypeAlias JoinedIterator has been removed (deprecated)
61+
TypeAlias LazyBidirectionalCollection has been removed (deprecated)
62+
TypeAlias LazyDropWhileBidirectionalCollection has been removed (deprecated)
63+
TypeAlias LazyDropWhileIndex has been removed (deprecated)
64+
TypeAlias LazyDropWhileIterator has been removed (deprecated)
65+
TypeAlias LazyFilterBidirectionalCollection has been removed (deprecated)
66+
TypeAlias LazyFilterIndex has been removed (deprecated)
67+
TypeAlias LazyFilterIterator has been removed (deprecated)
68+
TypeAlias LazyMapBidirectionalCollection has been removed (deprecated)
69+
TypeAlias LazyMapIterator has been removed (deprecated)
70+
TypeAlias LazyMapRandomAccessCollection has been removed (deprecated)
71+
TypeAlias LazyPrefixWhileBidirectionalCollection has been removed (deprecated)
72+
TypeAlias LazyPrefixWhileIndex has been removed (deprecated)
73+
TypeAlias LazyPrefixWhileIterator has been removed (deprecated)
74+
TypeAlias LazyRandomAccessCollection has been removed (deprecated)
75+
TypeAlias MutableBidirectionalSlice has been removed (deprecated)
76+
TypeAlias MutableIndexable has been removed (deprecated)
77+
TypeAlias MutableRandomAccessSlice has been removed (deprecated)
78+
TypeAlias MutableRangeReplaceableBidirectionalSlice has been removed (deprecated)
79+
TypeAlias MutableRangeReplaceableRandomAccessSlice has been removed (deprecated)
80+
TypeAlias MutableRangeReplaceableSlice has been removed (deprecated)
81+
TypeAlias MutableSlice has been removed (deprecated)
82+
TypeAlias NilLiteralConvertible has been removed (deprecated)
83+
TypeAlias RandomAccessIndexable has been removed (deprecated)
84+
TypeAlias RandomAccessSlice has been removed (deprecated)
85+
TypeAlias RangeReplaceableBidirectionalSlice has been removed (deprecated)
86+
TypeAlias RangeReplaceableIndexable has been removed (deprecated)
87+
TypeAlias RangeReplaceableRandomAccessSlice has been removed (deprecated)
88+
TypeAlias RangeReplaceableSlice has been removed (deprecated)
89+
TypeAlias ReversedIndex has been removed (deprecated)
90+
TypeAlias ReversedRandomAccessCollection has been removed (deprecated)
91+
TypeAlias String.CharacterView has been removed (deprecated)
92+
TypeAlias StringInterpolationConvertible has been removed (deprecated)
93+
TypeAlias StringLiteralConvertible has been removed (deprecated)
94+
TypeAlias Substring.CharacterView has been removed (deprecated)
95+
TypeAlias UnicodeScalarLiteralConvertible has been removed (deprecated)
96+
TypeAlias UnsafeBufferPointerIterator has been removed (deprecated)
97+
TypeAlias UnsafeMutableRawBufferPointerIterator has been removed (deprecated)
98+
TypeAlias UnsafeRawBufferPointerIterator has been removed (deprecated)
99+
TypeAlias Zip2Iterator has been removed (deprecated)
100+
TypeAlias Zip2Sequence.Stream1 has been removed (deprecated)
101+
TypeAlias Zip2Sequence.Stream2 has been removed (deprecated)
19102
Var AnyBidirectionalCollection.first has been removed
20103
Var AnyBidirectionalCollection.last has been removed
21104
Var AnyCollection.first has been removed
@@ -29,6 +112,8 @@ Var LazyCollection.last has been removed
29112
Var LazyMapCollection.first has been removed
30113
Var LazyMapCollection.last has been removed
31114
Var Set.first has been removed
115+
Var String.characters has been removed (deprecated)
116+
Var Substring.characters has been removed (deprecated)
32117

33118
/* Moved Decls */
34119

‎test/stdlib/NewStringAppending.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-run-stdlib-swift-swift3 | %FileCheck %s
1+
// RUN: %target-run-stdlib-swift | %FileCheck %s
22
// REQUIRES: executable_test
33
//
44
// Parts of this test depend on memory allocator specifics. The test

‎utils/build_swift/defaults.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
CMAKE_GENERATOR = 'Ninja'
4141

4242
COMPILER_VENDOR = 'none'
43-
SWIFT_USER_VISIBLE_VERSION = CompilerVersion('4.2')
43+
SWIFT_USER_VISIBLE_VERSION = CompilerVersion('5.0')
4444
CLANG_USER_VISIBLE_VERSION = CompilerVersion('7.0.0')
4545
SWIFT_ANALYZE_CODE_COVERAGE = 'false'
4646

0 commit comments

Comments
 (0)