Commit 6632f292 by Patrick Palka

c++: satisfaction value of type typedef to bool [PR95386]

In the testcase below, the satisfaction value of fn1<int>'s constraint
is INTEGER_CST '1' of type BOOLEAN_TYPE value_type, which is a typedef
to the standard boolean_type_node.  But satisfaction_value expects to
see exactly boolean_true_node or integer_one_node, which this value is
neither, causing us to trip over the assert therein.

This patch relaxes satisfaction_value to accept any INTEGER_CST which
satisfies integer_zerop or integer_onep.

gcc/cp/ChangeLog:

	PR c++/95386
	* constraint.cc (satisfaction_value): Relax to accept any
	INTEGER_CST that satisfies integer_zerop or integer_onep.

gcc/testsuite/ChangeLog:

	PR c++/95386
	* g++.dg/concepts/pr95386.C: New test.
parent 03c344ad
......@@ -2492,11 +2492,12 @@ satisfy_disjunction (tree t, tree args, subst_info info)
tree
satisfaction_value (tree t)
{
if (t == error_mark_node)
if (t == error_mark_node || t == boolean_true_node || t == boolean_false_node)
return t;
if (t == boolean_true_node || t == integer_one_node)
gcc_assert (TREE_CODE (t) == INTEGER_CST);
if (integer_onep (t))
return boolean_true_node;
if (t == boolean_false_node || t == integer_zero_node)
if (integer_zerop (t))
return boolean_false_node;
/* Anything else should be invalid. */
......
// PR c++/95386
// { dg-do compile { target concepts } }
template <typename> struct blah {
typedef bool value_type;
constexpr operator value_type() { return false; }
};
template <class T> void fn1(T) requires (!blah<T>());
void fn2() { fn1(0); }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment