2012-06-14 Richard Guenther <rguenther@suse.de>

        Backport from mainline
        2012-06-11  Richard Guenther  <rguenther@suse.de>

	PR c++/53616
	* mangle.c (write_array_type): Use double-ints for array domain
	arithmetic.

	* g++.dg/ext/pr53605.C: New testcase.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_7-branch@188615 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 9b5a215..eac061e 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,6 +1,15 @@
 2012-06-14  Richard Guenther  <rguenther@suse.de>
 
        Backport from mainline
+       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-14  Richard Guenther  <rguenther@suse.de>
+
+       Backport from mainline
        2012-06-06  Fabien Chêne  <fabien@gcc.gnu.org>
 
        PR c++/52841

diff --git a/gcc/cp/mangle.c b/gcc/cp/mangle.c
index 81ac1da..b828be0 100644 (file)
--- a/gcc/cp/mangle.c
+++ b/gcc/cp/mangle.c
@@ -3107,8 +3107,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 67579f5..97db862 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2012-06-14  Richard Guenther  <rguenther@suse.de>
+
+       Backport from mainline
+       2012-06-11  Richard Guenther  <rguenther@suse.de>
+
+       PR c++/53616
+       * g++.dg/ext/pr53605.C: New testcase.
+
 2012-06-14  Tobias Burnus  <burnus@net-b.de>
 
        PR fortran/53597

diff --git a/gcc/testsuite/g++.dg/ext/pr53605.C b/gcc/testsuite/g++.dg/ext/pr53605.C
new file mode 100644 (file)
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");
+}