[backport gcc-4.9/trunk r199289, fixes PR57287 regression from
 pr56982-1 or pr56982-10-make-setjmp-leaf patch <mikpe@it.uu.se>]

gcc/

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/testsuite/

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

	PR tree-optimization/57287
	* gcc.dg/pr57287.c: New testcase.

--- gcc-4.8.0/gcc/testsuite/gcc.dg/pr57287.c.~1~	1970-01-01 01:00:00.000000000 +0100
+++ gcc-4.8.0/gcc/testsuite/gcc.dg/pr57287.c	2013-05-25 12:25:14.814333695 +0200
@@ -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);
+}
--- gcc-4.8.0/gcc/tree-ssa-uninit.c.~1~	2013-05-25 12:22:12.974518914 +0200
+++ gcc-4.8.0/gcc/tree-ssa-uninit.c	2013-05-25 12:25:14.804333706 +0200
@@ -152,17 +152,12 @@ compute_uninit_opnds_pos (gimple phi)
           && ssa_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);
 	}