-
Notifications
You must be signed in to change notification settings - Fork 14.4k
[libc++] Fix wchar.h to work with modules #146630
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
matts1
wants to merge
1
commit into
llvm:main
Choose a base branch
from
matts1:wchar
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,105 @@ | ||
| // -*- C++ -*- | ||
| //===----------------------------------------------------------------------===// | ||
| // | ||
| // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. | ||
| // See https://llvm.org/LICENSE.txt for license information. | ||
| // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception | ||
| // | ||
| //===----------------------------------------------------------------------===// | ||
|
|
||
| // Lack of header guards is intentional. | ||
| // This file should only ever be included by wchar.h, which provides its own | ||
| // header guard. This prevents macro hiding issues with modules where cwchar | ||
| // complains that _LIBCPP_WCHAR_H isn't present. | ||
|
|
||
| #include <__config> | ||
| #include <__mbstate_t.h> // provide mbstate_t | ||
| #include <stddef.h> // provide size_t | ||
|
|
||
| // include_next doesn't work with modules. | ||
| #if __has_include_next(<wchar.h>) | ||
| # define _LIBCPP_INCLUDE_NEXT_WCHAR | ||
| # include_next <wchar.h> | ||
| # undef _LIBCPP_INCLUDE_NEXT_WCHAR | ||
| #endif | ||
|
|
||
| // Determine whether we have const-correct overloads for wcschr and friends. | ||
| #if defined(_WCHAR_H_CPLUSPLUS_98_CONFORMANCE_) | ||
| # define _LIBCPP_WCHAR_H_HAS_CONST_OVERLOADS 1 | ||
| #elif defined(__GLIBC_PREREQ) | ||
| # if __GLIBC_PREREQ(2, 10) | ||
| # define _LIBCPP_WCHAR_H_HAS_CONST_OVERLOADS 1 | ||
| # endif | ||
| #elif defined(_LIBCPP_MSVCRT) | ||
| # if defined(_CRT_CONST_CORRECT_OVERLOADS) | ||
| # define _LIBCPP_WCHAR_H_HAS_CONST_OVERLOADS 1 | ||
| # endif | ||
| #endif | ||
|
|
||
| #if _LIBCPP_HAS_WIDE_CHARACTERS | ||
| # if defined(__cplusplus) && !defined(_LIBCPP_WCHAR_H_HAS_CONST_OVERLOADS) && defined(_LIBCPP_PREFERRED_OVERLOAD) | ||
| extern "C++" { | ||
| inline _LIBCPP_HIDE_FROM_ABI wchar_t* __libcpp_wcschr(const wchar_t* __s, wchar_t __c) { | ||
| return (wchar_t*)wcschr(__s, __c); | ||
| } | ||
| inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_PREFERRED_OVERLOAD const wchar_t* wcschr(const wchar_t* __s, wchar_t __c) { | ||
| return __libcpp_wcschr(__s, __c); | ||
| } | ||
| inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_PREFERRED_OVERLOAD wchar_t* wcschr(wchar_t* __s, wchar_t __c) { | ||
| return __libcpp_wcschr(__s, __c); | ||
| } | ||
|
|
||
| inline _LIBCPP_HIDE_FROM_ABI wchar_t* __libcpp_wcspbrk(const wchar_t* __s1, const wchar_t* __s2) { | ||
| return (wchar_t*)wcspbrk(__s1, __s2); | ||
| } | ||
| inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_PREFERRED_OVERLOAD const wchar_t* | ||
| wcspbrk(const wchar_t* __s1, const wchar_t* __s2) { | ||
| return __libcpp_wcspbrk(__s1, __s2); | ||
| } | ||
| inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_PREFERRED_OVERLOAD wchar_t* wcspbrk(wchar_t* __s1, const wchar_t* __s2) { | ||
| return __libcpp_wcspbrk(__s1, __s2); | ||
| } | ||
|
|
||
| inline _LIBCPP_HIDE_FROM_ABI wchar_t* __libcpp_wcsrchr(const wchar_t* __s, wchar_t __c) { | ||
| return (wchar_t*)wcsrchr(__s, __c); | ||
| } | ||
| inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_PREFERRED_OVERLOAD const wchar_t* wcsrchr(const wchar_t* __s, wchar_t __c) { | ||
| return __libcpp_wcsrchr(__s, __c); | ||
| } | ||
| inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_PREFERRED_OVERLOAD wchar_t* wcsrchr(wchar_t* __s, wchar_t __c) { | ||
| return __libcpp_wcsrchr(__s, __c); | ||
| } | ||
|
|
||
| inline _LIBCPP_HIDE_FROM_ABI wchar_t* __libcpp_wcsstr(const wchar_t* __s1, const wchar_t* __s2) { | ||
| return (wchar_t*)wcsstr(__s1, __s2); | ||
| } | ||
| inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_PREFERRED_OVERLOAD const wchar_t* | ||
| wcsstr(const wchar_t* __s1, const wchar_t* __s2) { | ||
| return __libcpp_wcsstr(__s1, __s2); | ||
| } | ||
| inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_PREFERRED_OVERLOAD wchar_t* wcsstr(wchar_t* __s1, const wchar_t* __s2) { | ||
| return __libcpp_wcsstr(__s1, __s2); | ||
| } | ||
|
|
||
| inline _LIBCPP_HIDE_FROM_ABI wchar_t* __libcpp_wmemchr(const wchar_t* __s, wchar_t __c, size_t __n) { | ||
| return (wchar_t*)wmemchr(__s, __c, __n); | ||
| } | ||
| inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_PREFERRED_OVERLOAD const wchar_t* | ||
| wmemchr(const wchar_t* __s, wchar_t __c, size_t __n) { | ||
| return __libcpp_wmemchr(__s, __c, __n); | ||
| } | ||
| inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_PREFERRED_OVERLOAD wchar_t* wmemchr(wchar_t* __s, wchar_t __c, size_t __n) { | ||
| return __libcpp_wmemchr(__s, __c, __n); | ||
| } | ||
| } | ||
| # endif | ||
|
|
||
| # if defined(__cplusplus) && (defined(_LIBCPP_MSVCRT_LIKE) || defined(__MVS__)) | ||
| extern "C" { | ||
| size_t mbsnrtowcs( | ||
| wchar_t* __restrict __dst, const char** __restrict __src, size_t __nmc, size_t __len, mbstate_t* __restrict __ps); | ||
| size_t wcsnrtombs( | ||
| char* __restrict __dst, const wchar_t** __restrict __src, size_t __nwc, size_t __len, mbstate_t* __restrict __ps); | ||
| } // extern "C" | ||
| # endif // __cplusplus && (_LIBCPP_MSVCRT || __MVS__) | ||
| #endif // _LIBCPP_HAS_WIDE_CHARACTERS | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This and below are not definition, but they also need to be here?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These ones don't strictly need to be here, but unless something relies on macros that can be set by the includer, it should prefer to be non-textual (this relies on macros set in __config).
So if we're going to the effort of moving the definitions, we might as well move this.