From: Ville Voutilainen <ville.voutilainen@gmail.com>
To: Jonathan Wakely <jwakely@redhat.com>
Cc: gcc-patches List <gcc-patches@gcc.gnu.org>,
"libstdc++" <libstdc++@gcc.gnu.org>
Subject: Re: [PATCH] libstdc++: Diagnose visitors with different return types [PR95904]
Date: Tue, 29 Sep 2020 19:35:32 +0300 [thread overview]
Message-ID: <CAFk2RUZbZNdbv_Z+Xf_6BunN3qRiXOg_2sOtzyYvLLeXifA2FA@mail.gmail.com> (raw)
In-Reply-To: <20200929112043.GL3946@redhat.com>
[-- Attachment #1: Type: text/plain, Size: 622 bytes --]
On Tue, 29 Sep 2020 at 14:20, Jonathan Wakely <jwakely@redhat.com> wrote:
> I think this is what we want:
>
> template<typename _Tp, typename... _Types>
> constexpr inline __same_types = (is_same_v<_Tp, _Types> && ...);
>
> is_same_v is very cheap, it uses the built-in directly, so you don't
> need to instantiate any class templates at all.
>
> >+
> >+ template <unsigned long int _Idx, class _Visitor, class _Variant>
>
> typename not class please.
>
> >+ decltype(auto) __check_visitor_result(_Visitor&& __vis,
>
> New line after the decltype(auto) please, not in the middle of the
> parameter list.
Aye.
[-- Attachment #2: pr95904_2.diff --]
[-- Type: text/x-patch, Size: 3448 bytes --]
diff --git a/libstdc++-v3/include/std/variant b/libstdc++-v3/include/std/variant
index dd8847cf829..6f647d622c4 100644
--- a/libstdc++-v3/include/std/variant
+++ b/libstdc++-v3/include/std/variant
@@ -182,7 +182,7 @@ namespace __variant
// used for raw visitation with indices passed in
struct __variant_idx_cookie { using type = __variant_idx_cookie; };
// Used to enable deduction (and same-type checking) for std::visit:
- template<typename> struct __deduce_visit_result { };
+ template<typename _Tp> struct __deduce_visit_result { using type = _Tp; };
// Visit variants that might be valueless.
template<typename _Visitor, typename... _Variants>
@@ -1017,7 +1017,22 @@ namespace __variant
static constexpr auto
_S_apply()
- { return _Array_type{&__visit_invoke}; }
+ {
+ constexpr bool __visit_ret_type_mismatch =
+ _Array_type::__result_is_deduced::value
+ && !is_same_v<typename _Result_type::type,
+ decltype(__visit_invoke(std::declval<_Visitor>(),
+ std::declval<_Variants>()...))>;
+ if constexpr (__visit_ret_type_mismatch)
+ {
+ static_assert(!__visit_ret_type_mismatch,
+ "std::visit requires the visitor to have the same "
+ "return type for all alternatives of a variant");
+ return __nonesuch{};
+ }
+ else
+ return _Array_type{&__visit_invoke};
+ }
};
template<typename _Result_type, typename _Visitor, typename... _Variants>
@@ -1692,6 +1707,26 @@ namespace __variant
std::forward<_Variants>(__variants)...);
}
+ template<typename _Tp, typename... _Types>
+ constexpr inline bool __same_types = (is_same_v<_Tp, _Types> && ...);
+
+ template <unsigned long int _Idx, typename _Visitor, typename _Variant>
+ decltype(auto)
+ __check_visitor_result(_Visitor&& __vis, _Variant&& __variant)
+ {
+ return std::forward<_Visitor>(__vis)(
+ std::get<_Idx>(std::forward<_Variant>(__variant)));
+ }
+
+ template <typename _Visitor, typename _Variant, unsigned long int... _Idxs>
+ constexpr bool __check_visitor_results(std::index_sequence<_Idxs...>)
+ {
+ return __same_types<decltype(__check_visitor_result<_Idxs>(
+ std::declval<_Visitor>(),
+ std::declval<_Variant>()))...>;
+ }
+
+
template<typename _Visitor, typename... _Variants>
constexpr decltype(auto)
visit(_Visitor&& __visitor, _Variants&&... __variants)
@@ -1704,8 +1739,28 @@ namespace __variant
using _Tag = __detail::__variant::__deduce_visit_result<_Result_type>;
- return std::__do_visit<_Tag>(std::forward<_Visitor>(__visitor),
- std::forward<_Variants>(__variants)...);
+ if constexpr (sizeof...(_Variants) == 1)
+ {
+ constexpr bool __visit_rettypes_match =
+ __check_visitor_results<_Visitor, _Variants...>(
+ std::make_index_sequence<
+ std::variant_size<remove_reference_t<_Variants>...>::value>());
+ if constexpr (!__visit_rettypes_match)
+ {
+ static_assert(__visit_rettypes_match,
+ "std::visit requires the visitor to have the same "
+ "return type for all alternatives of a variant");
+ return;
+ }
+ else
+ return std::__do_visit<_Tag>(
+ std::forward<_Visitor>(__visitor),
+ std::forward<_Variants>(__variants)...);
+ }
+ else
+ return std::__do_visit<_Tag>(
+ std::forward<_Visitor>(__visitor),
+ std::forward<_Variants>(__variants)...);
}
#if __cplusplus > 201703L
next prev parent reply other threads:[~2020-09-29 16:35 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-28 22:12 [PATCH] c++: Diagnose visitors with different return types for std::visit [PR95904] Ville Voutilainen
2020-09-29 11:20 ` Jonathan Wakely
2020-09-29 16:35 ` Ville Voutilainen [this message]
2020-10-02 22:14 ` [PATCH] libstdc++: Diagnose visitors with different return types [PR95904] Jonathan Wakely
2020-10-04 22:15 ` Ville Voutilainen
2020-10-05 19:35 ` Ville Voutilainen
2020-10-08 14:27 ` Jonathan Wakely
2020-10-17 17:30 ` Stephan Bergmann
2020-10-17 17:36 ` Ville Voutilainen
2020-10-10 10:52 ` Jonathan Wakely
2020-10-10 11:15 ` Ville Voutilainen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAFk2RUZbZNdbv_Z+Xf_6BunN3qRiXOg_2sOtzyYvLLeXifA2FA@mail.gmail.com \
--to=ville.voutilainen@gmail.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=jwakely@redhat.com \
--cc=libstdc++@gcc.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).