Skip to content

Commit 18e61e4

Browse files
authored
Merge pull request #1785 from swiftwasm/katei/merge-master-2020-09-20
Merge master 2020-09-20
2 parents 26299c8 + 1f7e12e commit 18e61e4

File tree

395 files changed

+10100
-4662
lines changed

Some content is hidden

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

395 files changed

+10100
-4662
lines changed

Brewfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
brew "cmake"
22
brew "ninja"
3+
brew "sccache"

CHANGELOG.md

Lines changed: 36 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,43 @@ CHANGELOG
44
<details>
55
<summary>Note: This is in reverse chronological order, so newer entries are added to the top.</summary>
66

7-
| Version | Released | Toolchain |
8-
| :------------------------ | :--------- | :---------- |
9-
| [Swift Next](#swift-next) |
10-
| [Swift 5.3](#swift-53) | | |
11-
| [Swift 5.2](#swift-52) | 2020-03-24 | Xcode 11.4 |
12-
| [Swift 5.1](#swift-51) | 2019-09-20 | Xcode 11.0 |
13-
| [Swift 5.0](#swift-50) | 2019-03-25 | Xcode 10.2 |
14-
| [Swift 4.2](#swift-42) | 2018-09-17 | Xcode 10.0 |
15-
| [Swift 4.1](#swift-41) | 2018-03-29 | Xcode 9.3 |
16-
| [Swift 4.0](#swift-40) | 2017-09-19 | Xcode 9.0 |
17-
| [Swift 3.1](#swift-31) | 2017-03-27 | Xcode 8.3 |
18-
| [Swift 3.0](#swift-30) | 2016-09-13 | Xcode 8.0 |
19-
| [Swift 2.2](#swift-22) | 2016-03-21 | Xcode 7.3 |
20-
| [Swift 2.1](#swift-21) | 2015-10-21 | Xcode 7.1 |
21-
| [Swift 2.0](#swift-20) | 2015-09-17 | Xcode 7.0 |
22-
| [Swift 1.2](#swift-12) | 2015-04-08 | Xcode 6.3 |
23-
| [Swift 1.1](#swift-11) | 2014-12-02 | Xcode 6.1.1 |
24-
| [Swift 1.0](#swift-10) | 2014-09-15 | Xcode 6.0 |
7+
| Version | Released | Toolchain |
8+
| :--------------------- | :--------- | :---------- |
9+
| [Swift 5.3](#swift-53) | 2020-09-16 | Xcode 12.0 |
10+
| [Swift 5.2](#swift-52) | 2020-03-24 | Xcode 11.4 |
11+
| [Swift 5.1](#swift-51) | 2019-09-20 | Xcode 11.0 |
12+
| [Swift 5.0](#swift-50) | 2019-03-25 | Xcode 10.2 |
13+
| [Swift 4.2](#swift-42) | 2018-09-17 | Xcode 10.0 |
14+
| [Swift 4.1](#swift-41) | 2018-03-29 | Xcode 9.3 |
15+
| [Swift 4.0](#swift-40) | 2017-09-19 | Xcode 9.0 |
16+
| [Swift 3.1](#swift-31) | 2017-03-27 | Xcode 8.3 |
17+
| [Swift 3.0](#swift-30) | 2016-09-13 | Xcode 8.0 |
18+
| [Swift 2.2](#swift-22) | 2016-03-21 | Xcode 7.3 |
19+
| [Swift 2.1](#swift-21) | 2015-10-21 | Xcode 7.1 |
20+
| [Swift 2.0](#swift-20) | 2015-09-17 | Xcode 7.0 |
21+
| [Swift 1.2](#swift-12) | 2015-04-08 | Xcode 6.3 |
22+
| [Swift 1.1](#swift-11) | 2014-12-02 | Xcode 6.1.1 |
23+
| [Swift 1.0](#swift-10) | 2014-09-15 | Xcode 6.0 |
2524

2625
</details>
2726

2827
Swift Next
2928
----------
3029

30+
* [SE-0284][]:
31+
32+
Functions, subscripts, and initializers may now have more than one variadic parameter, as long as all parameters which follow variadic parameters are labeled. This makes declarations like the following valid:
33+
34+
```swift
35+
func foo(_ a: Int..., b: Double...) { }
36+
37+
struct Bar {
38+
subscript(a: Int..., b b: Int...) -> [Int] { a + b }
39+
40+
init(a: String..., b: Float...) { }
41+
}
42+
```
43+
3144
* [SE-0287][]:
3245

3346
Implicit member expressions now support chains of member accesses, making the following valid:
@@ -66,9 +79,13 @@ Swift Next
6679
let _: Foo? = .bar.anotherFoo.getFoo().optionalFoo?.optionalFoo![]
6780
```
6881

82+
**Add new entries to the top of this section, not here!**
83+
6984
Swift 5.3
7085
---------
7186

87+
### 2020-09-16 (Xcode 12.0)
88+
7289
* [SE-0279][] & [SE-0286][]:
7390

7491
Trailing closure syntax has been extended to allow additional labeled closures to follow the initial unlabeled closure:
@@ -8143,6 +8160,7 @@ Swift 1.0
81438160
[SE-0276]: <https://github.com/apple/swift-evolution/blob/master/proposals/0276-multi-pattern-catch-clauses.md>
81448161
[SE-0279]: <https://github.com/apple/swift-evolution/blob/master/proposals/0279-multiple-trailing-closures.md>
81458162
[SE-0280]: <https://github.com/apple/swift-evolution/blob/master/proposals/0280-enum-cases-as-protocol-witnesses.md>
8163+
[SE-0284]: <https://github.com/apple/swift-evolution/blob/master/proposals/0284-multiple-variadic-parameters.md>
81468164
[SE-0286]: <https://github.com/apple/swift-evolution/blob/master/proposals/0286-forward-scan-trailing-closures.md>
81478165
[SE-0287]: <https://github.com/apple/swift-evolution/blob/master/proposals/0287-implicit-member-chains.md>
81488166

CMakeLists.txt

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -634,22 +634,6 @@ if("${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC" OR "${CMAKE_CXX_SIMULATE_ID}" STREQU
634634
set(SWIFT_COMPILER_IS_MSVC_LIKE TRUE)
635635
endif()
636636

637-
if(NOT SWIFT_COMPILER_IS_MSVC_LIKE)
638-
# CMake's default for CMAKE_CXX_FLAGS_RELEASE is "-O3 -DNDEBUG". Let's avoid "-O3" for consistency
639-
# between Release and RelWithDebInfo. Dropping -DNDEBUG from this setting is blocked by triggering
640-
# a test failure of Swift-Unit :: Syntax/./SwiftSyntaxTests/TypeSyntaxTests.MetatypeTypeWithAPIs
641-
# because unit tests don't currently explicitly set -DNDEBUG/-UNDEBUG.
642-
set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG")
643-
644-
_compute_lto_flag("${SWIFT_TOOLS_ENABLE_LTO}" _lto_flag_out)
645-
if(_lto_flag_out)
646-
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_RELEASE} -gline-tables-only")
647-
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -gline-tables-only")
648-
endif()
649-
else()
650-
651-
endif()
652-
653637
#
654638
# Configure SDKs.
655639
#

0 commit comments

Comments
 (0)