Commit 67532646 authored by Martijn Vels's avatar Martijn Vels
Browse files

Add flag _LIBCPP_ABI_STRING_OPTIMIZED_EXTERNAL_INSTANTIATIONS for basic_string ABI 

Summary: This review is a mostly trivial change to use an explicit ABI flag for the unstable external template list. This follows the practice for an ABI flag per feature, and provides a spot for the rational / motivation for the flag.

Reviewers: EricWF, ldionne

Subscribers: dexonsmith, libcxx-commits

Tags: #libc

Differential Revision: https://reviews.llvm.org/D75457
parent 1d104f75

libcxx/include/__config

+3 −0
Original line number Diff line number Diff line
@@ -102,6 +102,9 @@ 
#  define _LIBCPP_ABI_OPTIMIZED_FUNCTION

// All the regex constants must be distinct and nonzero.

#  define _LIBCPP_ABI_REGEX_CONSTANTS_NONZERO

// Re-worked external template instantiations for std::string with a focus on

// performance and fast-path inlining.

#  define _LIBCPP_ABI_STRING_OPTIMIZED_EXTERNAL_INSTANTIATION

#elif _LIBCPP_ABI_VERSION == 1

#  if !defined(_LIBCPP_OBJECT_FORMAT_COFF)

// Enable compiling copies of now inline methods into the dylib to support

libcxx/include/string

+1 −1
Original line number Diff line number Diff line
@@ -4381,7 +4381,7 @@ basic_string<_CharT, _Traits, _Allocator>::__subscriptable(const const_iterator* 


#endif  // _LIBCPP_DEBUG_LEVEL >= 2



#if defined(_LIBCPP_ABI_UNSTABLE) || _LIBCPP_ABI_VERSION >= 2

#ifdef _LIBCPP_ABI_STRING_OPTIMIZED_EXTERNAL_INSTANTIATION

_LIBCPP_STRING_UNSTABLE_EXTERN_TEMPLATE_LIST(_LIBCPP_EXTERN_TEMPLATE, char)

_LIBCPP_STRING_UNSTABLE_EXTERN_TEMPLATE_LIST(_LIBCPP_EXTERN_TEMPLATE, wchar_t)

#else

libcxx/src/string.cpp

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD 


template class _LIBCPP_CLASS_TEMPLATE_INSTANTIATION_VIS __basic_string_common<true>;



#if defined(_LIBCPP_ABI_UNSTABLE) || _LIBCPP_ABI_VERSION >= 2

#ifdef _LIBCPP_ABI_STRING_OPTIMIZED_EXTERNAL_INSTANTIATION

_LIBCPP_STRING_UNSTABLE_EXTERN_TEMPLATE_LIST(_LIBCPP_EXTERN_TEMPLATE_DEFINE, char)

_LIBCPP_STRING_UNSTABLE_EXTERN_TEMPLATE_LIST(_LIBCPP_EXTERN_TEMPLATE_DEFINE, wchar_t)

#else