From 310255abef23ba17066e730fddbbc2eb33fa6f26 Mon Sep 17 00:00:00 2001 From: Haowei Wu Date: Wed, 19 Jul 2023 16:22:29 -0700 Subject: [PATCH] [libcxx] Fix copy_move.pass test When LLVM is built under MSVC and libcxx ABI is set to 2, the 'copy_move.pass' test will unexpectedly pass. This patch mitigate this issue by setting this test will only expecting FAIL when libcxx ABI version is set to 1. This is a re-land of be9f55f4fff47badcdca17be5bcc0a4a15894739 Differential Revision: https://reviews.llvm.org/D155760 Fixes: https://github.com/llvm/llvm-project/issues/63442 --- .../func.wrap/func.wrap.func/func.wrap.func.con/copy_move.pass.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/copy_move.pass.cpp b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/copy_move.pass.cpp index 6ad6e2a..4a2a272 100644 --- a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/copy_move.pass.cpp +++ b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/copy_move.pass.cpp @@ -8,7 +8,7 @@ // FIXME: In MSVC mode, even "std::function f(aref);" causes // allocations. -// XFAIL: target=x86_64-pc-windows-msvc && stdlib=libc++ +// XFAIL: target=x86_64-pc-windows-msvc && stdlib=libc++ && libcpp-abi-version=1 // UNSUPPORTED: c++03 -- 2.7.4