re PR middle-end/57287 (Bogus uninitialized warning with abnormal control flow)

2013-05-24  Richard Biener  <rguenther@suse.de>

	PR tree-optimization/57287
	* tree-ssa-uninit.c (compute_uninit_opnds_pos): Disregard
	all SSA names that occur in abnormal PHIs.

	* gcc.dg/pr57287.c: New testcase.

From-SVN: r199289

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 01f77cbfa87214f93a35f231c659c8cdbea584eb..dd36f0b33df08792c8e9f7d22fb3d767bcbed732 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2013-05-24  Richard Biener  <rguenther@suse.de>
+
+       PR tree-optimization/57287
+       * tree-ssa-uninit.c (compute_uninit_opnds_pos): Disregard
+       all SSA names that occur in abnormal PHIs.
+
 2013-05-24  Alexander Ivchenko  <alexander.ivchenko@intel.com>
 
        PR tree-ssa/57385

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index bb3b4997ae44ff021f09a65b035f8d9e68da0509..cd0842df50c8106c74d0d8721376602cc8029ff8 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2013-05-24  Richard Biener  <rguenther@suse.de>
+
+       PR tree-optimization/57287
+       * gcc.dg/pr57287.c: New testcase.
+
 2013-05-24  Paolo Carlini  <paolo.carlini@oracle.com>
 
        PR c++/26572

diff --git a/gcc/testsuite/gcc.dg/pr57287.c b/gcc/testsuite/gcc.dg/pr57287.c
new file mode 100644 (file)
index 0000000..72225b1
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr57287.c
@@ -0,0 +1,24 @@
+/* { dg-do compile } */
+/* { dg-options "-O2 -Wall" } */
+
+#include <setjmp.h>
+
+jmp_buf buf;
+
+void foo (int);
+void bar (int) __attribute__((leaf));
+
+void enumerate_locals (int indent)
+{
+  foo (0);
+  while (indent--)
+    {
+      int local_indent = 8 + (8 * indent);
+      if (local_indent != 8)
+       {
+         setjmp (buf);
+         bar (local_indent);  /* { dg-bogus "may be used uninitialized" "" } */
+       }
+    }
+  foo (1);
+}

diff --git a/gcc/tree-ssa-uninit.c b/gcc/tree-ssa-uninit.c
index aa01c51658f2c66183cddfef2139bf934e5c8589..9a726f115a94d298dca43659c0c0a332f3cf8ce9 100644 (file)
--- a/gcc/tree-ssa-uninit.c
+++ b/gcc/tree-ssa-uninit.c
@@ -165,17 +165,12 @@ compute_uninit_opnds_pos (gimple phi)
           && uninit_undefined_value_p (op)
           && !can_skip_redundant_opnd (op, phi))
        {
-         /* Ignore SSA_NAMEs on abnormal edges to setjmp
-            or nonlocal goto receiver.  */
           if (cfun->has_nonlocal_label || cfun->calls_setjmp)
            {
-             edge e = gimple_phi_arg_edge (phi, i);
-             if (e->flags & EDGE_ABNORMAL)
-               {
-                 gimple last = last_stmt (e->src);
-                 if (last && stmt_can_make_abnormal_goto (last))
-                   continue;
-               }
+             /* Ignore SSA_NAMEs that appear on abnormal edges
+                somewhere.  */
+             if (SSA_NAME_OCCURS_IN_ABNORMAL_PHI (op))
+               continue;
            }
          MASK_SET_BIT (uninit_opnds, i);
        }