Merge pull request #3962 from swiftwasm/release/5.5

Author: MaxDesiatov

CMakeLists.txt

@@ -148,7 +148,7 @@ set(SWIFT_ANALYZE_CODE_COVERAGE FALSE CACHE STRING
 # SWIFT_VERSION is deliberately /not/ cached so that an existing build directory
 # can be reused when a new version of Swift comes out (assuming the user hasn't
 # manually set it as part of their own CMake configuration).
-set(SWIFT_VERSION "5.5")
+set(SWIFT_VERSION "5.5.2")
 
 set(SWIFT_VENDOR "" CACHE STRING
     "The vendor name of the Swift compiler")

test/IRGen/async/hop_to_executor.sil

@@ -1,7 +1,11 @@
-// RUN: %target-swift-frontend -enable-experimental-concurrency -primary-file %s -module-name=test -disable-llvm-optzns -disable-swift-specific-llvm-optzns -emit-ir -sil-verify-all | %IRGenFileCheck %s
+// RUN: %target-swift-frontend -enable-experimental-concurrency -primary-file %s -module-name=test -disable-llvm-optzns -disable-swift-specific-llvm-optzns -emit-ir -sil-verify-all | %IRGenFileCheck %s -check-prefix CHECK-%target-abi
 
 // REQUIRES: concurrency
 
+// WASI does not support the mandatory tail call, and needs to take the same
+// path as CHECK-WIN, but will currently go down CHECK-SYSV, failing the test.
+// XFAIL: OS=wasi
+
 sil_stage canonical
 
 import Builtin
@@ -10,13 +14,14 @@ import _Concurrency
 
 // CHECK-LABEL: define{{.*}} void @test_simple(
 // CHECK-SAME: %swift.context* swiftasync %0, [[INT]] %1, [[INT]] %2)
-// CHECK: [[CTX:%[0-9]+]] = bitcast %swift.context* %0
-// CHECK: [[RESUME:%[0-9]+]] = call i8* @llvm.coro.async.resume()
+// CHECK-DAG: [[CTX:%[0-9]+]] = bitcast %swift.context* %0
+// CHECK-DAG: [[RESUME:%[0-9]+]] = call i8* @llvm.coro.async.resume()
 // CHECK-x86_64: call {{.*}} @llvm.coro.suspend.async{{.*}}(i32 0, i8* [[RESUME]], i8* bitcast (i8* (i8*)* @__swift_async_resume_get_context to i8*), i8* bitcast (void (i8*, [[INT]], [[INT]], %swift.context*)* @__swift_suspend_point to i8*), i8* [[RESUME]], [[INT]] %1, [[INT]] %2, %swift.context* {{%[0-9]+}})
 // CHECK-arm64e: call {{.*}} @llvm.coro.suspend.async{{.*}}(i32 0, i8* [[RESUME]], i8* bitcast (i8* (i8*)* @__swift_async_resume_get_context to i8*), i8* bitcast (void (i8*, [[INT]], [[INT]], %swift.context*)* @__swift_suspend_point to i8*), i8* [[RESUME]], [[INT]] %1, [[INT]] %2, %swift.context* {{%[0-9]+}})
 // CHECK: [[RET_CONTINUATION:%.*]] = bitcast void (%swift.context*)* {{.*}} to i8*
 // CHECK:  call i1 (i8*, i1, ...) @llvm.coro.end.async(i8* {{.*}}, i1 false, void (i8*, %swift.context*)* @[[TAIL_CALL_FUNC:.*]], i8* [[RET_CONTINUATION]]
-// CHECK: unreachable
+// CHECK-WIN: ret void
+// CHECK-SYSV: unreachable
 
 sil @test_simple : $@async (@guaranteed Optional<Builtin.Executor>) -> () {
 bb0(%0 : $Optional<Builtin.Executor>):

test/IRGen/async/non_musttail_target.sil

@@ -0,0 +1,18 @@
+// Ensure that IRGen don't emit unreachable after coro.end.async for targets that don't support musttail call.
+// RUN: %target-swift-frontend -disable-legacy-type-info -parse-stdlib %s -disable-llvm-optzns -disable-swift-specific-llvm-optzns -disable-objc-interop -module-name main -emit-ir -o - | %FileCheck %s
+
+// REQUIRES: concurrency
+// REQUIRES: OS=wasi || OS=windows-msvc
+
+sil_stage canonical
+
+import Builtin
+
+sil @test_simple : $@async () -> () {
+bb0:
+  %0 = tuple ()
+  return %0 : $()
+// CHECK:     call i1 (i8*, i1, ...) @llvm.coro.end.async
+// CHECK-NOT: unreachable
+// CHECK:     ret void
+}

test/Serialization/Recovery/types-5-to-4.swift

@@ -16,8 +16,8 @@ import Lib
 func requiresConformance(_: B_RequiresConformance<B_ConformsToProto>) {}
 func requiresConformance(_: B_RequiresConformance<C_RelyOnConformanceImpl.Assoc>) {}
 
-class Sub: Base {} // expected-error {{cannot inherit from class 'Base' (compiled with Swift 5.5) because it has overridable members that could not be loaded in Swift 4.1.50}}
-class Impl: Proto {} // expected-error {{type 'Impl' cannot conform to protocol 'Proto' (compiled with Swift 5.5) because it has requirements that could not be loaded in Swift 4.1.50}}
+class Sub: Base {} // expected-error {{cannot inherit from class 'Base' (compiled with Swift 5.5.2) because it has overridable members that could not be loaded in Swift 4.1.50}}
+class Impl: Proto {} // expected-error {{type 'Impl' cannot conform to protocol 'Proto' (compiled with Swift 5.5.2) because it has requirements that could not be loaded in Swift 4.1.50}}
 
 #else // TEST
 

test/SourceKit/Misc/compiler_version.swift

@@ -2,4 +2,4 @@
 
 // CHECK: key.version_major: 5
 // CHECK: key.version_minor: 5 
-// CHECK: key.version_patch: 0
+// CHECK: key.version_patch: 2

utils/build_swift/build_swift/defaults.py

@@ -49,7 +49,7 @@
 CMAKE_GENERATOR = 'Ninja'
 
 COMPILER_VENDOR = 'none'
-SWIFT_USER_VISIBLE_VERSION = Version('5.5')
+SWIFT_USER_VISIBLE_VERSION = Version('5.5.2')
 CLANG_USER_VISIBLE_VERSION = Version('10.0.0')
 SWIFT_ANALYZE_CODE_COVERAGE = 'false'