Skip to content

[libc++] Properly define _LIBCPP_HAS_NO_UNICODE in __config_site #95138

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

Merged
merged 4 commits into from
Jun 18, 2024

Conversation

ldionne
Copy link
Member

@ldionne ldionne commented Jun 11, 2024

Fixes #93638

@ldionne ldionne requested a review from a team as a code owner June 11, 2024 16:24
@llvmbot llvmbot added the libc++ libc++ C++ Standard Library. Not GNU libstdc++. Not libc++abi. label Jun 11, 2024
@llvmbot
Copy link
Member

llvmbot commented Jun 11, 2024

@llvm/pr-subscribers-libcxx

Author: Louis Dionne (ldionne)

Changes

Fixes #93638


Full diff: https://github.com/llvm/llvm-project/pull/95138.diff

1 Files Affected:

  • (modified) libcxx/include/__config_site.in (+1)
diff --git a/libcxx/include/__config_site.in b/libcxx/include/__config_site.in
index 89a14609ee3f9..67022146c9082 100644
--- a/libcxx/include/__config_site.in
+++ b/libcxx/include/__config_site.in
@@ -26,6 +26,7 @@
 #cmakedefine _LIBCPP_HAS_NO_FILESYSTEM
 #cmakedefine _LIBCPP_HAS_NO_RANDOM_DEVICE
 #cmakedefine _LIBCPP_HAS_NO_LOCALIZATION
+#cmakedefine _LIBCPP_HAS_NO_UNICODE
 #cmakedefine _LIBCPP_HAS_NO_WIDE_CHARACTERS
 #cmakedefine _LIBCPP_HAS_NO_STD_MODULES
 #cmakedefine _LIBCPP_HAS_NO_TIME_ZONE_DATABASE

Copy link
Member

@mordante mordante left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! LGTM!

@ldionne
Copy link
Member Author

ldionne commented Jun 13, 2024

@mordante , I am getting CI failures in

libcxx/test/libcxx/clang_tidy.gen.py
libcxx/test/libcxx/input.output/iostream.format/output.streams/ostream.formatted/ostream.formatted.print/vprint_unicode.pass.cpp
libcxx/test/libcxx/input.output/iostream.format/print.fun/transcoding.pass.cpp
libcxx/test/libcxx/input.output/iostream.format/print.fun/vprint_unicode_posix.pass.cpp
libcxx/test/libcxx/input.output/iostream.format/print.fun/vprint_unicode_windows.pass.cpp
libcxx/test/libcxx/utilities/format/format.functions/ascii.pass.cpp
libcxx/test/libcxx/utilities/format/format.functions/escaped_output.ascii.pass.cpp
libcxx/test/libcxx/utilities/format/format.string/format.string.std/extended_grapheme_cluster.pass.cpp
libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.formatted.print/locale-specific_form.pass.cpp
libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.formatted.print/vprint_unicode.pass.cpp
libcxx/test/std/input.output/iostream.format/print.fun/no_file_description.pass.cpp
libcxx/test/std/input.output/iostream.format/print.fun/vprint_unicode.sh.cpp
libcxx/test/std/utilities/format/format.formatter/format.formatter.spec/formatter.char.fsigned-char.pass.cpp
libcxx/test/std/utilities/format/format.formatter/format.formatter.spec/formatter.char.funsigned-char.pass.cpp

However, I am really not certain how to best fix those in most cases. Since this is more your cup of tea, do you think you could take a look? I suspect you'll know what the right fixes are right away.

@mordante
Copy link
Member

From a quick look this looks like broken tests due to TEST_HAS_NO_UNICODE was never set. I'll create a commit with fixes.

@ldionne ldionne force-pushed the review/fix-has-no-unicode branch from f3438ad to b45a166 Compare June 18, 2024 12:59
Copy link
Member

@mordante mordante left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Still LGTM!

@ldionne ldionne merged commit 04a75f5 into llvm:main Jun 18, 2024
50 of 55 checks passed
@ldionne ldionne deleted the review/fix-has-no-unicode branch June 18, 2024 18:22
AlexisPerry pushed a commit to llvm-project-tlp/llvm-project that referenced this pull request Jul 9, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
libc++ libc++ C++ Standard Library. Not GNU libstdc++. Not libc++abi.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[libc++] _LIBCPP_HAS_NO_UNICODE is missing from __config_site
3 participants