https://gcc.gnu.org/g:7d4713c6547226107f315948819cdfd07f0fc08c
commit r15-11632-g7d4713c6547226107f315948819cdfd07f0fc08c Author: Jakub Jelinek <[email protected]> Date: Wed Sep 23 09:24:55 2026 +0200 c++: Fix up unify_array_domain [PR125536] The following testcase is incorrectly rejected on lp64 targets. The bug is that unify_array_domain uses forcefully integer_type_node/integer_one_node to add 1 to parm_max or arg_max, regardless of the type it has. From playing with testcases, at least arg_max seems to be pretty much always sizetype/size_t. 2026-09-23 Jakub Jelinek <[email protected]> PR c++/125536 * pt.cc (unify_array_domain): When adding 1 to parm_max or arg_max, perform the addition in the type of those trees rather than unconditionally in int type. * g++.dg/template/unify14.C: New test. Reviewed-by: Jason Merrill <[email protected]> (cherry picked from commit 70f3c5413a3c8d2dd57a8f716dab8e90334b5e96) Diff: --- gcc/cp/pt.cc | 8 ++++---- gcc/testsuite/g++.dg/template/unify14.C | 15 +++++++++++++++ 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc index dcc2a6b1158d..7ee05367f449 100644 --- a/gcc/cp/pt.cc +++ b/gcc/cp/pt.cc @@ -25207,14 +25207,14 @@ unify_array_domain (tree tparms, tree targs, by adding one to the other bound. */ if (parm_cst && !arg_cst) parm_max = fold_build2_loc (input_location, PLUS_EXPR, - integer_type_node, + TREE_TYPE (parm_max), parm_max, - integer_one_node); + build_int_cst (TREE_TYPE (parm_max), 1)); else if (arg_cst && !parm_cst) arg_max = fold_build2_loc (input_location, PLUS_EXPR, - integer_type_node, + TREE_TYPE (arg_max), arg_max, - integer_one_node); + build_int_cst (TREE_TYPE (arg_max), 1)); return unify (tparms, targs, parm_max, arg_max, UNIFY_ALLOW_INTEGER, explain_p); diff --git a/gcc/testsuite/g++.dg/template/unify14.C b/gcc/testsuite/g++.dg/template/unify14.C new file mode 100644 index 000000000000..8f9ca9e098aa --- /dev/null +++ b/gcc/testsuite/g++.dg/template/unify14.C @@ -0,0 +1,15 @@ +// PR c++/125536 +// { dg-do compile { target c++14 } } + +template <typename> +constexpr bool x = false; + +template <unsigned long long N> +constexpr bool x <char [N]> = true; + +#if __PTRDIFF_MAX__ >= 2147483647 +static_assert (x <char [2147483647]>, ""); +#endif +#if __PTRDIFF_MAX__ > 2147483647 +static_assert (x <char [2147483648U]>, ""); +#endif
