LineageOS/android_external_libcxx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

disable use of __builtin_memcmp temporarily to get the tests passing again

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@291742 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Marshall Clow
2017-01-12 05:40:58 +00:00
parent ce921fa962
commit d704617793
1 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
include/__string
View File

@@ -209,9 +209,8 @@ struct _LIBCPP_TEMPLATE_VIS char_traits<char>
static inline _LIBCPP_CONSTEXPR bool lt(char_type __c1, char_type __c2) _NOEXCEPT static inline _LIBCPP_CONSTEXPR bool lt(char_type __c1, char_type __c2) _NOEXCEPT
{return (unsigned char)__c1 < (unsigned char)__c2;} {return (unsigned char)__c1 < (unsigned char)__c2;}
static inline _LIBCPP_CONSTEXPR_AFTER_CXX14 static _LIBCPP_CONSTEXPR_AFTER_CXX14
int compare(const char_type* __s1, const char_type* __s2, size_t __n) _NOEXCEPT int compare(const char_type* __s1, const char_type* __s2, size_t __n) _NOEXCEPT;
{return __n == 0 ? 0 : __builtin_memcmp(__s1, __s2, __n);}
static inline size_t _LIBCPP_CONSTEXPR_AFTER_CXX14 static inline size_t _LIBCPP_CONSTEXPR_AFTER_CXX14
length(const char_type* __s) _NOEXCEPT {return __builtin_strlen(__s);} length(const char_type* __s) _NOEXCEPT {return __builtin_strlen(__s);}
static _LIBCPP_CONSTEXPR_AFTER_CXX14 static _LIBCPP_CONSTEXPR_AFTER_CXX14
@@ -238,6 +237,28 @@ struct _LIBCPP_TEMPLATE_VIS char_traits<char>
{return int_type(EOF);} {return int_type(EOF);}
}; };
inline _LIBCPP_CONSTEXPR_AFTER_CXX14
int
char_traits<char>::compare(const char_type* __s1, const char_type* __s2, size_t __n) _NOEXCEPT
{
if (__n == 0)
return 0;
#ifdef _LIBCPP_BUILTIN_MEMCMP_ISCONSTEXPR
return __builtin_memcmp(__s1, __s2, __n);
#elif _LIBCPP_STD_VER <= 14
return memcmp(__s1, __s2, __n);
#else
for (; __n; --__n, ++__s1, ++__s2)
{
if (lt(*__s1, *__s2))
return -1;
if (lt(*__s2, *__s1))
return 1;
}
return 0;
#endif
}
inline _LIBCPP_CONSTEXPR_AFTER_CXX14 inline _LIBCPP_CONSTEXPR_AFTER_CXX14
const char* const char*
char_traits<char>::find(const char_type* __s, size_t __n, const char_type& __a) _NOEXCEPT char_traits<char>::find(const char_type* __s, size_t __n, const char_type& __a) _NOEXCEPT