From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <redi@sourceware.org>
Received: by sourceware.org (Postfix, from userid 2181)
	id 1F5D7385C335; Wed, 24 Aug 2022 13:01:38 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1F5D7385C335
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org;
	s=default; t=1661346098;
	bh=ih+BGbhkwHLuTI653k3q6/VwRqNJG+8RhaTFb4Zq8/k=;
	h=From:To:Subject:Date:From;
	b=Lk3TGxX26arP4O2fY31d9nIs86nbEy7Ip6vBBMByS6wMXo2GOUL9xIDWr9alSIeO5
	 URzMOGUDiJDzTSr01nk6wUEhp0Ad7JyLU0EG9PRsWQ5aF1ecp4/mc71l14KAPZTfrE
	 gQcfNkbdPvtFTSZFOBHK/EBFPuW180D5tj3E0Dis=
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset="utf-8"
From: Jonathan Wakely <redi@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org
Subject: [gcc r12-8711] libstdc++: Fix visit<void>(v) for non-void visitors
 [PR106589]
X-Act-Checkin: gcc
X-Git-Author: Jonathan Wakely <jwakely@redhat.com>
X-Git-Refname: refs/heads/releases/gcc-12
X-Git-Oldrev: 9f532fec01d6651cc3cc136073f044a7953d8560
X-Git-Newrev: 219d9f61a241d370b7933aecae56ce0905465830
Message-Id: <20220824130138.1F5D7385C335@sourceware.org>
Date: Wed, 24 Aug 2022 13:01:38 +0000 (GMT)
List-Id: <libstdc++-cvs.sourceware.org>

https://gcc.gnu.org/g:219d9f61a241d370b7933aecae56ce0905465830

commit r12-8711-g219d9f61a241d370b7933aecae56ce0905465830
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Tue Aug 23 15:46:16 2022 +0100

    libstdc++: Fix visit<void>(v) for non-void visitors [PR106589]
    
    The optimization for the common case of std::visit forgot to handle the
    edge case of passing zero variants to a non-void visitor and converting
    the result to void.
    
    libstdc++-v3/ChangeLog:
    
            PR libstdc++/106589
            * include/std/variant (__do_visit): Handle is_void<R> for zero
            argument case.
            * testsuite/20_util/variant/visit_r.cc: Check std::visit<void>(v).
    
    (cherry picked from commit e85bb1881e57e53306ede2a15f30d06480d69886)

Diff:
---
 libstdc++-v3/include/std/variant                  | 7 ++++++-
 libstdc++-v3/testsuite/20_util/variant/visit_r.cc | 8 ++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/libstdc++-v3/include/std/variant b/libstdc++-v3/include/std/variant
index beed396fccb..df0dd08d90a 100644
--- a/libstdc++-v3/include/std/variant
+++ b/libstdc++-v3/include/std/variant
@@ -1730,7 +1730,12 @@ namespace __variant
     {
       // Get the silly case of visiting no variants out of the way first.
       if constexpr (sizeof...(_Variants) == 0)
-	return std::forward<_Visitor>(__visitor)();
+	{
+	  if constexpr (is_void_v<_Result_type>)
+	    return (void) std::forward<_Visitor>(__visitor)();
+	  else
+	    return std::forward<_Visitor>(__visitor)();
+	}
       else
 	{
 	  constexpr size_t __max = 11; // "These go to eleven."
diff --git a/libstdc++-v3/testsuite/20_util/variant/visit_r.cc b/libstdc++-v3/testsuite/20_util/variant/visit_r.cc
index 712459f25e3..c77b259c386 100644
--- a/libstdc++-v3/testsuite/20_util/variant/visit_r.cc
+++ b/libstdc++-v3/testsuite/20_util/variant/visit_r.cc
@@ -54,10 +54,18 @@ void test02()
   std::visit<const void>(Visitor(), v);
 }
 
+void test03()
+{
+  // PR libstdc++/106589 - visit<void> rejects lambdas that do not return void
+  auto visitor = []{ return 0; };
+  std::visit<void>(visitor);
+  std::visit<void>(static_cast<int(*)()>(visitor));
+}
 
 int
 main()
 {
   test01();
   test02();
+  test03();
 }