Update to 4.2.1 including patch for Clang 7.0

3 files changed, 65 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2670b71b91d3..53d19997b513 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Tue Sep 25 00:52:58 UTC 2018
 pkgbase = swift-language
 	pkgdesc = The Swift programming language and debugger
-	pkgver = 4.2
+	pkgver = 4.2.1
 	pkgrel = 1
 	url = http://swift.org/
 	arch = i686
@@ -27,34 +25,36 @@ pkgbase = swift-language
 	depends = sqlite
 	depends = ncurses
 	depends = libblocksruntime
-	source = swift-4.2-RELEASE.tar.gz::https://github.com/apple/swift/archive/swift-4.2-RELEASE.tar.gz
-	source = swift-llvm-4.2-RELEASE.tar.gz::https://github.com/apple/swift-llvm/archive/swift-4.2-RELEASE.tar.gz
-	source = swift-clang-4.2-RELEASE.tar.gz::https://github.com/apple/swift-clang/archive/swift-4.2-RELEASE.tar.gz
-	source = swift-lldb-4.2-RELEASE.tar.gz::https://github.com/apple/swift-lldb/archive/swift-4.2-RELEASE.tar.gz
-	source = swift-cmark-4.2-RELEASE.tar.gz::https://github.com/apple/swift-cmark/archive/swift-4.2-RELEASE.tar.gz
-	source = swift-llbuild-4.2-RELEASE.tar.gz::https://github.com/apple/swift-llbuild/archive/swift-4.2-RELEASE.tar.gz
-	source = swift-package-manager-4.2-RELEASE.tar.gz::https://github.com/apple/swift-package-manager/archive/swift-4.2-RELEASE.tar.gz
-	source = swift-corelibs-xctest-4.2-RELEASE.tar.gz::https://github.com/apple/swift-corelibs-xctest/archive/swift-4.2-RELEASE.tar.gz
-	source = swift-corelibs-foundation-4.2-RELEASE.tar.gz::https://github.com/apple/swift-corelibs-foundation/archive/swift-4.2-RELEASE.tar.gz
-	source = swift-corelibs-libdispatch-4.2-RELEASE.tar.gz::https://github.com/apple/swift-corelibs-libdispatch/archive/swift-4.2-RELEASE.tar.gz
-	source = swift-compiler-rt-4.2-RELEASE.tar.gz::https://github.com/apple/swift-compiler-rt/archive/swift-4.2-RELEASE.tar.gz
-	source = swift-integration-tests-4.2-RELEASE.tar.gz::https://github.com/apple/swift-integration-tests/archive/swift-4.2-RELEASE.tar.gz
+	source = swift-4.2.1-RELEASE.tar.gz::https://github.com/apple/swift/archive/swift-4.2.1-RELEASE.tar.gz
+	source = swift-llvm-4.2.1-RELEASE.tar.gz::https://github.com/apple/swift-llvm/archive/swift-4.2.1-RELEASE.tar.gz
+	source = swift-clang-4.2.1-RELEASE.tar.gz::https://github.com/apple/swift-clang/archive/swift-4.2.1-RELEASE.tar.gz
+	source = swift-lldb-4.2.1-RELEASE.tar.gz::https://github.com/apple/swift-lldb/archive/swift-4.2.1-RELEASE.tar.gz
+	source = swift-cmark-4.2.1-RELEASE.tar.gz::https://github.com/apple/swift-cmark/archive/swift-4.2.1-RELEASE.tar.gz
+	source = swift-llbuild-4.2.1-RELEASE.tar.gz::https://github.com/apple/swift-llbuild/archive/swift-4.2.1-RELEASE.tar.gz
+	source = swift-package-manager-4.2.1-RELEASE.tar.gz::https://github.com/apple/swift-package-manager/archive/swift-4.2.1-RELEASE.tar.gz
+	source = swift-corelibs-xctest-4.2.1-RELEASE.tar.gz::https://github.com/apple/swift-corelibs-xctest/archive/swift-4.2.1-RELEASE.tar.gz
+	source = swift-corelibs-foundation-4.2.1-RELEASE.tar.gz::https://github.com/apple/swift-corelibs-foundation/archive/swift-4.2.1-RELEASE.tar.gz
+	source = swift-corelibs-libdispatch-4.2.1-RELEASE.tar.gz::https://github.com/apple/swift-corelibs-libdispatch/archive/swift-4.2.1-RELEASE.tar.gz
+	source = swift-compiler-rt-4.2.1-RELEASE.tar.gz::https://github.com/apple/swift-compiler-rt/archive/swift-4.2.1-RELEASE.tar.gz
+	source = swift-integration-tests-4.2.1-RELEASE.tar.gz::https://github.com/apple/swift-integration-tests/archive/swift-4.2.1-RELEASE.tar.gz
 	source = 0001-sanitizer-Use-pre-computed-size-of-struct-ustat.patch
 	source = glibc-includes.patch
-	sha256sums = c3460029a32826a3c2385f53efc5f8e54f61152fb14951ad2c8a9825d14c8cda
-	sha256sums = 24034e5bed1c93520a983105fa6be537de27168ba53bd49abfb5780feb80c81d
-	sha256sums = c10b9a0a2f93d8c1c213dfdd26333a98fcd2090fc8fa9308dc98b86690dde659
-	sha256sums = a81986e08ee275741754ebe1c52b9ff186a558ec41400a18d45578b24ba4a262
-	sha256sums = 4ba2a83e065728e47ee3859de90f567cefa46be400e870b2d3a3addf04471a5d
-	sha256sums = c19ffe8464530d3fc78e9bf2b07ebefa6b266b994200654ed2da04cbc5a070b6
-	sha256sums = 9b3dd8e22fe97645bdf3050fc6976991e862380febf28eb24955302f905e6e8a
-	sha256sums = 3d2a8ce08302365e1fe9086d3a778b3a238e027d9c96b17163b8e3fc2d003be0
-	sha256sums = f3f6368d5e85fe47a148eb28e675f522e3064c217153ddff1aa82b97696202ef
-	sha256sums = 3ffbe7b13482d98a073b1de61b7a6b9b04eb6d8f8c841c61c1ed4de85c63403d
-	sha256sums = 489438f3405835d698b46b35b1210c9312d63c805f888c7b8cf66f1e1d687157
-	sha256sums = 0dc8c77a7ee285e18886168eb8a7973f7097bf742f3213a2261bbd0b754fa9e7
+	source = clang7-compat.patch
+	sha256sums = 1e26cf541f7b10b96344fb1c4500ec52ced525cdf7b6bb77425c768cef0b2c5b
+	sha256sums = bcd85a91824dd166fe852ddb7e58c509f52316011c3079010ad59b017a61ad14
+	sha256sums = cbf22fe2da2e2a19010f6e109ab3f80a8af811d9416c29d031362c02a0e69a66
+	sha256sums = 9d8666240e1774455bf6dc3f817205afb838bea3a8d69e7e3bce66e6415edff5
+	sha256sums = 0e9f097c26703693a5543667716c2cac7a8847806e850db740ae9f90eaf93793
+	sha256sums = 07a02b4314050a66fad460b76379988d794dac1452a56fcf5073d318458fed6e
+	sha256sums = e1a50dc3d264bdb8d0447c264e8c164403e84b0831ffd53d87f15a742bda7fa9
+	sha256sums = 077bdf14e01b38c9ab980a63d2d3e796663d161bb6191ca1cda2d858bc8ae40f
+	sha256sums = 680fdfe9add3427931e7471f1a9e774d13cf1b161446aa738c30d37b64ab52a7
+	sha256sums = 65b9dd497178959e8f4a1e3157c9ac701d1d6cf8d754f383e17eec354b1c3c31
+	sha256sums = 6b14737d2d57f3287a5c2d80d8d8ae917d8f7bbe4d78cc6d66a80e68d55cd00f
+	sha256sums = 5d1b77e03a70abdf0907c5567fcd9ea33e95ce0c00fef3cdcff8b3eb4b9db4a6
 	sha256sums = 5cd08c3a83c71e552fa2fd9ec8b076fbd25ba5450b9ecd59a0c877a9c9407b34
 	sha256sums = 6a94de9adbdc4182b297e0011a68c9387fd25864dcb4386654218c8c530032c2
+	sha256sums = 9855ce69d2358c8fc76237620f7e18bfbc82459ad72bdf995b8225fa4ba882a2
 
 pkgname = swift
 	pkgdesc = The Swift programming language compiler and tools
diff --git a/PKGBUILD b/PKGBUILD
index 4c9a6ee8f4d7..0f57fab32bb0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgbase=swift-language
 pkgname=(swift swift-lldb)
-_swiftver=4.2-RELEASE
+_swiftver=4.2.1-RELEASE
 pkgver=${_swiftver//-RELEASE/}
 pkgrel=1
 pkgdesc="The Swift programming language and debugger"
@@ -29,21 +29,23 @@ source=(
     "swift-integration-tests-${_swiftver}.tar.gz::https://github.com/apple/swift-integration-tests/archive/swift-${_swiftver}.tar.gz"
     "0001-sanitizer-Use-pre-computed-size-of-struct-ustat.patch"
     "glibc-includes.patch"
+    "clang7-compat.patch"
 )
-sha256sums=('c3460029a32826a3c2385f53efc5f8e54f61152fb14951ad2c8a9825d14c8cda'
-            '24034e5bed1c93520a983105fa6be537de27168ba53bd49abfb5780feb80c81d'
-            'c10b9a0a2f93d8c1c213dfdd26333a98fcd2090fc8fa9308dc98b86690dde659'
-            'a81986e08ee275741754ebe1c52b9ff186a558ec41400a18d45578b24ba4a262'
-            '4ba2a83e065728e47ee3859de90f567cefa46be400e870b2d3a3addf04471a5d'
-            'c19ffe8464530d3fc78e9bf2b07ebefa6b266b994200654ed2da04cbc5a070b6'
-            '9b3dd8e22fe97645bdf3050fc6976991e862380febf28eb24955302f905e6e8a'
-            '3d2a8ce08302365e1fe9086d3a778b3a238e027d9c96b17163b8e3fc2d003be0'
-            'f3f6368d5e85fe47a148eb28e675f522e3064c217153ddff1aa82b97696202ef'
-            '3ffbe7b13482d98a073b1de61b7a6b9b04eb6d8f8c841c61c1ed4de85c63403d'
-            '489438f3405835d698b46b35b1210c9312d63c805f888c7b8cf66f1e1d687157'
-            '0dc8c77a7ee285e18886168eb8a7973f7097bf742f3213a2261bbd0b754fa9e7'
+sha256sums=('1e26cf541f7b10b96344fb1c4500ec52ced525cdf7b6bb77425c768cef0b2c5b'
+            'bcd85a91824dd166fe852ddb7e58c509f52316011c3079010ad59b017a61ad14'
+            'cbf22fe2da2e2a19010f6e109ab3f80a8af811d9416c29d031362c02a0e69a66'
+            '9d8666240e1774455bf6dc3f817205afb838bea3a8d69e7e3bce66e6415edff5'
+            '0e9f097c26703693a5543667716c2cac7a8847806e850db740ae9f90eaf93793'
+            '07a02b4314050a66fad460b76379988d794dac1452a56fcf5073d318458fed6e'
+            'e1a50dc3d264bdb8d0447c264e8c164403e84b0831ffd53d87f15a742bda7fa9'
+            '077bdf14e01b38c9ab980a63d2d3e796663d161bb6191ca1cda2d858bc8ae40f'
+            '680fdfe9add3427931e7471f1a9e774d13cf1b161446aa738c30d37b64ab52a7'
+            '65b9dd497178959e8f4a1e3157c9ac701d1d6cf8d754f383e17eec354b1c3c31'
+            '6b14737d2d57f3287a5c2d80d8d8ae917d8f7bbe4d78cc6d66a80e68d55cd00f'
+            '5d1b77e03a70abdf0907c5567fcd9ea33e95ce0c00fef3cdcff8b3eb4b9db4a6'
             '5cd08c3a83c71e552fa2fd9ec8b076fbd25ba5450b9ecd59a0c877a9c9407b34'
-            '6a94de9adbdc4182b297e0011a68c9387fd25864dcb4386654218c8c530032c2')
+            '6a94de9adbdc4182b297e0011a68c9387fd25864dcb4386654218c8c530032c2'
+            '9855ce69d2358c8fc76237620f7e18bfbc82459ad72bdf995b8225fa4ba882a2')
 
 prepare() {
     # Use python2 where appropriate
@@ -78,6 +80,9 @@ prepare() {
     # Fix wrong glibc include paths in glibc module map
     ( cd swift && patch -p1 -i "$srcdir/glibc-includes.patch" )
 
+    # Fix for clang 7+
+    ( cd swift && patch -p1 -i "$srcdir/clang7-compat.patch" )
+
     # Backport compiler-rt SVN r333213
     ( cd compiler-rt && patch -p1 -i "$srcdir/0001-sanitizer-Use-pre-computed-size-of-struct-ustat.patch" )
 }
diff --git a/clang7-compat.patch b/clang7-compat.patch
new file mode 100644
index 000000000000..c4b91cb3988b
--- /dev/null
+++ b/clang7-compat.patch
@@ -0,0 +1,19 @@
+diff -rupN a/include/swift/Reflection/TypeRef.h b/include/swift/Reflection/TypeRef.h
+--- a/include/swift/Reflection/TypeRef.h	2018-11-06 08:47:44.273606680 -0800
++++ b/include/swift/Reflection/TypeRef.h	2018-11-06 08:48:57.184403605 -0800
+@@ -48,12 +48,12 @@ enum class TypeRefKind {
+ 
+ #define FIND_OR_CREATE_TYPEREF(Allocator, TypeRefTy, ...)                      \
+   auto ID = Profile(__VA_ARGS__);                                              \
+-  const auto Entry = Allocator.DEPENDENT_TEMPLATE TypeRefTy##s.find(ID);       \
+-  if (Entry != Allocator.DEPENDENT_TEMPLATE TypeRefTy##s.end())                \
++  const auto Entry = Allocator.TypeRefTy##s.find(ID);       \
++  if (Entry != Allocator.TypeRefTy##s.end())                \
+     return Entry->second;                                                      \
+   const auto TR =                                                              \
+       Allocator.DEPENDENT_TEMPLATE makeTypeRef<TypeRefTy>(__VA_ARGS__);        \
+-  Allocator.DEPENDENT_TEMPLATE TypeRefTy##s.insert({ID, TR});                  \
++  Allocator.TypeRefTy##s.insert({ID, TR});                  \
+   return TR;
+ 
+ /// An identifier containing the unique bit pattern made up of all of the