This is an archive of the discontinued LLVM Phabricator instance.

Differential D116880

[libcxx][test] Make LIBCPP_STATIC_ASSERT usable at namespace scope
ClosedPublic

Authored by CaseyCarter on Jan 9 2022, 12:32 AM.

Details

Reviewers
• Quuxplusone
Mordante
ldionne
Group Reviewers
Restricted Project
Commits
rG1d3964d2adc4: [libcxx][test] Make LIBCPP_STATIC_ASSERT usable at namespace scope
Summary

... even when !defined(_LIBCPP_VERSION). (Note that the previous definition for this case - ((void)0); - is ill-formed at namespace scope.)

Diff Detail

Event Timeline

CaseyCarter requested review of this revision.Jan 9 2022, 12:32 AM
CaseyCarter created this revision.
Herald added 1 blocking reviewer(s): Restricted Project. · View Herald TranscriptJan 9 2022, 12:32 AM
Harbormaster completed remote builds in B142272: Diff 398398.Jan 9 2022, 2:18 AM
• Quuxplusone accepted this revision as: • Quuxplusone.Jan 9 2022, 3:20 AM
• Quuxplusone added a subscriber: • Quuxplusone.

LGTM%comment.

libcxx/test/support/test_macros.h
238–243

I think you're onto something here. :)

Mordante accepted this revision.Jan 10 2022, 9:35 AM
Mordante added a subscriber: Mordante.

Thanks, LGTM!

This revision is now accepted and ready to land.Jan 10 2022, 9:35 AM
ldionne accepted this revision.Jan 10 2022, 12:44 PM
CaseyCarter added inline comments.Jan 10 2022, 4:30 PM
libcxx/test/support/test_macros.h
238–243

I'll change these when I push.

Closed by commit rG1d3964d2adc4: [libcxx][test] Make LIBCPP_STATIC_ASSERT usable at namespace scope (authored by CaseyCarter). · Explain WhyJan 10 2022, 4:35 PM
This revision was automatically updated to reflect the committed changes.
CaseyCarter added a commit: rG1d3964d2adc4: [libcxx][test] Make LIBCPP_STATIC_ASSERT usable at namespace scope.
CaseyCarter marked an inline comment as done.Jan 10 2022, 4:36 PM

Revision Contents

PathSize
libcxx/
test/
support/
10 lines

Diff 398777

libcxx/test/support/test_macros.h

Show First 20 Lines • Show All 229 Lines • ▼ Show 20 Lines
/* Macros for testing libc++ specific behavior and extensions */ /* Macros for testing libc++ specific behavior and extensions */
#if defined(_LIBCPP_VERSION) #if defined(_LIBCPP_VERSION)
#define LIBCPP_ASSERT(...) assert(__VA_ARGS__) #define LIBCPP_ASSERT(...) assert(__VA_ARGS__)
#define LIBCPP_STATIC_ASSERT(...) static_assert(__VA_ARGS__) #define LIBCPP_STATIC_ASSERT(...) static_assert(__VA_ARGS__)
#define LIBCPP_ASSERT_NOEXCEPT(...) ASSERT_NOEXCEPT(__VA_ARGS__) #define LIBCPP_ASSERT_NOEXCEPT(...) ASSERT_NOEXCEPT(__VA_ARGS__)
#define LIBCPP_ASSERT_NOT_NOEXCEPT(...) ASSERT_NOT_NOEXCEPT(__VA_ARGS__) #define LIBCPP_ASSERT_NOT_NOEXCEPT(...) ASSERT_NOT_NOEXCEPT(__VA_ARGS__)
#define LIBCPP_ONLY(...) __VA_ARGS__ #define LIBCPP_ONLY(...) __VA_ARGS__
#else #else
#define LIBCPP_ASSERT(...) ((void)0) #define LIBCPP_ASSERT(...) static_assert(true, "")
#define LIBCPP_STATIC_ASSERT(...) ((void)0) #define LIBCPP_STATIC_ASSERT(...) static_assert(true, "")
#define LIBCPP_ASSERT_NOEXCEPT(...) ((void)0) #define LIBCPP_ASSERT_NOEXCEPT(...) static_assert(true, "")
#define LIBCPP_ASSERT_NOT_NOEXCEPT(...) ((void)0) #define LIBCPP_ASSERT_NOT_NOEXCEPT(...) static_assert(true, "")
#define LIBCPP_ONLY(...) ((void)0) #define LIBCPP_ONLY(...) static_assert(true, "")
QuuxplusoneUnsubmitted
Done
ReplyInline Actions
#else
- #define LIBCPP_ASSERT(...) ((void)0)
+ #define LIBCPP_ASSERT(...) static_assert(true, "")
#define LIBCPP_STATIC_ASSERT(...) static_assert(true, "")
- #define LIBCPP_ASSERT_NOEXCEPT(...) ((void)0)
- #define LIBCPP_ASSERT_NOT_NOEXCEPT(...) ((void)0)
- #define LIBCPP_ONLY(...) ((void)0)
+ #define LIBCPP_ASSERT_NOEXCEPT(...) static_assert(true, "")
+ #define LIBCPP_ASSERT_NOT_NOEXCEPT(...) static_assert(true, "")
+ #define LIBCPP_ONLY(...) static_assert(true, "")
#endif

I think you're onto something here. :)

Quuxplusone: I think you're onto something here. :)
CaseyCarterAuthorUnsubmitted
Done
ReplyInline Actions

I'll change these when I push.

CaseyCarter: I'll change these when I push.
#endif #endif
#if !defined(_LIBCPP_HAS_NO_RANGES) #if !defined(_LIBCPP_HAS_NO_RANGES)
#define TEST_SUPPORTS_RANGES #define TEST_SUPPORTS_RANGES
#endif #endif
#define TEST_IGNORE_NODISCARD (void) #define TEST_IGNORE_NODISCARD (void)
▲ Show 20 Lines • Show All 117 Lines • Show Last 20 Lines