From: Jason Merrill Date: Tue, 16 Mar 2021 20:06:27 +0000 (-0400) Subject: c++: Fix NaN as C++20 template argument X-Git-Tag: upstream/12.2.0~9257 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a4101e5aafc512dc32b8d529b2bafb116a3612de;p=platform%2Fupstream%2Fgcc.git c++: Fix NaN as C++20 template argument C++20 allows floating-point types for non-type template parameters; floating-point values are considered to be equivalent template arguments if they are "identical", which conveniently seems to map onto an existing GCC predicate. gcc/cp/ChangeLog: * tree.c (cp_tree_equal): Use real_identical. gcc/testsuite/ChangeLog: * g++.dg/cpp2a/nontype-float1.C: New test. --- diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c index 3c46975..3acb643 100644 --- a/gcc/cp/tree.c +++ b/gcc/cp/tree.c @@ -3740,7 +3740,7 @@ cp_tree_equal (tree t1, tree t2) return tree_int_cst_equal (t1, t2); case REAL_CST: - return real_equal (&TREE_REAL_CST (t1), &TREE_REAL_CST (t2)); + return real_identical (&TREE_REAL_CST (t1), &TREE_REAL_CST (t2)); case STRING_CST: return TREE_STRING_LENGTH (t1) == TREE_STRING_LENGTH (t2) diff --git a/gcc/testsuite/g++.dg/cpp2a/nontype-float1.C b/gcc/testsuite/g++.dg/cpp2a/nontype-float1.C new file mode 100644 index 0000000..4fafac1 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp2a/nontype-float1.C @@ -0,0 +1,12 @@ +// { dg-do compile { target c++20 } } + +#include + +template class MyClass { }; + +static_assert(__is_same(MyClass, MyClass)); + +constexpr auto mynan = NAN; +static_assert(__is_same(MyClass, MyClass)); + +static_assert(__is_same(MyClass, MyClass));