[libc++] Fix check for _LIBCPP_HAS_NO_WIDE_CHARACTERS in features.py #131675
Conversation
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
The patch that added the new locale Lit features was created before we switched to a 0-1 macro for _LIBCPP_HAS_WIDE_CHARACTERS, leading to that patch referring to the obsolete _LIBCPP_HAS_NO_WIDE_CHARACTERS macro that is never defined nowadays.
llvmbot
added
the
libc++
|
@llvm/pr-subscribers-libcxx Author: Louis Dionne (ldionne) ChangesThe patch that added the new locale Lit features was created before we switched to a 0-1 macro for _LIBCPP_HAS_WIDE_CHARACTERS, leading to that patch referring to the obsolete _LIBCPP_HAS_NO_WIDE_CHARACTERS macro that is never defined nowadays. Full diff: https://github.com/llvm/llvm-project/pull/131675.diff 1 Files Affected:
diff --git a/libcxx/utils/libcxx/test/features.py b/libcxx/utils/libcxx/test/features.py
index a83dcd16b16f8..10fc4b0afde6b 100644
--- a/libcxx/utils/libcxx/test/features.py
+++ b/libcxx/utils/libcxx/test/features.py
@@ -440,7 +440,8 @@ def _mingwSupportsModules(cfg):
cfg, locale, alts, provide_locale_conversions[locale]
)
if locale in provide_locale_conversions
- and "_LIBCPP_HAS_NO_WIDE_CHARACTERS" not in compilerMacros(cfg)
+ and ("_LIBCPP_HAS_WIDE_CHARACTERS" not in compilerMacros(cfg) or
+ compilerMacros(cfg)["_LIBCPP_HAS_WIDE_CHARACTERS"] == "1")
else [],
),
)
|
You can test this locally with the following command:darker --check --diff -r 24e88b0e6bc04f16d7353ad9ef07398836adf244...303b8c45b468e5f9d13eb2f04e4feeadccec3ae3 libcxx/utils/libcxx/test/features.pyView the diff from darker here.--- features.py 2025-03-17 21:30:45.000000 +0000
+++ features.py 2025-03-17 21:35:53.863524 +0000
@@ -438,12 +438,14 @@
when=lambda cfg, alts=alts: hasAnyLocale(cfg, alts),
actions=lambda cfg, locale=locale, alts=alts: _getLocaleFlagsAction(
cfg, locale, alts, provide_locale_conversions[locale]
)
if locale in provide_locale_conversions
- and ("_LIBCPP_HAS_WIDE_CHARACTERS" not in compilerMacros(cfg) or
- compilerMacros(cfg)["_LIBCPP_HAS_WIDE_CHARACTERS"] == "1")
+ and (
+ "_LIBCPP_HAS_WIDE_CHARACTERS" not in compilerMacros(cfg)
+ or compilerMacros(cfg)["_LIBCPP_HAS_WIDE_CHARACTERS"] == "1"
+ )
else [],
),
)
|
mstorsjo
pushed a commit
to mstorsjo/llvm-project
that referenced
this pull request
May 11, 2025
…lvm#131675) The patch that added the new locale Lit features was created before we switched to a 0-1 macro for _LIBCPP_HAS_WIDE_CHARACTERS, leading to that patch referring to the obsolete _LIBCPP_HAS_NO_WIDE_CHARACTERS macro that is never defined nowadays. (cherry picked from commit 297f6d9)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The patch that added the new locale Lit features was created before we switched to a 0-1 macro for _LIBCPP_HAS_WIDE_CHARACTERS, leading to that patch referring to the obsolete _LIBCPP_HAS_NO_WIDE_CHARACTERS macro that is never defined nowadays.