From 5d4c29cd09881b9454b31808b1b6863a19011585 Mon Sep 17 00:00:00 2001 From: Tim Kientzle Date: Tue, 24 Oct 2023 06:58:41 -0700 Subject: [PATCH] Fix a bunch of reflection tests to be correct for Ubuntu These tests had Darwin-specific code in them, mostly unnecessary, that caused them to break on non-Darwin platforms. Only one (reflect_Enum_SingleCaseCFPayload.swift) was actually specific to Darwin. That one has been disabled. For the rest, just delete the unnecessary `import Darwin` and similar. --- .../Reflection/reflect_Enum_MultiPayload_generic3.swift | 6 ------ .../Reflection/reflect_Enum_MultiPayload_generic4.swift | 6 ------ .../Reflection/reflect_Enum_MultiPayload_generic5.swift | 1 - .../Reflection/reflect_Enum_MultiPayload_generic6.swift | 1 - .../Reflection/reflect_Enum_MultiPayload_generic7.swift | 1 - .../Reflection/reflect_Enum_SingleCaseCFPayload.swift | 1 + .../Reflection/reflect_Enum_SinglePayload_generic1.swift | 4 ++-- 7 files changed, 3 insertions(+), 17 deletions(-) diff --git a/validation-test/Reflection/reflect_Enum_MultiPayload_generic3.swift b/validation-test/Reflection/reflect_Enum_MultiPayload_generic3.swift index 6840651beafb0..189388c2f9fb9 100644 --- a/validation-test/Reflection/reflect_Enum_MultiPayload_generic3.swift +++ b/validation-test/Reflection/reflect_Enum_MultiPayload_generic3.swift @@ -9,12 +9,6 @@ // UNSUPPORTED: use_os_stdlib import SwiftReflectionTest -import Darwin - -private func debugLog(_ message: @autoclosure () -> String) { - fputs("Child: \(message())\n", stderr) - fflush(stderr) -} struct StructWithEnumDepth0 { enum E { diff --git a/validation-test/Reflection/reflect_Enum_MultiPayload_generic4.swift b/validation-test/Reflection/reflect_Enum_MultiPayload_generic4.swift index 926f470394ae8..a2ca63f9d58d1 100644 --- a/validation-test/Reflection/reflect_Enum_MultiPayload_generic4.swift +++ b/validation-test/Reflection/reflect_Enum_MultiPayload_generic4.swift @@ -9,12 +9,6 @@ // UNSUPPORTED: use_os_stdlib import SwiftReflectionTest -import Darwin - -private func debugLog(_ message: @autoclosure () -> String) { - fputs("Child: \(message())\n", stderr) - fflush(stderr) -} struct StructWithEnumDepth0 { enum E { diff --git a/validation-test/Reflection/reflect_Enum_MultiPayload_generic5.swift b/validation-test/Reflection/reflect_Enum_MultiPayload_generic5.swift index f3bfb69abccb4..c159a849f8341 100644 --- a/validation-test/Reflection/reflect_Enum_MultiPayload_generic5.swift +++ b/validation-test/Reflection/reflect_Enum_MultiPayload_generic5.swift @@ -9,7 +9,6 @@ // UNSUPPORTED: use_os_stdlib import SwiftReflectionTest -import Darwin struct StructWithEnumDepth0 { enum E { diff --git a/validation-test/Reflection/reflect_Enum_MultiPayload_generic6.swift b/validation-test/Reflection/reflect_Enum_MultiPayload_generic6.swift index 33663a88a32cc..00d26862fbadf 100644 --- a/validation-test/Reflection/reflect_Enum_MultiPayload_generic6.swift +++ b/validation-test/Reflection/reflect_Enum_MultiPayload_generic6.swift @@ -9,7 +9,6 @@ // UNSUPPORTED: use_os_stdlib import SwiftReflectionTest -import Darwin struct StructWithEnumDepth0 { enum E { diff --git a/validation-test/Reflection/reflect_Enum_MultiPayload_generic7.swift b/validation-test/Reflection/reflect_Enum_MultiPayload_generic7.swift index b84bf91d9eae5..70bf37ceddc3a 100644 --- a/validation-test/Reflection/reflect_Enum_MultiPayload_generic7.swift +++ b/validation-test/Reflection/reflect_Enum_MultiPayload_generic7.swift @@ -9,7 +9,6 @@ // UNSUPPORTED: use_os_stdlib import SwiftReflectionTest -import Darwin // This will always get treated as a single-payload enum enum A { diff --git a/validation-test/Reflection/reflect_Enum_SingleCaseCFPayload.swift b/validation-test/Reflection/reflect_Enum_SingleCaseCFPayload.swift index 4936d23e6d3a8..307bf260c8f62 100644 --- a/validation-test/Reflection/reflect_Enum_SingleCaseCFPayload.swift +++ b/validation-test/Reflection/reflect_Enum_SingleCaseCFPayload.swift @@ -6,6 +6,7 @@ // REQUIRES: reflection_test_support // REQUIRES: executable_test +// REQUIRES: objc_interop // UNSUPPORTED: use_os_stdlib import SwiftReflectionTest diff --git a/validation-test/Reflection/reflect_Enum_SinglePayload_generic1.swift b/validation-test/Reflection/reflect_Enum_SinglePayload_generic1.swift index e897bb11f6cda..435f032d1cf07 100644 --- a/validation-test/Reflection/reflect_Enum_SinglePayload_generic1.swift +++ b/validation-test/Reflection/reflect_Enum_SinglePayload_generic1.swift @@ -2,7 +2,7 @@ // RUN: %target-build-swift -lswiftSwiftReflectionTest %s -o %t/reflect_Enum_SinglePayload_generic1 // RUN: %target-codesign %t/reflect_Enum_SinglePayload_generic1 -// RUN: %target-run %target-swift-reflection-test %t/reflect_Enum_SinglePayload_generic1 | tee /dev/stderr | %FileCheck %s --check-prefix=CHECK --check-prefix=X%target-ptrsize --dump-input=fail +// RUN: %target-run %target-swift-reflection-test %t/reflect_Enum_SinglePayload_generic1 | tee /dev/stderr | %FileCheck %s --check-prefix=CHECK --check-prefix=X%target-ptrsize %add_num_extra_inhabitants --dump-input=fail // REQUIRES: reflection_test_support // REQUIRES: executable_test @@ -31,7 +31,7 @@ reflect(enum: SimplePayload1.b(ClassTypeA())) // (Unlike MPEs, SPEs do not automatically use a tag just because they're generic) // CHECK: Type info: -// X64-NEXT: (single_payload_enum size=8 alignment=8 stride=8 num_extra_inhabitants=2147483645 bitwise_takable=1 +// X64-NEXT: (single_payload_enum size=8 alignment=8 stride=8 num_extra_inhabitants=[[#num_extra_inhabitants_64bit-2]] bitwise_takable=1 // X32-NEXT: (single_payload_enum size=4 alignment=4 stride=4 num_extra_inhabitants={{[0-9]+}} bitwise_takable=1 // CHECK-NEXT: (case name=b index=0 offset=0 // CHECK-NEXT: (reference kind=strong refcounting=native))