This is an archive of the discontinued LLVM Phabricator instance.

Differential D61033

[libc++][test] Fix noexcept assertions in variant's get tests
ClosedPublic

Authored by CaseyCarter on Apr 23 2019, 11:39 AM.

Details

Reviewers
mclow.lists
EricWF
ldionne
Commits
rG413732354d2a: [libc++][test] Fix noexcept assertions in variant's get tests
rL359220: [libc++][test] Fix noexcept assertions in variant's get tests
rCXX359220: [libc++][test] Fix noexcept assertions in variant's get tests
Summary

All constant expressions are non-potentially-throwing in C++14, but that is *not* the case in C++17. Change these variant tests to expect the correct behavior when the compiler is not GCC or is GCC 9+.

Fixes #41578.

Diff Detail

Event Timeline

CaseyCarter created this revision.Apr 23 2019, 11:39 AM
Herald added subscribers: arphaman, dexonsmith. · View Herald TranscriptApr 23 2019, 11:39 AM
CaseyCarter updated this revision to Diff 196316.Apr 23 2019, 1:46 PM
CaseyCarter marked an inline comment as done.

Update conditional: the bug was closed as a duplicate of a bug which has been fixed on master. Tag with the correct bug number, and disable the workaround for GCC 9.

jwakely added a subscriber: jwakely.Apr 24 2019, 5:41 AM

I added a patch to https://bugs.llvm.org/show_bug.cgi?id=41578 that fixes it differently.

mclow.lists added a comment.Apr 24 2019, 6:11 AM

XREF: https://bugs.llvm.org/show_bug.cgi?id=41578

mclow.lists added inline comments.Apr 24 2019, 6:12 AM
test/std/utilities/variant/variant.get/get_index.pass.cpp
60

You've got some copy-pasta here. 0 should be 1

CaseyCarter updated this revision to Diff 196482.Apr 24 2019, 10:12 AM
CaseyCarter edited the summary of this revision. (Show Details)

Use Jonathan's fix, which additionally validates the existence of the bug.

CaseyCarter marked an inline comment as done.Apr 24 2019, 10:13 AM
CaseyCarter updated this revision to Diff 196483.Apr 24 2019, 10:18 AM

Fix pre-existing copy pasta in variant/get_type.pass.cpp.

EricWF accepted this revision.Apr 25 2019, 1:50 AM

LGTM.

Thanks for the fixes.

This revision is now accepted and ready to land.Apr 25 2019, 1:50 AM
mclow.lists added a comment.Apr 25 2019, 11:16 AM

Thanks, Casey.

Closed by commit rCXX359220: [libc++][test] Fix noexcept assertions in variant's get tests (authored by CaseyCarter). · Explain WhyApr 25 2019, 11:34 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
test/
std/
utilities/
variant/
variant.get/
8 lines
8 lines
support/
6 lines

Diff 196482

test/std/utilities/variant/variant.get/get_index.pass.cpp

Show All 31 Lines
#include <type_traits> #include <type_traits>
#include <utility> #include <utility>
#include <variant> #include <variant>
void test_const_lvalue_get() { void test_const_lvalue_get() {
{ {
using V = std::variant<int, const long>; using V = std::variant<int, const long>;
constexpr V v(42); constexpr V v(42);
#ifndef __clang__ // Avoid https://bugs.llvm.org/show_bug.cgi?id=15481 #ifdef TEST_WORKAROUND_CONSTEXPR_IMPLIES_NOEXCEPT
ASSERT_NOEXCEPT(std::get<0>(v)); ASSERT_NOEXCEPT(std::get<0>(v));
#else
ASSERT_NOT_NOEXCEPT(std::get<0>(v));
#endif #endif
ASSERT_SAME_TYPE(decltype(std::get<0>(v)), const int &); ASSERT_SAME_TYPE(decltype(std::get<0>(v)), const int &);
static_assert(std::get<0>(v) == 42, ""); static_assert(std::get<0>(v) == 42, "");
} }
{ {
using V = std::variant<int, const long>; using V = std::variant<int, const long>;
const V v(42); const V v(42);
ASSERT_NOT_NOEXCEPT(std::get<0>(v)); ASSERT_NOT_NOEXCEPT(std::get<0>(v));
ASSERT_SAME_TYPE(decltype(std::get<0>(v)), const int &); ASSERT_SAME_TYPE(decltype(std::get<0>(v)), const int &);
assert(std::get<0>(v) == 42); assert(std::get<0>(v) == 42);
} }
{ {
using V = std::variant<int, const long>; using V = std::variant<int, const long>;
constexpr V v(42l); constexpr V v(42l);
#ifndef __clang__ // Avoid https://bugs.llvm.org/show_bug.cgi?id=15481 #ifdef TEST_WORKAROUND_CONSTEXPR_IMPLIES_NOEXCEPT
ASSERT_NOEXCEPT(std::get<1>(v)); ASSERT_NOEXCEPT(std::get<1>(v));
#else
mclow.listsUnsubmitted
Done
ReplyInline Actions

You've got some copy-pasta here. 0 should be 1

mclow.lists: You've got some copy-pasta here. `0` should be `1`
ASSERT_NOT_NOEXCEPT(std::get<1>(v));
#endif #endif
ASSERT_SAME_TYPE(decltype(std::get<1>(v)), const long &); ASSERT_SAME_TYPE(decltype(std::get<1>(v)), const long &);
static_assert(std::get<1>(v) == 42, ""); static_assert(std::get<1>(v) == 42, "");
} }
{ {
using V = std::variant<int, const long>; using V = std::variant<int, const long>;
const V v(42l); const V v(42l);
ASSERT_NOT_NOEXCEPT(std::get<1>(v)); ASSERT_NOT_NOEXCEPT(std::get<1>(v));
▲ Show 20 Lines • Show All 225 Lines • Show Last 20 Lines

test/std/utilities/variant/variant.get/get_type.pass.cpp

Show All 25 Lines
#include <type_traits> #include <type_traits>
#include <utility> #include <utility>
#include <variant> #include <variant>
void test_const_lvalue_get() { void test_const_lvalue_get() {
{ {
using V = std::variant<int, const long>; using V = std::variant<int, const long>;
constexpr V v(42); constexpr V v(42);
#ifndef __clang__ // Avoid https://bugs.llvm.org/show_bug.cgi?id=15481 #ifdef TEST_WORKAROUND_CONSTEXPR_IMPLIES_NOEXCEPT
ASSERT_NOEXCEPT(std::get<int>(v)); ASSERT_NOEXCEPT(std::get<int>(v));
#else
ASSERT_NOT_NOEXCEPT(std::get<int>(v));
#endif #endif
ASSERT_SAME_TYPE(decltype(std::get<0>(v)), const int &); ASSERT_SAME_TYPE(decltype(std::get<0>(v)), const int &);
static_assert(std::get<int>(v) == 42, ""); static_assert(std::get<int>(v) == 42, "");
} }
{ {
using V = std::variant<int, const long>; using V = std::variant<int, const long>;
const V v(42); const V v(42);
ASSERT_NOT_NOEXCEPT(std::get<int>(v)); ASSERT_NOT_NOEXCEPT(std::get<int>(v));
ASSERT_SAME_TYPE(decltype(std::get<0>(v)), const int &); ASSERT_SAME_TYPE(decltype(std::get<0>(v)), const int &);
assert(std::get<int>(v) == 42); assert(std::get<int>(v) == 42);
} }
{ {
using V = std::variant<int, const long>; using V = std::variant<int, const long>;
constexpr V v(42l); constexpr V v(42l);
#ifndef __clang__ // Avoid https://bugs.llvm.org/show_bug.cgi?id=15481 #ifdef TEST_WORKAROUND_CONSTEXPR_IMPLIES_NOEXCEPT
ASSERT_NOEXCEPT(std::get<const long>(v)); ASSERT_NOEXCEPT(std::get<const long>(v));
#else
ASSERT_NOT_NOEXCEPT(std::get<const long>(v));
#endif #endif
ASSERT_SAME_TYPE(decltype(std::get<const long>(v)), const long &); ASSERT_SAME_TYPE(decltype(std::get<const long>(v)), const long &);
static_assert(std::get<const long>(v) == 42, ""); static_assert(std::get<const long>(v) == 42, "");
} }
{ {
using V = std::variant<int, const long>; using V = std::variant<int, const long>;
const V v(42l); const V v(42l);
ASSERT_NOT_NOEXCEPT(std::get<const long>(v)); ASSERT_NOT_NOEXCEPT(std::get<const long>(v));
▲ Show 20 Lines • Show All 231 Lines • Show Last 20 Lines

test/support/test_workarounds.h

Show All 17 Lines
#if defined(TEST_COMPILER_C1XX) #if defined(TEST_COMPILER_C1XX)
# define TEST_WORKAROUND_C1XX_BROKEN_IS_TRIVIALLY_COPYABLE // VSO#117743 # define TEST_WORKAROUND_C1XX_BROKEN_IS_TRIVIALLY_COPYABLE // VSO#117743
# ifndef _MSC_EXTENSIONS # ifndef _MSC_EXTENSIONS
# define TEST_WORKAROUND_C1XX_BROKEN_ZA_CTOR_CHECK // VSO#119998 # define TEST_WORKAROUND_C1XX_BROKEN_ZA_CTOR_CHECK // VSO#119998
# endif # endif
#endif #endif
#if defined(TEST_COMPILER_GCC)
# if __GNUC__ < 9
# define TEST_WORKAROUND_CONSTEXPR_IMPLIES_NOEXCEPT // GCC PR 87603
# endif
#endif
#endif // SUPPORT_TEST_WORKAROUNDS_H #endif // SUPPORT_TEST_WORKAROUNDS_H