diff options
author | Patrick Palka <ppalka@redhat.com> | 2023-07-26 16:52:13 -0400 |
---|---|---|
committer | Patrick Palka <ppalka@redhat.com> | 2023-07-26 16:52:13 -0400 |
commit | 744e1f35266dbd6b6fb95c7e8422562815f8b56f (patch) | |
tree | bdafca3d3d7f5455359e7058a78c669bfa794049 | |
parent | 27ba73644f53c118e3f9b3fe9cd792210696ec55 (diff) | |
download | gcc-744e1f35266dbd6b6fb95c7e8422562815f8b56f.zip gcc-744e1f35266dbd6b6fb95c7e8422562815f8b56f.tar.gz gcc-744e1f35266dbd6b6fb95c7e8422562815f8b56f.tar.bz2 |
c++: unifying REAL_CSTs [PR110809]
This teaches unify how to compare two REAL_CSTs.
PR c++/110809
gcc/cp/ChangeLog:
* pt.cc (unify) <case INTEGER_CST>: Generalize to handle
REAL_CST as well.
gcc/testsuite/ChangeLog:
* g++.dg/cpp2a/nontype-float3.C: New test.
-rw-r--r-- | gcc/cp/pt.cc | 5 | ||||
-rw-r--r-- | gcc/testsuite/g++.dg/cpp2a/nontype-float3.C | 12 |
2 files changed, 15 insertions, 2 deletions
diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc index 265e2a5..43818ba 100644 --- a/gcc/cp/pt.cc +++ b/gcc/cp/pt.cc @@ -24914,12 +24914,13 @@ unify (tree tparms, tree targs, tree parm, tree arg, int strict, /* Types INTEGER_CST and MINUS_EXPR can come from array bounds. */ /* Type INTEGER_CST can come from ordinary constant template args. */ case INTEGER_CST: + case REAL_CST: while (CONVERT_EXPR_P (arg)) arg = TREE_OPERAND (arg, 0); - if (TREE_CODE (arg) != INTEGER_CST) + if (TREE_CODE (arg) != TREE_CODE (parm)) return unify_template_argument_mismatch (explain_p, parm, arg); - return (tree_int_cst_equal (parm, arg) + return (simple_cst_equal (parm, arg) ? unify_success (explain_p) : unify_template_argument_mismatch (explain_p, parm, arg)); diff --git a/gcc/testsuite/g++.dg/cpp2a/nontype-float3.C b/gcc/testsuite/g++.dg/cpp2a/nontype-float3.C new file mode 100644 index 0000000..044fb99 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp2a/nontype-float3.C @@ -0,0 +1,12 @@ +// PR c++/110809 +// { dg-do compile { target c++20 } } + +template<class, double> struct A { }; + +template<class T> void f(A<T, 1.0>); +template<class T> void f(A<T, 2.0>); + +int main() { + f(A<int, 1.0>{}); + f(A<int, 1.1>{}); // { dg-error "no match" } +} |