From f114a7bda0686e3127ab5f2592a34f59b62473ce Mon Sep 17 00:00:00 2001 From: susmonteiro Date: Tue, 30 Sep 2025 09:32:13 +0100 Subject: [PATCH] [cxx-interop] Re-merge tests failing on Windows --- test/Interop/C/struct/noncopyable_structs.swift | 5 +++++ .../C/struct/noncopyable_structs_nontrivial.swift | 11 ----------- 2 files changed, 5 insertions(+), 11 deletions(-) delete mode 100644 test/Interop/C/struct/noncopyable_structs_nontrivial.swift diff --git a/test/Interop/C/struct/noncopyable_structs.swift b/test/Interop/C/struct/noncopyable_structs.swift index d4700fdab74ad..e20c2e04c1184 100644 --- a/test/Interop/C/struct/noncopyable_structs.swift +++ b/test/Interop/C/struct/noncopyable_structs.swift @@ -63,6 +63,11 @@ func bad2(_: borrowing BadDestroyNonCopyableType2) { } #endif +#if CPLUSPLUS +// expected-cplusplus-warning@+1{{'ExtraDestroy' is deprecated: destroy operation 'extraDestroy' is not allowed on types with a non-trivial destructor}} +func extra(_: borrowing ExtraDestroy) { } +#endif + // CHECK-SIL: sil shared @$sSo21NonCopyableWithDeinitVfD : $@convention(method) (@owned NonCopyableWithDeinit) -> () { // CHECK-SIL: bb0([[SELF:%[0-9]+]] : $NonCopyableWithDeinit): // CHECK-SIL: [[SELF_ALLOC:%[0-9]+]] = alloc_stack $NonCopyableWithDeinit diff --git a/test/Interop/C/struct/noncopyable_structs_nontrivial.swift b/test/Interop/C/struct/noncopyable_structs_nontrivial.swift deleted file mode 100644 index 50e2042bea5f9..0000000000000 --- a/test/Interop/C/struct/noncopyable_structs_nontrivial.swift +++ /dev/null @@ -1,11 +0,0 @@ -// Split out from noncopyable_structs.swift due to an issue with Windows. - -// RUN: %target-swift-frontend -emit-sil -I %S/Inputs/ -I %swift_src_root/lib/ClangImporter/SwiftBridging %s -verify -DERRORS -verify-additional-prefix conly- -// RUN: %target-swift-frontend -emit-sil -I %S/Inputs/ -I %swift_src_root/lib/ClangImporter/SwiftBridging %s -verify -DERRORS -DCPLUSPLUS -verify-additional-prefix cplusplus- -cxx-interoperability-mode=default - -import NoncopyableStructs - -#if CPLUSPLUS -// expected-cplusplus-warning@+1{{'ExtraDestroy' is deprecated: destroy operation 'extraDestroy' is not allowed on types with a non-trivial destructor}} -func extra(_: borrowing ExtraDestroy) { } -#endif