This is an archive of the discontinued LLVM Phabricator instance.

Differential D108709

[libc++] Fix incorrect bypassing of <wctype.h>
ClosedPublic

Authored by ldionne on Aug 25 2021, 9:28 AM.

Details

Reviewers
ldionne
Group Reviewers
Restricted Project
Commits
rGa4357bc496d0: [libc++] Fix incorrect bypassing of <wctype.h>

Diff Detail

Unit TestsFailed

TimeTest
240 mslibcxx CI C++03 > libcxx-trunk-shared.std/strings/c_strings::cwctype.pass.cpp
190 mslibcxx CI C++11 > libcxx-trunk-shared.std/strings/c_strings::cwctype.pass.cpp
190 mslibcxx CI C++14 > libcxx-trunk-shared.std/strings/c_strings::cwctype.pass.cpp
180 mslibcxx CI C++17 > libcxx-trunk-shared.std/strings/c_strings::cwctype.pass.cpp
230 mslibcxx CI C++20 > libcxx-trunk-shared.std/strings/c_strings::cwctype.pass.cpp
View Full Test Results (7 Failed)

Event Timeline

ldionne requested review of this revision.Aug 25 2021, 9:28 AM
ldionne created this revision.
Herald added a project: Restricted Project. · View Herald TranscriptAug 25 2021, 9:28 AM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Herald added a subscriber: libcxx-commits. · View Herald Transcript
Harbormaster completed remote builds in B121187: Diff 368669.Aug 25 2021, 10:04 AM
ldionne updated this revision to Diff 368868.Aug 26 2021, 7:02 AM

Fix typo

Harbormaster completed remote builds in B121340: Diff 368868.Aug 26 2021, 8:41 AM
ldionne accepted this revision.Aug 26 2021, 10:26 AM
This revision is now accepted and ready to land.Aug 26 2021, 10:26 AM
Closed by commit rGa4357bc496d0: [libc++] Fix incorrect bypassing of <wctype.h> (authored by ldionne). · Explain WhyAug 26 2021, 10:26 AM
This revision was automatically updated to reflect the committed changes.
ldionne added a commit: rGa4357bc496d0: [libc++] Fix incorrect bypassing of <wctype.h>.

Revision Contents

PathSize
libcxx/
include/
2 lines
10 lines

Diff 368669

libcxx/include/cwctype

Show First 20 Lines • Show All 53 Lines • ▼ Show 20 Lines
#include <wctype.h> #include <wctype.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
#if defined(_LIBCPP_INCLUDED_C_LIBRARY_WCTYPE_H)
using ::wint_t _LIBCPP_USING_IF_EXISTS; using ::wint_t _LIBCPP_USING_IF_EXISTS;
using ::wctrans_t _LIBCPP_USING_IF_EXISTS; using ::wctrans_t _LIBCPP_USING_IF_EXISTS;
using ::wctype_t _LIBCPP_USING_IF_EXISTS; using ::wctype_t _LIBCPP_USING_IF_EXISTS;
using ::iswalnum _LIBCPP_USING_IF_EXISTS; using ::iswalnum _LIBCPP_USING_IF_EXISTS;
using ::iswalpha _LIBCPP_USING_IF_EXISTS; using ::iswalpha _LIBCPP_USING_IF_EXISTS;
using ::iswblank _LIBCPP_USING_IF_EXISTS; using ::iswblank _LIBCPP_USING_IF_EXISTS;
using ::iswcntrl _LIBCPP_USING_IF_EXISTS; using ::iswcntrl _LIBCPP_USING_IF_EXISTS;
using ::iswdigit _LIBCPP_USING_IF_EXISTS; using ::iswdigit _LIBCPP_USING_IF_EXISTS;
using ::iswgraph _LIBCPP_USING_IF_EXISTS; using ::iswgraph _LIBCPP_USING_IF_EXISTS;
using ::iswlower _LIBCPP_USING_IF_EXISTS; using ::iswlower _LIBCPP_USING_IF_EXISTS;
using ::iswprint _LIBCPP_USING_IF_EXISTS; using ::iswprint _LIBCPP_USING_IF_EXISTS;
using ::iswpunct _LIBCPP_USING_IF_EXISTS; using ::iswpunct _LIBCPP_USING_IF_EXISTS;
using ::iswspace _LIBCPP_USING_IF_EXISTS; using ::iswspace _LIBCPP_USING_IF_EXISTS;
using ::iswupper _LIBCPP_USING_IF_EXISTS; using ::iswupper _LIBCPP_USING_IF_EXISTS;
using ::iswxdigit _LIBCPP_USING_IF_EXISTS; using ::iswxdigit _LIBCPP_USING_IF_EXISTS;
using ::iswctype _LIBCPP_USING_IF_EXISTS; using ::iswctype _LIBCPP_USING_IF_EXISTS;
using ::wctype _LIBCPP_USING_IF_EXISTS; using ::wctype _LIBCPP_USING_IF_EXISTS;
using ::towlower _LIBCPP_USING_IF_EXISTS; using ::towlower _LIBCPP_USING_IF_EXISTS;
using ::towupper _LIBCPP_USING_IF_EXISTS; using ::towupper _LIBCPP_USING_IF_EXISTS;
using ::towctrans _LIBCPP_USING_IF_EXISTS; using ::towctrans _LIBCPP_USING_IF_EXISTS;
using ::wctrans _LIBCPP_USING_IF_EXISTS; using ::wctrans _LIBCPP_USING_IF_EXISTS;
#endif // _LIBCPP_INCLUDED_C_LIBRARY_WCTYPE_H
_LIBCPP_END_NAMESPACE_STD _LIBCPP_END_NAMESPACE_STD
#endif // _LIBCPP_CWCTYPE #endif // _LIBCPP_CWCTYPE

libcxx/include/wctype.h

Show First 20 Lines • Show All 44 Lines • ▼ Show 20 Lines
*/ */
#include <__config> #include <__config>
#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
// TODO:
// In the future, we should unconditionally include_next <wctype.h> here and instead
// have a mode under which the library does not need libc++'s <wctype.h> or <cwctype>
// at all (i.e. a mode without wchar_t). As it stands, we need to do that to completely
// bypass the using declarations in <cwctype> when we did not include <wctype.h>.
// Otherwise, a using declaration like `using ::wint_t` in <cwctype> will refer to
// nothing (with using_if_exists), and if we include another header that defines one
// of these declarations (e.g. <wchar.h>), the second `using ::wint_t` with using_if_exists
// will fail because it does not refer to the same declaration.
#if __has_include_next(<wctype.h>) #if __has_include_next(<wctype.h>)
# include_next <wctype.h> # include_next <wctype.h>
# define _LIBCPP_INCLUDED_WCTYPE_H
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
#undef iswalnum #undef iswalnum
#undef iswalpha #undef iswalpha
#undef iswblank #undef iswblank
#undef iswcntrl #undef iswcntrl
Show All 18 Lines