This is an archive of the discontinued LLVM Phabricator instance.

Differential D111492

[libc++] DO NOT REVIEW FOR TESTING ONLY
AbandonedPublic

Authored by Mordante on Oct 9 2021, 7:35 AM.

Details

Reviewers
ldionne
Group Reviewers
Restricted Project
Summary

The fixes the build errors in D111265 on my local machine.
This patch is only to trigger a CI run and will be abandoned.

Depends on D111265

Diff Detail

Unit TestsFailed

TimeTest
1,290 mslibcxx CI No wide characters > llvm-libc++-shared-cfg-in.std/strings/string_view/string_view_cons::deduct.pass.cpp
1,430 mslibcxx CI No wide characters > llvm-libc++-shared-cfg-in.std/strings/string_view/string_view_cons::from_iterator_sentinel.pass.cpp

Event Timeline

Mordante requested review of this revision.Oct 9 2021, 7:35 AM
Mordante created this revision.
Herald added a project: Restricted Project. · View Herald TranscriptOct 9 2021, 7:35 AM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Herald added a subscriber: libcxx-commits. · View Herald Transcript
Mordante mentioned this in D111265: [libc++] Add an option to disable wide character support in libc++.Oct 9 2021, 7:41 AM
Harbormaster completed remote builds in B127939: Diff 378450.Oct 9 2021, 9:14 AM
Mordante abandoned this revision.Oct 9 2021, 9:25 AM

@ldionne It seems two tests are failing and they indeed use wchar_t. So it seems this patch provides a usable "no wide char" library on Linux. Feel free to use this patch as basis to fix D111265.

Revision Contents

PathSize
libcxx/
include/
8 lines
2 lines

Diff 378450

libcxx/include/__bsd_locale_fallbacks.h

Show All 17 Lines
#include <stdlib.h> #include <stdlib.h>
#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
#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
inline _LIBCPP_INLINE_VISIBILITY inline _LIBCPP_INLINE_VISIBILITY
decltype(MB_CUR_MAX) __libcpp_mb_cur_max_l(locale_t __l) decltype(MB_CUR_MAX) __libcpp_mb_cur_max_l(locale_t __l)
{ {
__libcpp_locale_guard __current(__l); __libcpp_locale_guard __current(__l);
return MB_CUR_MAX; return MB_CUR_MAX;
} }
inline _LIBCPP_INLINE_VISIBILITY inline _LIBCPP_INLINE_VISIBILITY
▲ Show 20 Lines • Show All 49 Lines • ▼ Show 20 Lines
} }
inline _LIBCPP_INLINE_VISIBILITY inline _LIBCPP_INLINE_VISIBILITY
size_t __libcpp_mbrlen_l(const char *__s, size_t __n, mbstate_t *__ps, locale_t __l) size_t __libcpp_mbrlen_l(const char *__s, size_t __n, mbstate_t *__ps, locale_t __l)
{ {
__libcpp_locale_guard __current(__l); __libcpp_locale_guard __current(__l);
return mbrlen(__s, __n, __ps); return mbrlen(__s, __n, __ps);
} }
#endif
inline _LIBCPP_INLINE_VISIBILITY inline _LIBCPP_INLINE_VISIBILITY
lconv *__libcpp_localeconv_l(locale_t __l) lconv *__libcpp_localeconv_l(locale_t __l)
{ {
__libcpp_locale_guard __current(__l); __libcpp_locale_guard __current(__l);
return localeconv(); return localeconv();
} }
#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
inline _LIBCPP_INLINE_VISIBILITY inline _LIBCPP_INLINE_VISIBILITY
size_t __libcpp_mbsrtowcs_l(wchar_t *__dest, const char **__src, size_t __len, size_t __libcpp_mbsrtowcs_l(wchar_t *__dest, const char **__src, size_t __len,
mbstate_t *__ps, locale_t __l) mbstate_t *__ps, locale_t __l)
{ {
__libcpp_locale_guard __current(__l); __libcpp_locale_guard __current(__l);
return mbsrtowcs(__dest, __src, __len, __ps); return mbsrtowcs(__dest, __src, __len, __ps);
} }
#endif
inline inline
int __libcpp_snprintf_l(char *__s, size_t __n, locale_t __l, const char *__format, ...) { int __libcpp_snprintf_l(char *__s, size_t __n, locale_t __l, const char *__format, ...) {
va_list __va; va_list __va;
va_start(__va, __format); va_start(__va, __format);
__libcpp_locale_guard __current(__l); __libcpp_locale_guard __current(__l);
int __res = vsnprintf(__s, __n, __format, __va); int __res = vsnprintf(__s, __n, __format, __va);
va_end(__va); va_end(__va);
return __res; return __res;
Show All 25 Lines

libcxx/include/__mbstate_t.h

Show All 22 Lines
// types like std::fpos are defined in terms of mbstate_t. // types like std::fpos are defined in terms of mbstate_t.
// //
// This is a gruesome hack, but I don't know how to make it cleaner for // This is a gruesome hack, but I don't know how to make it cleaner for
// the time being. // the time being.
#ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS #ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
# include <wchar.h> // for mbstate_t # include <wchar.h> // for mbstate_t
#else #else
# include <sys/_types/_mbstate_t.h> // works on Darwin # include <bits/types/mbstate_t.h> // works on Linux
#endif #endif
_LIBCPP_BEGIN_NAMESPACE_STD _LIBCPP_BEGIN_NAMESPACE_STD
using ::mbstate_t _LIBCPP_USING_IF_EXISTS; using ::mbstate_t _LIBCPP_USING_IF_EXISTS;
_LIBCPP_END_NAMESPACE_STD _LIBCPP_END_NAMESPACE_STD
#endif // _LIBCPP___MBSTATE_T_H #endif // _LIBCPP___MBSTATE_T_H