Merge remote-tracking branch 'origin/master' into master-rebranch

Author: swift-ci

test/ParseableInterface/Inputs/enums-layout-helper.swift

@@ -76,6 +76,20 @@ public enum FutureproofIndirectCaseEnum {
   case c
 }
 
+// CHECK-LABEL: public enum FutureproofIndirectMultiCaseEnum
+public enum FutureproofIndirectMultiCaseEnum {
+  // CHECK-SINGLE-FRONTEND-NEXT: {{^}} case a1, a2{{$}}
+  // CHECK-MULTI-FILE-NEXT: {{^}} case a1{{$}}
+  // CHECK-MULTI-FILE-NEXT: {{^}} case a2{{$}}
+  case a1, a2
+  // CHECK-SINGLE-FRONTEND-NEXT: indirect case b1(Swift.Int), b2(Swift.Int){{$}}
+  // CHECK-MULTI-FILE-NEXT: indirect case b1(Swift.Int){{$}}
+  // CHECK-MULTI-FILE-NEXT: indirect case b2(Swift.Int){{$}}
+  indirect case b1(Int), b2(Int)
+  // CHECK-NEXT: {{^}} case c{{$}}
+  case c
+}
+
 // CHECK-LABEL: public enum FrozenIndirectCaseEnum
 @_frozen public enum FrozenIndirectCaseEnum {
   // CHECK-NEXT: {{^}} case a{{$}}
@@ -85,3 +99,17 @@ public enum FutureproofIndirectCaseEnum {
   // CHECK-NEXT: {{^}} case c{{$}}
   case c
 }
+
+// CHECK-LABEL: public enum FrozenIndirectMultiCaseEnum
+@_frozen public enum FrozenIndirectMultiCaseEnum {
+  // CHECK-SINGLE-FRONTEND-NEXT: {{^}} case a1, a2{{$}}
+  // CHECK-MULTI-FILE-NEXT: {{^}} case a1{{$}}
+  // CHECK-MULTI-FILE-NEXT: {{^}} case a2{{$}}
+  case a1, a2
+  // CHECK-SINGLE-FRONTEND-NEXT: indirect case b1(Swift.Int), b2(Swift.Int){{$}}
+  // CHECK-MULTI-FILE-NEXT: indirect case b1(Swift.Int){{$}}
+  // CHECK-MULTI-FILE-NEXT: indirect case b2(Swift.Int){{$}}
+  indirect case b1(Int), b2(Int)
+  // CHECK-NEXT: {{^}} case c{{$}}
+  case c
+}

test/ParseableInterface/enums-layout.swift

@@ -1,12 +1,12 @@
 // RUN: %empty-directory(%t)
 // RUN: %target-build-swift -emit-module-interface-path %t/Lib.swiftinterface -emit-module -o %t/unused.swiftmodule -enable-library-evolution -Xfrontend -enable-objc-interop -Xfrontend -disable-objc-attr-requires-foundation-module -swift-version 5 %S/Inputs/enums-layout-helper.swift -module-name Lib
-// RUN: %FileCheck %S/Inputs/enums-layout-helper.swift < %t/Lib.swiftinterface
+// RUN: %FileCheck -check-prefix CHECK -check-prefix CHECK-MULTI-FILE %S/Inputs/enums-layout-helper.swift < %t/Lib.swiftinterface
 // RUN: %target-swift-frontend -enable-objc-interop -O -emit-ir -primary-file %s -I %t -Xllvm -swiftmergefunc-threshold=0 | %FileCheck %s
 
 // Try again using a single-frontend build.
 // RUN: %empty-directory(%t)
 // RUN: %target-build-swift -force-single-frontend-invocation -emit-module-interface-path %t/Lib.swiftinterface -emit-module -o %t/unused.swiftmodule -enable-library-evolution -Xfrontend -enable-objc-interop -Xfrontend -disable-objc-attr-requires-foundation-module -swift-version 5 %S/Inputs/enums-layout-helper.swift -module-name Lib
-// RUN: %FileCheck %S/Inputs/enums-layout-helper.swift < %t/Lib.swiftinterface
+// RUN: %FileCheck -check-prefix CHECK -check-prefix CHECK-SINGLE-FRONTEND %S/Inputs/enums-layout-helper.swift < %t/Lib.swiftinterface
 // RUN: %target-swift-frontend -enable-objc-interop -O -emit-ir -primary-file %s -I %t -Xllvm -swiftmergefunc-threshold=0 | %FileCheck %s