From bf61891146be78a693ff6a52f05e1a7c8147ba4d Mon Sep 17 00:00:00 2001 From: Louis Dionne Date: Wed, 3 Jun 2020 10:06:56 -0400 Subject: [PATCH] [libc++abi] Fix incorrect XFAILs for mis-aligned _Unwind_Exception on Apple The problem mentioned in the XFAILs has been resolved in macosx10.15, so the test is now XPASSing on that platform. rdar://63640184 --- libcxxabi/test/test_exception_address_alignment.pass.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/libcxxabi/test/test_exception_address_alignment.pass.cpp b/libcxxabi/test/test_exception_address_alignment.pass.cpp index b462659..b870290 100644 --- a/libcxxabi/test/test_exception_address_alignment.pass.cpp +++ b/libcxxabi/test/test_exception_address_alignment.pass.cpp @@ -9,10 +9,14 @@ // UNSUPPORTED: no-exceptions // UNSUPPORTED: c++03 -// The system unwind.h on OS X provides an incorrectly aligned _Unwind_Exception -// type. That causes these tests to fail. This XFAIL is my best attempt at -// working around this failure. -// XFAIL: darwin && libcxxabi-has-system-unwinder +// The system unwind.h on older OSX versions provided an incorrectly aligned +// _Unwind_Exception type. That causes these tests to fail on those platforms. +// XFAIL: macosx10.14 && libcxxabi-has-system-unwinder +// XFAIL: macosx10.13 && libcxxabi-has-system-unwinder +// XFAIL: macosx10.12 && libcxxabi-has-system-unwinder +// XFAIL: macosx10.11 && libcxxabi-has-system-unwinder +// XFAIL: macosx10.10 && libcxxabi-has-system-unwinder +// XFAIL: macosx10.9 && libcxxabi-has-system-unwinder // Test that the address of the exception object is properly aligned as required // by the relevant ABI -- 2.7.4