Merge pull request #73616 from apple/egorzhdan/vwt-test-fix-old-macos

[cxx-interop] Fix a test on older macOS versions

Author: egorzhdan

test/Interop/Cxx/foreign-reference/Inputs/witness-table.h

@@ -32,7 +32,7 @@ CxxLinkedList * _Nonnull makeLinkedList() {
 
 struct __attribute__((swift_attr("import_reference")))
 __attribute__((swift_attr("retain:immortal")))
-__attribute__((swift_attr("release:immortal"))) CxxSequence {
+__attribute__((swift_attr("release:immortal"))) MyCxxSequence {
   CxxLinkedList * _Nullable list = nullptr;
 
   CxxLinkedList * _Nullable next() {
@@ -45,14 +45,14 @@ __attribute__((swift_attr("release:immortal"))) CxxSequence {
   }
 };
 
-CxxSequence * _Nonnull makeSequence() {
+MyCxxSequence * _Nonnull makeSequence() {
   CxxLinkedList *buff = (CxxLinkedList *)malloc(sizeof(CxxLinkedList) * 4);
   buff[0].value = 0;
   buff[1].value = 1;
   buff[2].value = 2;
   buff[3].value = 3;
 
-  CxxSequence *seq = (CxxSequence *)malloc(sizeof(CxxSequence));
+  MyCxxSequence *seq = (MyCxxSequence *)malloc(sizeof(MyCxxSequence));
   seq->list = buff;
   return seq;
 }

test/Interop/Cxx/foreign-reference/witness-table.swift

@@ -1,4 +1,4 @@
-// RUN: %target-run-simple-swift(-I %S/Inputs/ -Xfrontend -enable-experimental-cxx-interop -Xfrontend -validate-tbd-against-ir=none -Xfrontend -disable-llvm-verify -Xfrontend -disable-availability-checking -g)
+// RUN: %target-run-simple-swift(-I %S/Inputs/ -Xfrontend -enable-experimental-cxx-interop -Xfrontend -validate-tbd-against-ir=none -Xfrontend -disable-llvm-verify -g)
 //
 // REQUIRES: executable_test
 // XFAIL: OS=windows-msvc
@@ -26,8 +26,14 @@ public struct List<NodeType: ListNode> : Sequence, IteratorProtocol
   }
 }
 
+@available(SwiftStdlib 5.8, *)
 extension CxxLinkedList : ListNode { }
 
+@available(SwiftStdlib 5.8, *)
+extension MyCxxSequence : Sequence, IteratorProtocol { }
+
+if #available(SwiftStdlib 5.8, *) {
+
 var WitnessTableTestSuite = TestSuite("Use foreign reference in a generic context")
 
 WitnessTableTestSuite.test("As generic argument to List") {
@@ -41,8 +47,6 @@ WitnessTableTestSuite.test("As generic argument to List") {
   expectEqual(count, 4)
 }
 
-extension CxxSequence : Sequence, IteratorProtocol { }
-
 WitnessTableTestSuite.test("As a Sequence") {
   let list = makeSequence()
   var count = 0
@@ -53,5 +57,7 @@ WitnessTableTestSuite.test("As a Sequence") {
   expectEqual(count, 3)
 }
 
+}
+
 runAllTests()