This is an archive of the discontinued LLVM Phabricator instance.

Differential D146837

[libc++] Don't try to provide source_location on AppleClang 1403
ClosedPublic

Authored by ldionne on Mar 24 2023, 11:43 AM.

Details

Reviewers
ldionne
Group Reviewers
Restricted Project
Commits
rGc2a42381c18e: [libc++] Don't try to provide source_location on AppleClang 1403
Summary

AppleClang 1403 has some bugs that prevent std::source_location from
working properly on it. Consequently, we XFAILed the unit test for
source_location with that compiler. However, we should also avoid
advertising that the feature is supported on that compiler, otherwise
our feature-test macros lie. This was noticed to break Boost.Asio
when building with a recent libc++ and AppleClang 14.0.3.

rdar://106863087

Diff Detail

Event Timeline

ldionne created this revision.Mar 24 2023, 11:43 AM
Herald added a project: Restricted Project. · View Herald TranscriptMar 24 2023, 11:43 AM
Herald added a subscriber: arichardson. · View Herald Transcript
ldionne requested review of this revision.Mar 24 2023, 11:43 AM
Herald added a project: Restricted Project. · View Herald TranscriptMar 24 2023, 11:43 AM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Herald added a subscriber: libcxx-commits. · View Herald Transcript
ldionne updated this revision to Diff 508183.Mar 24 2023, 11:47 AM

Generate files.

Harbormaster completed remote builds in B221660: Diff 508183.Mar 25 2023, 9:38 AM
ldionne updated this revision to Diff 508333.Mar 25 2023, 12:42 PM

Rebase for CI

Harbormaster completed remote builds in B221772: Diff 508333.Mar 25 2023, 2:02 PM
ldionne updated this revision to Diff 508715.Mar 27 2023, 9:54 AM

Fix formatting.

Harbormaster completed remote builds in B222059: Diff 508715.Mar 27 2023, 11:22 PM
ldionne accepted this revision.Mar 28 2023, 6:52 AM
This revision is now accepted and ready to land.Mar 28 2023, 6:52 AM
Closed by commit rGc2a42381c18e: [libc++] Don't try to provide source_location on AppleClang 1403 (authored by ldionne). · Explain WhyMar 28 2023, 6:53 AM
This revision was automatically updated to reflect the committed changes.
ldionne added a commit: rGc2a42381c18e: [libc++] Don't try to provide source_location on AppleClang 1403.

Revision Contents

PathSize
libcxx/
include/
1 line
6 lines
2 lines
test/
std/
language.support/
support.limits/
support.limits.general/
8 lines
8 lines
support/
3 lines
utils/
4 lines

Diff 508715

libcxx/include/__config

Show All 17 Lines
# endif # endif
#endif #endif
#ifndef _LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER #ifndef _LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
# pragma GCC system_header # pragma GCC system_header
#endif #endif
#if defined(__apple_build_version__) #if defined(__apple_build_version__)
// Given AppleClang XX.Y.Z, _LIBCPP_APPLE_CLANG_VER is XXYZ (e.g. AppleClang 14.0.3 => 1403)
# define _LIBCPP_COMPILER_CLANG_BASED # define _LIBCPP_COMPILER_CLANG_BASED
# define _LIBCPP_APPLE_CLANG_VER (__apple_build_version__ / 10000) # define _LIBCPP_APPLE_CLANG_VER (__apple_build_version__ / 10000)
#elif defined(__clang__) #elif defined(__clang__)
# define _LIBCPP_COMPILER_CLANG_BASED # define _LIBCPP_COMPILER_CLANG_BASED
# define _LIBCPP_CLANG_VER (__clang_major__ * 100 + __clang_minor__) # define _LIBCPP_CLANG_VER (__clang_major__ * 100 + __clang_minor__)
#elif defined(__GNUC__) #elif defined(__GNUC__)
# define _LIBCPP_COMPILER_GCC # define _LIBCPP_COMPILER_GCC
#endif #endif
▲ Show 20 Lines • Show All 1,252 Lines • Show Last 20 Lines

libcxx/include/source_location

Show All 29 Lines
#include <version> #include <version>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
# pragma GCC system_header # pragma GCC system_header
#endif #endif
_LIBCPP_BEGIN_NAMESPACE_STD _LIBCPP_BEGIN_NAMESPACE_STD
#if _LIBCPP_STD_VER >= 20 && __has_builtin(__builtin_source_location) #if _LIBCPP_STD_VER >= 20 && __has_builtin(__builtin_source_location) && \
!(defined(_LIBCPP_APPLE_CLANG_VER) && _LIBCPP_APPLE_CLANG_VER <= 1403)
class source_location { class source_location {
// The names source_location::__impl, _M_file_name, _M_function_name, _M_line, and _M_column // The names source_location::__impl, _M_file_name, _M_function_name, _M_line, and _M_column
// are hard-coded in the compiler and must not be changed here. // are hard-coded in the compiler and must not be changed here.
struct __impl { struct __impl {
const char* _M_file_name; const char* _M_file_name;
const char* _M_function_name; const char* _M_function_name;
unsigned _M_line; unsigned _M_line;
Show All 26 Linespublic:
_LIBCPP_HIDE_FROM_ABI constexpr const char* file_name() const noexcept { _LIBCPP_HIDE_FROM_ABI constexpr const char* file_name() const noexcept {
return __ptr_ != nullptr ? __ptr_->_M_file_name : ""; return __ptr_ != nullptr ? __ptr_->_M_file_name : "";
} }
_LIBCPP_HIDE_FROM_ABI constexpr const char* function_name() const noexcept { _LIBCPP_HIDE_FROM_ABI constexpr const char* function_name() const noexcept {
return __ptr_ != nullptr ? __ptr_->_M_function_name : ""; return __ptr_ != nullptr ? __ptr_->_M_function_name : "";
} }
}; };
#endif // _LIBCPP_STD_VER >= 20 && __has_builtin(__builtin_source_location) #endif // _LIBCPP_STD_VER >= 20 && __has_builtin(__builtin_source_location) && !(defined(_LIBCPP_APPLE_CLANG_VER) &&
// _LIBCPP_APPLE_CLANG_VER <= 1403)
_LIBCPP_END_NAMESPACE_STD _LIBCPP_END_NAMESPACE_STD
#endif // _LIBCPP_SOURCE_LOCATION #endif // _LIBCPP_SOURCE_LOCATION

libcxx/include/version

Show First 20 Lines • Show All 362 Lines • ▼ Show 20 Lines
# define __cpp_lib_remove_cvref 201711L # define __cpp_lib_remove_cvref 201711L
# if !defined(_LIBCPP_HAS_NO_THREADS) && !defined(_LIBCPP_AVAILABILITY_DISABLE_FTM___cpp_lib_semaphore) # if !defined(_LIBCPP_HAS_NO_THREADS) && !defined(_LIBCPP_AVAILABILITY_DISABLE_FTM___cpp_lib_semaphore)
# define __cpp_lib_semaphore 201907L # define __cpp_lib_semaphore 201907L
# endif # endif
# undef __cpp_lib_shared_ptr_arrays # undef __cpp_lib_shared_ptr_arrays
# define __cpp_lib_shared_ptr_arrays 201707L # define __cpp_lib_shared_ptr_arrays 201707L
# define __cpp_lib_shift 201806L # define __cpp_lib_shift 201806L
// # define __cpp_lib_smart_ptr_for_overwrite 202002L // # define __cpp_lib_smart_ptr_for_overwrite 202002L
# if __has_builtin(__builtin_source_location) # if __has_builtin(__builtin_source_location) && !(defined(_LIBCPP_APPLE_CLANG_VER) && _LIBCPP_APPLE_CLANG_VER <= 1403)
# define __cpp_lib_source_location 201907L # define __cpp_lib_source_location 201907L
# endif # endif
# define __cpp_lib_span 202002L # define __cpp_lib_span 202002L
# define __cpp_lib_ssize 201902L # define __cpp_lib_ssize 201902L
# define __cpp_lib_starts_ends_with 201711L # define __cpp_lib_starts_ends_with 201711L
# undef __cpp_lib_string_view # undef __cpp_lib_string_view
# define __cpp_lib_string_view 201803L # define __cpp_lib_string_view 201803L
// # define __cpp_lib_syncbuf 201803L // # define __cpp_lib_syncbuf 201803L
▲ Show 20 Lines • Show All 49 Lines • Show Last 20 Lines

libcxx/test/std/language.support/support.limits/support.limits.general/source_location.version.compile.pass.cpp

Show All 36 Lines
#elif TEST_STD_VER == 17 #elif TEST_STD_VER == 17
# ifdef __cpp_lib_source_location # ifdef __cpp_lib_source_location
# error "__cpp_lib_source_location should not be defined before c++20" # error "__cpp_lib_source_location should not be defined before c++20"
# endif # endif
#elif TEST_STD_VER == 20 #elif TEST_STD_VER == 20
# if __has_builtin(__builtin_source_location) # if __has_builtin(__builtin_source_location) && !(defined(TEST_APPLE_CLANG_VER) && TEST_APPLE_CLANG_VER <= 1403)
# ifndef __cpp_lib_source_location # ifndef __cpp_lib_source_location
# error "__cpp_lib_source_location should be defined in c++20" # error "__cpp_lib_source_location should be defined in c++20"
# endif # endif
# if __cpp_lib_source_location != 201907L # if __cpp_lib_source_location != 201907L
# error "__cpp_lib_source_location should have the value 201907L in c++20" # error "__cpp_lib_source_location should have the value 201907L in c++20"
# endif # endif
# else # else
# ifdef __cpp_lib_source_location # ifdef __cpp_lib_source_location
# error "__cpp_lib_source_location should not be defined when the requirement '__has_builtin(__builtin_source_location)' is not met!" # error "__cpp_lib_source_location should not be defined when the requirement '__has_builtin(__builtin_source_location) && !(defined(TEST_APPLE_CLANG_VER) && TEST_APPLE_CLANG_VER <= 1403)' is not met!"
# endif # endif
# endif # endif
#elif TEST_STD_VER > 20 #elif TEST_STD_VER > 20
# if __has_builtin(__builtin_source_location) # if __has_builtin(__builtin_source_location) && !(defined(TEST_APPLE_CLANG_VER) && TEST_APPLE_CLANG_VER <= 1403)
# ifndef __cpp_lib_source_location # ifndef __cpp_lib_source_location
# error "__cpp_lib_source_location should be defined in c++2b" # error "__cpp_lib_source_location should be defined in c++2b"
# endif # endif
# if __cpp_lib_source_location != 201907L # if __cpp_lib_source_location != 201907L
# error "__cpp_lib_source_location should have the value 201907L in c++2b" # error "__cpp_lib_source_location should have the value 201907L in c++2b"
# endif # endif
# else # else
# ifdef __cpp_lib_source_location # ifdef __cpp_lib_source_location
# error "__cpp_lib_source_location should not be defined when the requirement '__has_builtin(__builtin_source_location)' is not met!" # error "__cpp_lib_source_location should not be defined when the requirement '__has_builtin(__builtin_source_location) && !(defined(TEST_APPLE_CLANG_VER) && TEST_APPLE_CLANG_VER <= 1403)' is not met!"
# endif # endif
# endif # endif
#endif // TEST_STD_VER > 20 #endif // TEST_STD_VER > 20

libcxx/test/std/language.support/support.limits/support.limits.general/version.version.compile.pass.cpp

Show First 20 Lines • Show All 3,422 Lines • ▼ Show 20 Lines
# error "__cpp_lib_smart_ptr_for_overwrite should have the value 202002L in c++20" # error "__cpp_lib_smart_ptr_for_overwrite should have the value 202002L in c++20"
# endif # endif
# else // _LIBCPP_VERSION # else // _LIBCPP_VERSION
# ifdef __cpp_lib_smart_ptr_for_overwrite # ifdef __cpp_lib_smart_ptr_for_overwrite
# error "__cpp_lib_smart_ptr_for_overwrite should not be defined because it is unimplemented in libc++!" # error "__cpp_lib_smart_ptr_for_overwrite should not be defined because it is unimplemented in libc++!"
# endif # endif
# endif # endif
# if __has_builtin(__builtin_source_location) # if __has_builtin(__builtin_source_location) && !(defined(TEST_APPLE_CLANG_VER) && TEST_APPLE_CLANG_VER <= 1403)
# ifndef __cpp_lib_source_location # ifndef __cpp_lib_source_location
# error "__cpp_lib_source_location should be defined in c++20" # error "__cpp_lib_source_location should be defined in c++20"
# endif # endif
# if __cpp_lib_source_location != 201907L # if __cpp_lib_source_location != 201907L
# error "__cpp_lib_source_location should have the value 201907L in c++20" # error "__cpp_lib_source_location should have the value 201907L in c++20"
# endif # endif
# else # else
# ifdef __cpp_lib_source_location # ifdef __cpp_lib_source_location
# error "__cpp_lib_source_location should not be defined when the requirement '__has_builtin(__builtin_source_location)' is not met!" # error "__cpp_lib_source_location should not be defined when the requirement '__has_builtin(__builtin_source_location) && !(defined(TEST_APPLE_CLANG_VER) && TEST_APPLE_CLANG_VER <= 1403)' is not met!"
# endif # endif
# endif # endif
# ifndef __cpp_lib_span # ifndef __cpp_lib_span
# error "__cpp_lib_span should be defined in c++20" # error "__cpp_lib_span should be defined in c++20"
# endif # endif
# if __cpp_lib_span != 202002L # if __cpp_lib_span != 202002L
# error "__cpp_lib_span should have the value 202002L in c++20" # error "__cpp_lib_span should have the value 202002L in c++20"
▲ Show 20 Lines • Show All 1,322 Lines • ▼ Show 20 Lines
# error "__cpp_lib_smart_ptr_for_overwrite should have the value 202002L in c++2b" # error "__cpp_lib_smart_ptr_for_overwrite should have the value 202002L in c++2b"
# endif # endif
# else // _LIBCPP_VERSION # else // _LIBCPP_VERSION
# ifdef __cpp_lib_smart_ptr_for_overwrite # ifdef __cpp_lib_smart_ptr_for_overwrite
# error "__cpp_lib_smart_ptr_for_overwrite should not be defined because it is unimplemented in libc++!" # error "__cpp_lib_smart_ptr_for_overwrite should not be defined because it is unimplemented in libc++!"
# endif # endif
# endif # endif
# if __has_builtin(__builtin_source_location) # if __has_builtin(__builtin_source_location) && !(defined(TEST_APPLE_CLANG_VER) && TEST_APPLE_CLANG_VER <= 1403)
# ifndef __cpp_lib_source_location # ifndef __cpp_lib_source_location
# error "__cpp_lib_source_location should be defined in c++2b" # error "__cpp_lib_source_location should be defined in c++2b"
# endif # endif
# if __cpp_lib_source_location != 201907L # if __cpp_lib_source_location != 201907L
# error "__cpp_lib_source_location should have the value 201907L in c++2b" # error "__cpp_lib_source_location should have the value 201907L in c++2b"
# endif # endif
# else # else
# ifdef __cpp_lib_source_location # ifdef __cpp_lib_source_location
# error "__cpp_lib_source_location should not be defined when the requirement '__has_builtin(__builtin_source_location)' is not met!" # error "__cpp_lib_source_location should not be defined when the requirement '__has_builtin(__builtin_source_location) && !(defined(TEST_APPLE_CLANG_VER) && TEST_APPLE_CLANG_VER <= 1403)' is not met!"
# endif # endif
# endif # endif
# ifndef __cpp_lib_span # ifndef __cpp_lib_span
# error "__cpp_lib_span should be defined in c++2b" # error "__cpp_lib_span should be defined in c++2b"
# endif # endif
# if __cpp_lib_span != 202002L # if __cpp_lib_span != 202002L
# error "__cpp_lib_span should have the value 202002L in c++2b" # error "__cpp_lib_span should have the value 202002L in c++2b"
▲ Show 20 Lines • Show All 223 Lines • Show Last 20 Lines

libcxx/test/support/test_macros.h

Show First 20 Lines • Show All 72 Lines • ▼ Show 20 Lines
# endif # endif
#elif defined(_MSC_VER) #elif defined(_MSC_VER)
# define TEST_COMPILER_MSVC # define TEST_COMPILER_MSVC
#elif defined(__GNUC__) #elif defined(__GNUC__)
# define TEST_COMPILER_GCC # define TEST_COMPILER_GCC
#endif #endif
#if defined(__apple_build_version__) #if defined(__apple_build_version__)
#define TEST_APPLE_CLANG_VER (__clang_major__ * 100) + __clang_minor__ // Given AppleClang XX.Y.Z, TEST_APPLE_CLANG_VER is XXYZ (e.g. AppleClang 14.0.3 => 1403)
#define TEST_APPLE_CLANG_VER (__apple_build_version__ / 10000)
#elif defined(__clang_major__) #elif defined(__clang_major__)
#define TEST_CLANG_VER (__clang_major__ * 100) + __clang_minor__ #define TEST_CLANG_VER (__clang_major__ * 100) + __clang_minor__
#elif defined(__GNUC__) #elif defined(__GNUC__)
// Given GCC XX.YY.ZZ, TEST_GCC_VER is XXYYZZ // Given GCC XX.YY.ZZ, TEST_GCC_VER is XXYYZZ
#define TEST_GCC_VER ((__GNUC__ * 10000) + (__GNUC_MINOR__ * 100) + __GNUC_PATCHLEVEL__) #define TEST_GCC_VER ((__GNUC__ * 10000) + (__GNUC_MINOR__ * 100) + __GNUC_PATCHLEVEL__)
#endif #endif
/* Make a nice name for the standard version */ /* Make a nice name for the standard version */
▲ Show 20 Lines • Show All 351 Lines • Show Last 20 Lines

libcxx/utils/generate_feature_test_macro_components.py

Show First 20 Lines • Show All 644 Lines • ▼ Show 20 Linesfeature_test_macros = [ add_version_header(x) for x in [
"name": "__cpp_lib_smart_ptr_for_overwrite", "name": "__cpp_lib_smart_ptr_for_overwrite",
"values": { "c++20": 202002 }, "values": { "c++20": 202002 },
"headers": ["memory"], "headers": ["memory"],
"unimplemented": True, "unimplemented": True,
}, { }, {
"name": "__cpp_lib_source_location", "name": "__cpp_lib_source_location",
"values": { "c++20": 201907 }, "values": { "c++20": 201907 },
"headers": ["source_location"], "headers": ["source_location"],
"test_suite_guard": "__has_builtin(__builtin_source_location)", "test_suite_guard": "__has_builtin(__builtin_source_location) && !(defined(TEST_APPLE_CLANG_VER) && TEST_APPLE_CLANG_VER <= 1403)",
"libcxx_guard": "__has_builtin(__builtin_source_location)", "libcxx_guard": "__has_builtin(__builtin_source_location) && !(defined(_LIBCPP_APPLE_CLANG_VER) && _LIBCPP_APPLE_CLANG_VER <= 1403)",
}, { }, {
"name": "__cpp_lib_span", "name": "__cpp_lib_span",
"values": { "c++20": 202002 }, "values": { "c++20": 202002 },
"headers": ["span"], "headers": ["span"],
}, { }, {
"name": "__cpp_lib_spanstream", "name": "__cpp_lib_spanstream",
"values": { "c++2b": 202106 }, "values": { "c++2b": 202106 },
"headers": ["spanstream"], "headers": ["spanstream"],
▲ Show 20 Lines • Show All 566 Lines • Show Last 20 Lines