Merge pull request #16909 from eeckstein/fix-tests

Author: swift-ci

test/SILOptimizer/string_literals.swift

@@ -7,28 +7,32 @@
 
 // CHECK-LABEL: define {{.*}}test_create_verysmallstring
 // CHECK:      entry:
-// CHECK-NEXT:   ret {{.*}} inttoptr
+// CHECK-NEXT:   ret {{.*}}
+// CHECK-NEXT: }
 public func test_create_verysmallstring() -> String {
   return "a"
 }
 
 // CHECK-LABEL: define {{.*}}test_create_smallstring
 // CHECK:      entry:
-// CHECK-NEXT:   ret {{.*}} inttoptr
+// CHECK-NEXT:   ret {{.*}}
+// CHECK-NEXT: }
 public func test_create_smallstring() -> String {
   return "abcdefghijkl012"
 }
 
 // CHECK-LABEL: define {{.*}}test_create_largestring
 // CHECK:      entry:
-// CHECK-NEXT:   ret {{.*}} inttoptr
+// CHECK-NEXT:   ret {{.*}}
+// CHECK-NEXT: }
 public func test_create_largestring() -> String {
   return "abcdefghijkl012qwerqwer"
 }
 
 // CHECK-LABEL: define {{.*}}test_create_unicode
 // CHECK:      entry:
-// CHECK-NEXT:   ret {{.*}} inttoptr
+// CHECK-NEXT:   ret {{.*}}
+// CHECK-NEXT: }
 public func test_create_unicode() -> String {
   return "❄️gastroperiodyni"
 }

test/SILOptimizer/unused_containers.swift

@@ -2,6 +2,9 @@
 
 // REQUIRES: swift_stdlib_no_asserts
 
+// FIXME: https://bugs.swift.org/browse/SR-7806
+// REQUIRES: CPU=arm64 || CPU=x86_64
+
 //CHECK-LABEL: @$S17unused_containers16empty_array_testyyF
 //CHECK: bb0:
 //CHECK-NEXT: tuple