diff options
author | Jakub Jelinek <jakub@redhat.com> | 2023-10-12 17:20:36 +0200 |
---|---|---|
committer | Jakub Jelinek <jakub@redhat.com> | 2023-10-12 17:20:36 +0200 |
commit | 53a94071fa9e90e268a94adbdc903bd868ddeec1 (patch) | |
tree | 4a9f89f2f98396f5680c384ed7414935745d43a6 /gcc/tree.h | |
parent | e99ad401f84ca6cd2717a58a116e44274d55da70 (diff) | |
download | gcc-53a94071fa9e90e268a94adbdc903bd868ddeec1.zip gcc-53a94071fa9e90e268a94adbdc903bd868ddeec1.tar.gz gcc-53a94071fa9e90e268a94adbdc903bd868ddeec1.tar.bz2 |
wide-int: Fix build with gcc < 12 or clang++ [PR111787]
While my wide_int patch bootstrapped/regtested fine when I used GCC 12
as system gcc, apparently it doesn't with GCC 11 and older or clang++.
For GCC before PR96555 C++ DR1315 implementation the compiler complains
about template argument involving template parameters, for clang++ the
same + complains about missing needs_write_val_arg static data member
in some wi::int_traits specializations.
2023-10-12 Jakub Jelinek <jakub@redhat.com>
PR bootstrap/111787
* tree.h (wi::int_traits <unextended_tree>::needs_write_val_arg): New
static data member.
(int_traits <extended_tree <N>>::needs_write_val_arg): Likewise.
(wi::ints_for): Provide separate partial specializations for
generic_wide_int <extended_tree <N>> and INL_CONST_PRECISION or that
and CONST_PRECISION, rather than using
int_traits <extended_tree <N> >::precision_type as the second template
argument.
* rtl.h (wi::int_traits <rtx_mode_t>::needs_write_val_arg): New
static data member.
* double-int.h (wi::int_traits <double_int>::needs_write_val_arg):
Likewise.
Diffstat (limited to 'gcc/tree.h')
-rw-r--r-- | gcc/tree.h | 23 |
1 files changed, 19 insertions, 4 deletions
@@ -6237,6 +6237,7 @@ namespace wi static const enum precision_type precision_type = VAR_PRECISION; static const bool host_dependent_precision = false; static const bool is_sign_extended = false; + static const bool needs_write_val_arg = false; }; template <int N> @@ -6262,6 +6263,7 @@ namespace wi = N == ADDR_MAX_PRECISION ? INL_CONST_PRECISION : CONST_PRECISION; static const bool host_dependent_precision = false; static const bool is_sign_extended = true; + static const bool needs_write_val_arg = false; static const unsigned int precision = N; }; @@ -6293,8 +6295,14 @@ namespace wi tree_to_poly_wide_ref to_poly_wide (const_tree); template <int N> - struct ints_for <generic_wide_int <extended_tree <N> >, - int_traits <extended_tree <N> >::precision_type> + struct ints_for <generic_wide_int <extended_tree <N> >, INL_CONST_PRECISION> + { + typedef generic_wide_int <extended_tree <N> > extended; + static extended zero (const extended &); + }; + + template <int N> + struct ints_for <generic_wide_int <extended_tree <N> >, CONST_PRECISION> { typedef generic_wide_int <extended_tree <N> > extended; static extended zero (const extended &); @@ -6532,8 +6540,15 @@ wi::to_poly_wide (const_tree t) template <int N> inline generic_wide_int <wi::extended_tree <N> > wi::ints_for <generic_wide_int <wi::extended_tree <N> >, - wi::int_traits <wi::extended_tree <N> >::precision_type - >::zero (const extended &x) + wi::INL_CONST_PRECISION>::zero (const extended &x) +{ + return build_zero_cst (TREE_TYPE (x.get_tree ())); +} + +template <int N> +inline generic_wide_int <wi::extended_tree <N> > +wi::ints_for <generic_wide_int <wi::extended_tree <N> >, + wi::CONST_PRECISION>::zero (const extended &x) { return build_zero_cst (TREE_TYPE (x.get_tree ())); } |