Skip to content

Commit d520dfe

Browse files
committed
[libc++abi] Properly fix XFAILs for exception alignment
Since <unwind.h> is in the SDK, not in /usr/include, the XFAILs must be predicated on the compiler version (ideally even on the SDK version) instead of the target system version.
1 parent 56ce65e commit d520dfe

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

libcxxabi/test/test_exception_address_alignment.pass.cpp

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,13 @@
99
// UNSUPPORTED: no-exceptions
1010
// UNSUPPORTED: c++03
1111

12-
// The system unwind.h on older OSX versions provided an incorrectly aligned
13-
// _Unwind_Exception type. That causes these tests to fail on those platforms.
14-
// XFAIL: macosx10.14 && libcxxabi-has-system-unwinder
15-
// XFAIL: macosx10.13 && libcxxabi-has-system-unwinder
16-
// XFAIL: macosx10.12 && libcxxabi-has-system-unwinder
17-
// XFAIL: macosx10.11 && libcxxabi-has-system-unwinder
18-
// XFAIL: macosx10.10 && libcxxabi-has-system-unwinder
19-
// XFAIL: macosx10.9 && libcxxabi-has-system-unwinder
12+
// The <unwind.h> header provided in the SDK of older Xcodes used to provide
13+
// an incorrectly aligned _Unwind_Exception type. That causes these tests to
14+
// fail with those SDKs. Note that we use the AppleClang version as a cheap
15+
// proxy for the SDK version.
16+
// XFAIL: apple-clang-11 && libcxxabi-has-system-unwinder
17+
// XFAIL: apple-clang-10 && libcxxabi-has-system-unwinder
18+
// XFAIL: apple-clang-9 && libcxxabi-has-system-unwinder
2019

2120
// Test that the address of the exception object is properly aligned as required
2221
// by the relevant ABI

0 commit comments

Comments
 (0)