procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libstdc++: Fix std::variant to reject array types [PR116381]

Browse source 
libstdc++-v3/ChangeLog:

	PR libstdc++/116381
	* include/std/variant (variant): Fix conditions for
	static_assert to match the spec.
	* testsuite/20_util/variant/types_neg.cc: New test.
This commit is contained in:
Jonathan Wakely 2024-08-20 16:52:22 +01:00 • committed by Jonathan Wakely
parent 3949b7c0a8
commit 1e10b3b882
No known key found for this signature in database
2 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libstdc++-v3/include/std/variant
View file

@ -1457,10 +1457,8 @@ namespace __detail::__variant
static_assert(sizeof...(_Types) > 0,
"variant must have at least one alternative");
static_assert(!(std::is_reference_v<_Types> || ...),
"variant must have no reference alternative");
static_assert(!(std::is_void_v<_Types> || ...),
"variant must have no void alternative");
static_assert(((std::is_object_v<_Types> && !is_array_v<_Types>) && ...),
"variant alternatives must be non-array object types");
using _Base = __detail::__variant::_Variant_base<_Types...>;

17
libstdc++-v3/testsuite/20_util/variant/types_neg.cc Normal file
View file

@ -0,0 +1,17 @@
// { dg-do compile { target c++17 } }
# include <variant>
std::variant<> v0; // { dg-error "here" }
// { dg-error "must have at least one alternative" "" { target *-*-* } 0 }
std::variant<int, void> v1; // { dg-error "here" }
std::variant<int, const void> v2; // { dg-error "here" }
std::variant<int, int&> v3; // { dg-error "here" }
std::variant<int, void()> v4; // { dg-error "here" }
std::variant<int, int[]> v5; // { dg-error "here" }
std::variant<int, int[1]> v6; // { dg-error "here" }
// { dg-error "must be non-array object types" "" { target *-*-* } 0 }
// All of variant's base classes are instantiated before checking any
// static_assert, so we get lots of errors before the expected errors above.
// { dg-excess-errors "" }