diff options
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/mangle.c | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/ext/pr53605.C | 16 |
4 files changed, 31 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 832ba9e..0b1602a 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2012-06-11 Richard Guenther <rguenther@suse.de> + + PR c++/53616 + * mangle.c (write_array_type): Use double-ints for array domain + arithmetic. + 2012-06-07 Fabien Chêne <fabien@gcc.gnu.org> PR c++/51214 diff --git a/gcc/cp/mangle.c b/gcc/cp/mangle.c index c801848..2ec626c 100644 --- a/gcc/cp/mangle.c +++ b/gcc/cp/mangle.c @@ -3119,8 +3119,10 @@ write_array_type (const tree type) { /* The ABI specifies that we should mangle the number of elements in the array, not the largest allowed index. */ - max = size_binop (PLUS_EXPR, max, size_one_node); - write_unsigned_number (tree_low_cst (max, 1)); + double_int dmax + = double_int_add (tree_to_double_int (max), double_int_one); + gcc_assert (double_int_fits_in_uhwi_p (dmax)); + write_unsigned_number (dmax.low); } else { diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index bab2378..baa04c0 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2012-06-11 Richard Guenther <rguenther@suse.de> + + PR c++/53616 + * g++.dg/ext/pr53605.C: New testcase. + 2012-06-11 Eric Botcazou <ebotcazou@adacore.com> * gnat.dg/specs/array1.ads: New test. diff --git a/gcc/testsuite/g++.dg/ext/pr53605.C b/gcc/testsuite/g++.dg/ext/pr53605.C new file mode 100644 index 0000000..0b902dd --- /dev/null +++ b/gcc/testsuite/g++.dg/ext/pr53605.C @@ -0,0 +1,16 @@ +// { dg-do compile } + +// Avoid -pedantic-error default +// { dg-options "" } + +template <bool lhs_is_null_literal> +class EqHelper { +public: + template <typename T1, typename T2> + static int Compare( const T1& expected, + const T2& actual); +}; +void foo(){ + static const int kData[] = {}; + ::EqHelper<false>::Compare(kData, "abc"); +} |