* tree.c (contains_placeholder_p): Return 0 for a SAVE_EXPR.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@140819 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d053f30..043f8d2 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2008-10-01  Geert Bosch  <bosch@adacore.com>
+
+       * tree.c (contains_placeholder_p): Return 0 for a SAVE_EXPR.
+
 2008-10-01  Richard Guenther  <rguenther@suse.de>
 
        PR tree-optimization/37617

diff --git a/gcc/testsuite/gnat.dg/test_overflow_sum.adb b/gcc/testsuite/gnat.dg/test_overflow_sum.adb
new file mode 100644 (file)
index 0000000..fc70ac7
--- /dev/null
+++ b/gcc/testsuite/gnat.dg/test_overflow_sum.adb
@@ -0,0 +1,45 @@
+--  { dg-do run }
+--  { dg-options "-gnato" }
+
+procedure test_overflow_sum is
+   pragma Unsuppress (Overflow_Check);
+   function sum (a, b, c, d, e, f, g, h, i, j, k, l, m,
+                 n, o, p, q, r, s, t, u, v, w, x, y, z : Integer)
+                 return Integer
+   is
+   begin
+      return a + b + c + d + e + f + g + h + i + j + k + l + m
+           + n + o + p + q + r + s + t + u + v + w + x + y + z;
+   end;
+
+   f : integer;
+begin
+   f := sum (a => -2**31, b =>      1, c =>  2**31 - 1,  -- 0
+             d =>      1, e => -2**31, f =>  2**31 - 1,  -- 0
+             g =>   2**0, h =>      2, i =>          4,  -- 2**3 - 1
+             j =>   2**3, k =>   2**4, l =>       2**5,  -- 2**6 - 1
+             m =>   2**6, n =>   2**7, o =>       2**8,  -- 2**9 - 1
+             p =>   2**9, q =>  2**10, r =>      2**11,  -- 2**12 - 1
+             s =>  2**12, t =>  2**13, u =>      2**14,  -- 2**15 - 1
+             v =>  2**15, w =>  2**16, x =>      2**17,  -- 2**18 - 1
+             y =>  2**31 - 2**18,      z =>          0); -- 2**31 - 1
+
+   if f /= 2**31 - 1 then
+      raise Program_Error;
+   end if;
+
+   begin
+      f := sum (a =>      f, b => -2**31, c =>          1,  -- 0
+                d => -2**31, e =>      1, f =>          f,  -- 0
+                g =>   2**0, h =>      2, i =>          4,  -- 2**3 - 1
+                j =>   2**3, k =>   2**4, l =>       2**5,  -- 2**6 - 1
+                m =>   2**6, n =>   2**7, o =>       2**8,  -- 2**9 - 1
+                p =>   2**9, q =>  2**10, r =>      2**11,  -- 2**12 - 1
+                s =>  2**12, t =>  2**13, u =>      2**14,  -- 2**15 - 1
+                v =>  2**15, w =>  2**16, x =>      2**17,  -- 2**18 - 1
+                y =>  2**31 - 2**18,      z =>          1); -- 2**31 (overflow)
+      raise Program_Error;
+   exception
+      when Constraint_Error => null;
+   end;
+end test_overflow_sum;

diff --git a/gcc/tree.c b/gcc/tree.c
index 3d2f3e1..4b178d5 100644 (file)
--- a/gcc/tree.c
+++ b/gcc/tree.c
@@ -2492,6 +2492,11 @@ contains_placeholder_p (const_tree exp)
                  || CONTAINS_PLACEHOLDER_P (TREE_OPERAND (exp, 1))
                  || CONTAINS_PLACEHOLDER_P (TREE_OPERAND (exp, 2)));
 
+       case SAVE_EXPR:
+         /* The save_expr function never wraps anything containing
+            a PLACEHOLDER_EXPR. */
+         return 0;
+
        default:
          break;
        }