From: Jonathan Wakely <jwakely@redhat.com>
Date: Thu, 20 May 2021 17:04:16 +0000 (+0100)
Subject: libstdc++: Fix narrowing conversion in std::visit
X-Git-Tag: basepoints/gcc-13~4241
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dc1b29508d765b874372f4b1737ac6dc86962506;p=thirdparty%2Fgcc.git

libstdc++: Fix narrowing conversion in std::visit

Signed-off-by: Jonathan Wakely <jwakely@redhat.com>

libstdc++-v3/ChangeLog:

	* include/std/variant (__do_visit): Use variant_npos instead of
	literal -1 that requires a narrowing conversion.
---

diff --git a/libstdc++-v3/include/std/variant b/libstdc++-v3/include/std/variant
index ddeefd9b35e0..d50c6b7de1d4 100644
--- a/libstdc++-v3/include/std/variant
+++ b/libstdc++-v3/include/std/variant
@@ -1830,7 +1830,8 @@ namespace __variant
 		  if constexpr (is_same_v<_Result_type, __variant_idx_cookie>
 				|| is_same_v<_Result_type, __variant_cookie>)
 		    {
-		      return __gen_vtable_impl<_Ma, index_sequence<-1>>::
+		      using _Npos = index_sequence<variant_npos>;
+		      return __gen_vtable_impl<_Ma, _Npos>::
 			__visit_invoke(std::forward<_Visitor>(__visitor),
 				       std::forward<_V0>(__v0));
 		    }