This is an archive of the discontinued LLVM Phabricator instance.

Differential D116883

[libcxx][test] Auto-detect _LIBCPP_HAS_NO_UNICODE for MSVC STL
ClosedPublic

Authored by CaseyCarter on Jan 9 2022, 1:00 AM.

Details

Reviewers
ldionne
Group Reviewers
Restricted Project
Commits
rGa765eea15389: [libcxx][test] Auto-detect _LIBCPP_HAS_NO_UNICODE for MSVC STL
Summary

... by examining _MSVC_EXECUTION_CHARACTER_SET in the force-include header.

Diff Detail

Event Timeline

CaseyCarter requested review of this revision.Jan 9 2022, 1:00 AM
CaseyCarter created this revision.
Herald added 1 blocking reviewer(s): Restricted Project. · View Herald TranscriptJan 9 2022, 1:00 AM
Harbormaster completed remote builds in B142275: Diff 398401.Jan 9 2022, 2:52 AM
ldionne accepted this revision.Jan 10 2022, 5:36 AM
ldionne added a subscriber: ldionne.

LGTM. In the future, we should create a TEST_HAS_NO_UNICODE macro in test_macros.h and use that throughout the test suite instead (like we do for TEST_HAS_NO_WIDE_CHARACTERS).

libcxx/test/support/msvc_stdlib_force_include.h
109

For such a small #if - #endif block, I would drop the closing comment.

This revision is now accepted and ready to land.Jan 10 2022, 5:36 AM
Closed by commit rGa765eea15389: [libcxx][test] Auto-detect _LIBCPP_HAS_NO_UNICODE for MSVC STL (authored by CaseyCarter). · Explain WhyJan 10 2022, 1:56 PM
This revision was automatically updated to reflect the committed changes.
CaseyCarter added a commit: rGa765eea15389: [libcxx][test] Auto-detect _LIBCPP_HAS_NO_UNICODE for MSVC STL.

Revision Contents

PathSize
libcxx/
test/
support/
4 lines

Diff 398401

libcxx/test/support/msvc_stdlib_force_include.h

Show First 20 Lines • Show All 98 Lines • ▼ Show 20 Lines
#define _LIBCPP_SUPPRESS_DEPRECATED_PUSH \ #define _LIBCPP_SUPPRESS_DEPRECATED_PUSH \
__pragma(warning(push)) \ __pragma(warning(push)) \
__pragma(warning(disable : 4996)) \ __pragma(warning(disable : 4996)) \
__pragma(warning(disable : 5215)) __pragma(warning(disable : 5215))
#define _LIBCPP_SUPPRESS_DEPRECATED_POP \ #define _LIBCPP_SUPPRESS_DEPRECATED_POP \
__pragma(warning(pop)) __pragma(warning(pop))
#endif // __clang__ #endif // __clang__
#if defined(_MSVC_EXECUTION_CHARACTER_SET) && _MSVC_EXECUTION_CHARACTER_SET != 65001
#define _LIBCPP_HAS_NO_UNICODE 1
#endif // defined(_MSVC_EXECUTION_CHARACTER_SET) && _MSVC_EXECUTION_CHARACTER_SET != 65001
ldionneUnsubmitted
Not Done
ReplyInline Actions
#define _LIBCPP_HAS_NO_UNICODE 1
- #endif // defined(_MSVC_EXECUTION_CHARACTER_SET) && _MSVC_EXECUTION_CHARACTER_SET != 65001
+ #endif
#endif // SUPPORT_MSVC_STDLIB_FORCE_INCLUDE_H

For such a small #if - #endif block, I would drop the closing comment.

ldionne: For such a small `#if` - `#endif` block, I would drop the closing comment.
#endif // SUPPORT_MSVC_STDLIB_FORCE_INCLUDE_H #endif // SUPPORT_MSVC_STDLIB_FORCE_INCLUDE_H