Skip to content

Commit 427dd72

Browse files
committed
Add temporary workaround for AppleClang 15 until we drop CI for it
1 parent c34e7a2 commit 427dd72

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

libcxx/include/__algorithm/simd_utils.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@ _LIBCPP_PUSH_MACROS
2626
#include <__undef_macros>
2727

2828
// TODO: Find out how altivec changes things and allow vectorizations there too.
29-
#if _LIBCPP_STD_VER >= 14 && defined(_LIBCPP_COMPILER_CLANG_BASED) && !defined(__ALTIVEC__)
29+
// TODO: Simplify this condition once we stop building with AppleClang 15 in the CI.
30+
#if _LIBCPP_STD_VER >= 14 && defined(_LIBCPP_COMPILER_CLANG_BASED) && !defined(__ALTIVEC__) && \
31+
!(defined(_LIBCPP_APPLE_CLANG_VER) && _LIBCPP_APPLE_CLANG_VER < 1600)
3032
# define _LIBCPP_HAS_ALGORITHM_VECTOR_UTILS 1
3133
#else
3234
# define _LIBCPP_HAS_ALGORITHM_VECTOR_UTILS 0

libcxx/test/libcxx/algorithms/vectorization.compile.pass.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
// We don't vectorize algorithms on AIX right now.
1818
// XFAIL: target={{.+}}-aix{{.*}}
1919

20+
// We don't vectorize on AppleClang 15 since that apparently breaks std::mismatch
21+
// XFAIL: apple-clang-15
22+
2023
// This test ensures that we enable the vectorization of algorithms on the expected
2124
// platforms.
2225

0 commit comments

Comments
 (0)