From 35fb08790b8669848793402a1d79f860fdc3ed9f Mon Sep 17 00:00:00 2001 From: Ryan Mansfield Date: Tue, 6 Aug 2024 16:05:55 -0400 Subject: [PATCH] Use num_extra_inhabitants_64bit to fix reflect_CheckedContinuation.swift and reflect_UnsafeContinuation.swift on non-Darwin platforms. --- validation-test/Reflection/reflect_CheckedContinuation.swift | 4 ++-- validation-test/Reflection/reflect_UnsafeContinuation.swift | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/validation-test/Reflection/reflect_CheckedContinuation.swift b/validation-test/Reflection/reflect_CheckedContinuation.swift index 4ffe77dd4ea62..8ff0fb62a4ce0 100644 --- a/validation-test/Reflection/reflect_CheckedContinuation.swift +++ b/validation-test/Reflection/reflect_CheckedContinuation.swift @@ -2,7 +2,7 @@ // RUN: %target-build-swift -lswiftSwiftReflectionTest %s -o %t/reflect_CheckedContinuation // RUN: %target-codesign %t/reflect_CheckedContinuation -// RUN: %target-run %target-swift-reflection-test %t/reflect_CheckedContinuation | %FileCheck %s --check-prefix=CHECK-%target-ptrsize +// RUN: %target-run %target-swift-reflection-test %t/reflect_CheckedContinuation | %FileCheck %s --check-prefix=CHECK-%target-ptrsize %add_num_extra_inhabitants // REQUIRES: reflection_test_support // REQUIRES: executable_test @@ -45,7 +45,7 @@ if #available(SwiftStdlib 5.1, *) { // CHECK-64: Type info: // CHECK-64-NEXT: (class_instance size=24 alignment=8 stride=24 num_extra_inhabitants=0 bitwise_takable=1 // CHECK-64-NEXT: (field name=cont offset=16 -// CHECK-64-NEXT: (struct size=8 alignment=8 stride=8 num_extra_inhabitants=2147483647 bitwise_takable=1 +// CHECK-64-NEXT: (struct size=8 alignment=8 stride=8 num_extra_inhabitants=[[#num_extra_inhabitants_64bit]] bitwise_takable=1 // CHECK-64-NEXT: (field name=canary offset=0 // CHECK-64-NEXT: (reference kind=strong refcounting=native))))) diff --git a/validation-test/Reflection/reflect_UnsafeContinuation.swift b/validation-test/Reflection/reflect_UnsafeContinuation.swift index 68674d8310a56..fa3c6fc4ccbff 100644 --- a/validation-test/Reflection/reflect_UnsafeContinuation.swift +++ b/validation-test/Reflection/reflect_UnsafeContinuation.swift @@ -2,7 +2,7 @@ // RUN: %target-build-swift -lswiftSwiftReflectionTest %s -o %t/reflect_UnsafeContinuation // RUN: %target-codesign %t/reflect_UnsafeContinuation -// RUN: %target-run %target-swift-reflection-test %t/reflect_UnsafeContinuation | %FileCheck %s --check-prefix=CHECK-%target-ptrsize +// RUN: %target-run %target-swift-reflection-test %t/reflect_UnsafeContinuation | %FileCheck %s --check-prefix=CHECK-%target-ptrsize %add_num_extra_inhabitants // REQUIRES: reflection_test_support // REQUIRES: executable_test @@ -45,7 +45,7 @@ if #available(SwiftStdlib 5.1, *) { // CHECK-64: Type info: // CHECK-64-NEXT: (class_instance size=24 alignment=8 stride=24 num_extra_inhabitants=0 bitwise_takable=1 // CHECK-64-NEXT: (field name=cont offset=16 -// CHECK-64-NEXT: (struct size=8 alignment=8 stride=8 num_extra_inhabitants=2147483647 bitwise_takable=1 +// CHECK-64-NEXT: (struct size=8 alignment=8 stride=8 num_extra_inhabitants=[[#num_extra_inhabitants_64bit]] bitwise_takable=1 // CHECK-64-NEXT: (field name=context offset=0 // CHECK-64-NEXT: (reference kind=strong refcounting=native)))))