Merge pull request #4957 from swiftwasm/release/5.7

[pull] swiftwasm-release/5.7 from release/5.7

Author: kateinoigakukun

test/ClangImporter/CoreGraphics_test.swift

@@ -6,6 +6,9 @@ import CoreGraphics
 // REQUIRES: OS=macosx
 // REQUIRES: CPU=x86_64
 
+@_silgen_name("blackHole")
+func blackHole<T>(_ value: T) -> Void
+
 // CHECK: [[SWITCHTABLE:@.*]] = private unnamed_addr constant [8 x i64] [i64 0, i64 12, i64 23, i64 34, i64 45, i64 55, i64 67, i64 71]
 
 // CHECK-LABEL: define swiftcc i64 {{.*}}testEnums{{.*}} {
@@ -99,9 +102,9 @@ public func testRenames(transform: CGAffineTransform, context: CGContext,
 // CHECK:   call void @CGAffineTransformInvert(%struct.CGAffineTransform* {{.*}}, %struct.CGAffineTransform* {{.*}})
 // CHECK:   call void @CGAffineTransformConcat(%struct.CGAffineTransform* {{.*}}, %struct.CGAffineTransform* {{.*}}, %struct.CGAffineTransform* {{.*}})
 
-  let _ = point.applying(transform)
+  blackHole(point.applying(transform))
   var rect = rect.applying(transform)
-  let _ = size.applying(transform)
+  blackHole(size.applying(transform))
 // CHECK:   %{{.*}} = {{(tail )?}}call { double, double } @CGPointApplyAffineTransform(double %{{.*}}, double %{{.*}}, %struct.CGAffineTransform* {{.*}})
 // CHECK:   call void @CGRectApplyAffineTransform(%struct.CGRect* {{.*}}, %struct.CGRect* {{.*}}, %struct.CGAffineTransform* {{.*}})
 // CHECK:   %{{.*}} = {{(tail )?}}call { double, double } @CGSizeApplyAffineTransform(double %{{.*}}, double %{{.*}}, %struct.CGAffineTransform* {{.*}})

test/Runtime/protocol_conformance_collision.swift

@@ -1,5 +1,5 @@
 // RUN: %empty-directory(%t)
-// RUN: %target-build-swift %s -o %t/newSDK %target-link-sdk-future-version
+// RUN: %target-build-swift %s -o %t/newSDK %target-link-sdk-2021-version
 // RUN: %target-codesign %t/newSDK
 // RUN: %target-run %t/newSDK newSDK
 // RUN: %target-build-swift %s -o %t/oldSDK %target-link-sdk-2020-version

test/Syntax/verify_shorthand_if_let.swift

@@ -0,0 +1,7 @@
+// RUN: %target-typecheck-verify-swift -verify-syntax-tree
+
+func foo(x: Int?) {
+  if let x {
+    print(x)
+  }
+}

test/lit.cfg

@@ -1306,6 +1306,14 @@ if run_vendor == 'apple':
         'watchos': '7.0'
     }
     sdk_2020_version = SDK_2020_VERSION.get(run_os, '')
+    SDK_2021_VERSION = {
+        'macosx': '12.0',
+        'ios': '15.0',
+        'maccatalyst': '15.0',
+        'tvos': '15.0',
+        'watchos': '8.0'
+    }
+    sdk_2021_version = SDK_2021_VERSION.get(run_os, '')
     linker_os = {
         'iphoneos': 'ios',
         'appletvos': 'tvos',
@@ -1319,6 +1327,9 @@ if run_vendor == 'apple':
     config.target_link_sdk_2020_version = (
       "-Xlinker -platform_version -Xlinker %s -Xlinker %s -Xlinker %s" %
       (linker_os, sdk_2020_version, sdk_2020_version))
+    config.target_link_sdk_2021_version = (
+      "-Xlinker -platform_version -Xlinker %s -Xlinker %s -Xlinker %s" %
+      (linker_os, sdk_2021_version, sdk_2021_version))
     config.target_link_sdk_future_version = (
       "-Xlinker -platform_version -Xlinker %s -Xlinker %s -Xlinker %s" %
       (linker_os, target_future_version, target_future_version))
@@ -2466,6 +2477,9 @@ if hasattr(config, 'otool_classic'):
 if hasattr(config, 'target_link_sdk_2020_version'):
     config.substitutions.append(('%target-link-sdk-2020-version',
                                  config.target_link_sdk_2020_version))
+if hasattr(config, 'target_link_sdk_2021_version'):
+    config.substitutions.append(('%target-link-sdk-2021-version',
+                                 config.target_link_sdk_2021_version))
 if hasattr(config, 'target_link_sdk_future_version'):
     config.substitutions.append(('%target-link-sdk-future-version',
                                  config.target_link_sdk_future_version))

utils/gyb_syntax_support/StmtNodes.py

@@ -234,7 +234,8 @@
              Child('Pattern', kind='Pattern'),
              Child('TypeAnnotation', kind='TypeAnnotation',
                    is_optional=True),
-             Child('Initializer', kind='InitializerClause'),
+             Child('Initializer', kind='InitializerClause',
+                   is_optional=True),
          ]),
 
     # unavailability-condition -> '#unavailable' '(' availability-spec ')'