Skip to content

Commit c19976f

Browse files
---
yaml --- r: 341214 b: refs/heads/rxwei-patch-1 c: 2ef1848 h: refs/heads/master
1 parent 8885165 commit c19976f

File tree

1,903 files changed

+60611
-155058
lines changed

Some content is hidden

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

1,903 files changed

+60611
-155058
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1015,7 +1015,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-08-18-a: b10b1fce14385faa6d44f6b933e95
10151015
refs/heads/rdar-43033749-fix-batch-mode-no-diags-swift-5.0-branch: a14e64eaad30de89f0f5f0b2a782eed7ecdcb255
10161016
refs/heads/revert-19006-error-bridging-integer-type: 8a9065a3696535305ea53fe9b71f91cbe6702019
10171017
refs/heads/revert-19050-revert-19006-error-bridging-integer-type: ecf752d54b05dd0a20f510f0bfa54a3fec3bcaca
1018-
refs/heads/rxwei-patch-1: 761595e7ade243b617155af6374cb8fbaa7a74d0
1018+
refs/heads/rxwei-patch-1: 2ef18488d65486ddaec924baeac97bb10e9f2dfb
10191019
refs/heads/shahmishal-patch-1: e58ec0f7488258d42bef51bc3e6d7b3dc74d7b2a
10201020
refs/heads/typelist-existential: 4046359efd541fb5c72d69a92eefc0a784df8f5e
10211021
refs/tags/swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-20-a: 4319ba09e4fb8650ee86061075c74a016b6baab9

branches/rxwei-patch-1/.mailmap

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,12 @@ Daniel Duan <[email protected]> <[email protected]>
2929
Dante Broggi <[email protected]>
3030
3131
32+
3233
3334
3435
35-
36-
David Rönnqvist <[email protected]>
36+
37+
David Rönnqvist <[email protected]>
3738
3839
3940
@@ -42,8 +43,10 @@ Davide Italiano <[email protected]> <[email protected]>
4243
4344
4445
46+
4547
4648
Erik Eckstein <[email protected]>
49+
4750
4851
Ewa Matejska <[email protected]>
4952
@@ -127,13 +130,15 @@ Ross Bayer <[email protected]>
127130
128131
129132
133+
130134
131135
Stephen Canon <[email protected]>
132136
133137
Sukolsak Sakshuwong <[email protected]>
134138
135139
136140
141+
137142
138143
139144

branches/rxwei-patch-1/CHANGELOG.md

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -26,28 +26,6 @@ CHANGELOG
2626
Swift Next
2727
----------
2828

29-
* [SR-8974][]:
30-
31-
Duplicate tuple element labels are no longer allowed, because it leads
32-
to incorrect behavior. For example:
33-
34-
```
35-
let dupLabels: (foo: Int, foo: Int) = (foo: 1, foo: 2)
36-
37-
enum Foo { case bar(x: Int, x: Int) }
38-
let f: Foo = .bar(x: 0, x: 1)
39-
```
40-
41-
will now be diagnosed as an error.
42-
43-
Note: You can still use duplicate labels when declaring functions and
44-
subscripts, as long as the internal labels are different. For example:
45-
46-
```
47-
func foo(bar x: Int, bar y: Int) {}
48-
subscript(a x: Int, a y: Int) -> Int {}
49-
```
50-
5129
* [SR-6118][]:
5230

5331
Subscripts can now declare default arguments:
@@ -219,9 +197,7 @@ Swift 5.1
219197
}
220198
```
221199

222-
* [SR-9827][]:
223-
224-
`weak` and `unowned` stored properties no longer inhibit the
200+
* `weak` and `unowned` stored properties no longer inhibit the
225201
automatic synthesis of `Equatable` or `Hashable` conformance.
226202

227203
* [SR-2688][]:
@@ -7718,6 +7694,4 @@ Swift 1.0
77187694
[SR-7799]: <https://bugs.swift.org/browse/SR-7799>
77197695
[SR-8109]: <https://bugs.swift.org/browse/SR-8109>
77207696
[SR-8546]: <https://bugs.swift.org/browse/SR-8546>
7721-
[SR-8974]: <https://bugs.swift.org/browse/SR-8974>
77227697
[SR-9043]: <https://bugs.swift.org/browse/SR-9043>
7723-
[SR-9827]: <https://bugs.swift.org/browse/SR-9827>

branches/rxwei-patch-1/CMakeLists.txt

Lines changed: 21 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -117,11 +117,13 @@ endif()
117117

118118
set(SWIFT_ANALYZE_CODE_COVERAGE FALSE CACHE STRING
119119
"Build Swift with code coverage instrumenting enabled [FALSE, NOT-MERGED, MERGED]")
120+
set_property(CACHE SWIFT_ANALYZE_CODE_COVERAGE PROPERTY
121+
STRINGS FALSE "NOT-MERGED" "MERGED")
120122

121123
# SWIFT_VERSION is deliberately /not/ cached so that an existing build directory
122124
# can be reused when a new version of Swift comes out (assuming the user hasn't
123125
# manually set it as part of their own CMake configuration).
124-
set(SWIFT_VERSION "5.1")
126+
set(SWIFT_VERSION "5.0")
125127

126128
set(SWIFT_VENDOR "" CACHE STRING
127129
"The vendor name of the Swift compiler")
@@ -169,20 +171,8 @@ endif()
169171

170172
set(SWIFT_STDLIB_BUILD_TYPE "${CMAKE_BUILD_TYPE}" CACHE STRING
171173
"Build type for the Swift standard library and SDK overlays [Debug, RelWithDebInfo, Release, MinSizeRel]")
172-
# Allow the user to specify the standard library CMAKE_MSVC_RUNTIME_LIBRARY
173-
# value. The following values are valid:
174-
# - MultiThreaded (/MT)
175-
# - MultiThreadedDebug (/MTd)
176-
# - MultiThreadedDLL (/MD)
177-
# - MultiThreadedDebugDLL (/MDd)
178-
if(CMAKE_BUILD_TYPE STREQUAL Debug)
179-
set(SWIFT_STDLIB_MSVC_RUNTIME_LIBRARY_default MultiThreadedDebugDLL)
180-
else()
181-
set(SWIFT_STDLIB_MSVC_RUNTIME_LIBRARY_default MultiThreadedDLL)
182-
endif()
183-
set(SWIFT_STDLIB_MSVC_RUNTIME_LIBRARY
184-
${SWIFT_STDLIB_MSVC_RUNTIME_LIBRARY_default}
185-
CACHE STRING "MSVC Runtime Library for the standard library")
174+
set_property(CACHE SWIFT_STDLIB_BUILD_TYPE PROPERTY
175+
STRINGS "Debug" "RelWithDebInfo" "Release" "MinSizeRel")
186176

187177
is_build_type_optimized("${SWIFT_STDLIB_BUILD_TYPE}" swift_optimized)
188178
if(swift_optimized)
@@ -223,17 +213,6 @@ option(SWIFT_STDLIB_ENABLE_SIB_TARGETS
223213
"Should we generate sib targets for the stdlib or not?"
224214
FALSE)
225215

226-
227-
set(SWIFT_DARWIN_SUPPORTED_ARCHS "" CACHE STRING
228-
"Semicolon-separated list of architectures to configure on Darwin platforms. \
229-
If left empty all default architectures are configured.")
230-
231-
set(SWIFT_DARWIN_MODULE_ARCHS "" CACHE STRING
232-
"Semicolon-separated list of architectures to configure Swift module-only \
233-
targets on Darwin platforms. These targets are in addition to the full \
234-
library targets.")
235-
236-
237216
#
238217
# User-configurable Android specific options.
239218
#
@@ -283,15 +262,9 @@ option(SWIFT_RUNTIME_CRASH_REPORTER_CLIENT
283262
set(SWIFT_DARWIN_XCRUN_TOOLCHAIN "XcodeDefault" CACHE STRING
284263
"The name of the toolchain to pass to 'xcrun'")
285264

286-
set(SWIFT_DARWIN_STDLIB_INSTALL_NAME_DIR "/usr/lib/swift" CACHE STRING
265+
set(SWIFT_DARWIN_STDLIB_INSTALL_NAME_DIR "@rpath" CACHE STRING
287266
"The directory of the install_name for standard library dylibs")
288267

289-
# We don't want to use the same install_name_dir as the standard library which
290-
# will be installed in /usr/lib/swift. These private libraries should continue
291-
# to use @rpath for now.
292-
set(SWIFT_DARWIN_STDLIB_PRIVATE_INSTALL_NAME_DIR "@rpath" CACHE STRING
293-
"The directory of the install_name for the private standard library dylibs")
294-
295268
set(SWIFT_DARWIN_DEPLOYMENT_VERSION_OSX "10.9" CACHE STRING
296269
"Minimum deployment target version for OS X")
297270

@@ -621,9 +594,9 @@ endif()
621594
if(SWIFT_HOST_VARIANT_ARCH)
622595
set(SWIFT_HOST_VARIANT_ARCH_default "${SWIFT_HOST_VARIANT_ARCH}")
623596
else()
624-
if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|AMD64")
597+
if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
625598
set(SWIFT_HOST_VARIANT_ARCH_default "x86_64")
626-
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|ARM64")
599+
elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "aarch64")
627600
set(SWIFT_HOST_VARIANT_ARCH_default "aarch64")
628601
elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "ppc64")
629602
set(SWIFT_HOST_VARIANT_ARCH_default "powerpc64")
@@ -636,6 +609,8 @@ else()
636609
set(SWIFT_HOST_VARIANT_ARCH_default "armv6")
637610
elseif("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "armv7l|armv7-a")
638611
set(SWIFT_HOST_VARIANT_ARCH_default "armv7")
612+
elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "AMD64")
613+
set(SWIFT_HOST_VARIANT_ARCH_default "x86_64")
639614
elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "IA64")
640615
set(SWIFT_HOST_VARIANT_ARCH_default "itanium")
641616
elseif("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "(x86|i686)")
@@ -843,18 +818,14 @@ if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin" AND NOT CMAKE_CROSSCOMPILING)
843818
set(CMAKE_OSX_DEPLOYMENT_TARGET "")
844819
endif()
845820

846-
if(SWIFT_INCLUDE_TOOLS)
847-
message(STATUS "Building host Swift tools for ${SWIFT_HOST_VARIANT_SDK} ${SWIFT_HOST_VARIANT_ARCH}")
848-
message(STATUS " Build type: ${CMAKE_BUILD_TYPE}")
849-
message(STATUS " Assertions: ${LLVM_ENABLE_ASSERTIONS}")
850-
message(STATUS " LTO: ${SWIFT_TOOLS_ENABLE_LTO}")
851-
message(STATUS "")
852-
else()
853-
message(STATUS "Not building host Swift tools")
854-
message(STATUS "")
855-
endif()
821+
message(STATUS "Building host Swift tools for ${SWIFT_HOST_VARIANT_SDK} ${SWIFT_HOST_VARIANT_ARCH}")
822+
message(STATUS " Build type: ${CMAKE_BUILD_TYPE}")
823+
message(STATUS " Assertions: ${LLVM_ENABLE_ASSERTIONS}")
824+
message(STATUS " LTO: ${SWIFT_TOOLS_ENABLE_LTO}")
825+
message(STATUS "")
826+
827+
if (SWIFT_BUILD_STDLIB OR SWIFT_BUILD_SDK_OVERLAY)
856828

857-
if(SWIFT_BUILD_STDLIB OR SWIFT_BUILD_SDK_OVERLAY)
858829
message(STATUS "Building Swift standard library and overlays for SDKs: ${SWIFT_SDKS}")
859830
message(STATUS " Build type: ${SWIFT_STDLIB_BUILD_TYPE}")
860831
message(STATUS " Assertions: ${SWIFT_STDLIB_ASSERTIONS}")
@@ -863,9 +834,12 @@ if(SWIFT_BUILD_STDLIB OR SWIFT_BUILD_SDK_OVERLAY)
863834
message(STATUS "Building Swift runtime with:")
864835
message(STATUS " Leak Detection Checker Entrypoints: ${SWIFT_RUNTIME_ENABLE_LEAK_CHECKER}")
865836
message(STATUS "")
837+
866838
else()
839+
867840
message(STATUS "Not building Swift standard library, SDK overlays, and runtime")
868841
message(STATUS "")
842+
869843
endif()
870844

871845
#
@@ -1075,18 +1049,7 @@ endif()
10751049
# created. This then will cause SwiftSyntax to fail to build.
10761050
#
10771051
# https://bugs.swift.org/browse/SR-5975
1078-
if(SWIFT_BUILD_STDLIB)
1079-
add_subdirectory(stdlib)
1080-
else()
1081-
add_subdirectory(stdlib/public/legacy_layouts)
1082-
1083-
# Some tools (e.g. swift-reflection-dump) rely on a host swiftReflection, so
1084-
# ensure we build that when building tools.
1085-
if(SWIFT_INCLUDE_TOOLS)
1086-
add_subdirectory(stdlib/public/Reflection)
1087-
add_subdirectory(stdlib/public/SwiftShims)
1088-
endif()
1089-
endif()
1052+
add_subdirectory(stdlib)
10901053

10911054
if(SWIFT_INCLUDE_APINOTES)
10921055
add_subdirectory(apinotes)

branches/rxwei-patch-1/README.md

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
|**[macOS 10.13 (TensorFlow)](https://github.com/apple/swift-community-hosted-continuous-integration/blob/master/nodes/x86_64_macos_high_sierra_tensorflow.json)** | x86_64 |[![Build Status](https://ci-external.swift.org/job/oss-swift-RA-macOS-tensorflow/lastCompletedBuild/badge/icon)](https://ci-external.swift.org/job/oss-swift-RA-macOS-tensorflow)|
2626
|**[Ubuntu 16.04 (TensorFlow with GPU)](https://github.com/apple/swift-community-hosted-continuous-integration/blob/master/nodes/x86_64_ubuntu_16_04_tensorflow_gpu.json)** | x86_64 |[![Build Status](https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-16.04-tensorflow-gpu/lastCompletedBuild/badge/icon)](https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-16.04-tensorflow-gpu)|
2727
|**[Debian 9.5](https://github.com/apple/swift-community-hosted-continuous-integration/blob/master/nodes/x86_64_debian_9.5.json)** | x86_64 | [![Build Status](https://ci-external.swift.org/job/oss-swift-RA-linux-debian-9_5/lastCompletedBuild/badge/icon)](https://ci-external.swift.org/job/oss-swift-RA-linux-debian-9_5)|
28-
|**[Windows 2019](https://github.com/apple/swift-community-hosted-continuous-integration/blob/master/nodes/x86_64_windows_2019.json)** | x86_64 | [![Build Status](https://ci-external.swift.org/job/oss-swift-windows-x86_64/lastCompletedBuild/badge/icon)](https://ci-external.swift.org/job/oss-swift-windows-x86_64)|
2928

3029

3130
## Welcome to Swift
@@ -76,7 +75,7 @@ Please make sure you use Python 2.x. Python 3.x is not supported currently.
7675

7776
#### macOS
7877

79-
To build for macOS, you need [Xcode 11 beta](https://developer.apple.com/xcode/downloads/).
78+
To build for macOS, you need [Xcode 10.2 beta](https://developer.apple.com/xcode/downloads/).
8079
The required version of Xcode changes frequently, and is often a beta release.
8180
Check this document or the host information on <https://ci.swift.org> for the
8281
current required version.
@@ -98,7 +97,7 @@ Instructions for installing CMake and Ninja directly can be found [below](#build
9897

9998
For Ubuntu, you'll need the following development dependencies:
10099

101-
sudo apt-get install git cmake ninja-build clang python uuid-dev libicu-dev icu-devtools libedit-dev libxml2-dev libsqlite3-dev swig libpython-dev libncurses5-dev pkg-config libcurl4-openssl-dev systemtap-sdt-dev tzdata rsync
100+
sudo apt-get install git cmake ninja-build clang python uuid-dev libicu-dev icu-devtools libbsd-dev libedit-dev libxml2-dev libsqlite3-dev swig libpython-dev libncurses5-dev pkg-config libblocksruntime-dev libcurl4-openssl-dev systemtap-sdt-dev tzdata rsync
102101

103102
**Note:** LLDB currently requires at least `swig-1.3.40` but will successfully build
104103
with version 2 shipped with Ubuntu.
@@ -141,26 +140,26 @@ more environments.
141140

142141
To build using Ninja, run:
143142

144-
swift/utils/build-script --release-debuginfo
143+
utils/build-script --release-debuginfo
145144

146145
When developing Swift, it helps to build what you're working on in a debug
147146
configuration while building the rest of the project with optimizations. Below
148147
are some examples of using debug variants:
149148

150-
swift/utils/build-script --release-debuginfo --debug-swift # Swift frontend built in debug
151-
swift/utils/build-script --release-debuginfo --debug-swift-stdlib # Standard library built in debug
152-
swift/utils/build-script --release-debuginfo --debug-swift --force-optimized-typechecker # Swift frontend sans type checker built in debug
149+
utils/build-script --release-debuginfo --debug-swift # Swift frontend built in debug
150+
utils/build-script --release-debuginfo --debug-swift-stdlib # Standard library built in debug
151+
utils/build-script --release-debuginfo --debug-swift --force-optimized-typechecker # Swift frontend sans type checker built in debug
153152

154153
Limiting the amount of debug code in the compiler has a very large impact on
155154
Swift compile times, and in turn the test execution time. If you want to build
156155
the entire project in debug, you can run:
157156

158-
swift/utils/build-script --debug
157+
utils/build-script --debug
159158

160159
For documentation of all available arguments, as well as additional usage
161160
information, see the inline help:
162161

163-
swift/utils/build-script -h
162+
utils/build-script -h
164163

165164
#### Xcode
166165

@@ -223,7 +222,7 @@ script is used by swift.org's CI to produce snapshots and can allow for one to
223222
locally reproduce such builds for development or distribution purposes. E.x.:
224223

225224
```
226-
$ ./swift/utils/build-toolchain $BUNDLE_PREFIX
225+
$ ./utils/build-toolchain $BUNDLE_PREFIX
227226
```
228227

229228
where ``$BUNDLE_PREFIX`` is a string that will be prepended to the build
Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
Name: Accelerate
2+
Enumerators:
3+
- Name: BNNSDataTypeFloatBit
4+
Availability: nonswift
5+
- Name: BNNSDataTypeIntBit
6+
Availability: nonswift
7+
- Name: BNNSDataTypeUIntBit
8+
Availability: nonswift
9+
- Name: BNNSDataTypeIndexedBit
10+
Availability: nonswift
11+
- Name: BNNSDataTypeFloat16
12+
SwiftPrivate: true
13+
- Name: BNNSDataTypeFloat32
14+
SwiftPrivate: true
15+
- Name: BNNSDataTypeInt8
16+
SwiftPrivate: true
17+
- Name: BNNSDataTypeInt16
18+
SwiftPrivate: true
19+
- Name: BNNSDataTypeInt32
20+
SwiftPrivate: true
21+
- Name: BNNSDataTypeUInt8
22+
SwiftPrivate: true
23+
- Name: BNNSDataTypeUInt16
24+
SwiftPrivate: true
25+
- Name: BNNSDataTypeUInt32
26+
SwiftPrivate: true
27+
- Name: BNNSDataTypeIndexed8
28+
SwiftPrivate: true
29+
30+
- Name: BNNSPoolingFunctionMax
31+
SwiftPrivate: true
32+
- Name: BNNSPoolingFunctionAverage
33+
SwiftPrivate: true
34+
35+
- Name: BNNSActivationFunctionIdentity
36+
SwiftPrivate: true
37+
- Name: BNNSActivationFunctionRectifiedLinear
38+
SwiftPrivate: true
39+
- Name: BNNSActivationFunctionLeakyRectifiedLinear
40+
SwiftPrivate: true
41+
- Name: BNNSActivationFunctionSigmoid
42+
SwiftPrivate: true
43+
- Name: BNNSActivationFunctionTanh
44+
SwiftPrivate: true
45+
- Name: BNNSActivationFunctionScaledTanh
46+
SwiftPrivate: true
47+
- Name: BNNSActivationFunctionAbs
48+
SwiftPrivate: true
49+
- Name: BNNSActivationFunctionLinear
50+
SwiftPrivate: true
51+
- Name: BNNSActivationFunctionClamp
52+
SwiftPrivate: true
53+
- Name: BNNSActivationFunctionIntegerLinearSaturate
54+
SwiftPrivate: true
55+
- Name: BNNSActivationFunctionIntegerLinearSaturatePerChannel
56+
SwiftPrivate: true
57+
- Name: BNNSActivationFunctionSoftmax
58+
SwiftPrivate: true
59+
60+
- Name: BNNSFlagsUseClientPtr
61+
SwiftPrivate: true

branches/rxwei-patch-1/apinotes/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
set(sources
2+
Accelerate.apinotes
23
Dispatch.apinotes
4+
ScriptingBridge.apinotes
35
os.apinotes
46
)
57

@@ -21,7 +23,7 @@ add_custom_command(
2123
COMMAND
2224
"${CMAKE_COMMAND}" "-E" "copy_if_different" ${inputs} "${output_dir}/")
2325

24-
add_custom_target("copy_apinotes" ALL
26+
add_custom_target("copy_apinotes"
2527
DEPENDS "${outputs}" "${output_dir}"
2628
COMMENT "Copying API notes to ${output_dir}"
2729
SOURCES "${sources}")

0 commit comments

Comments
 (0)