From: Richard Guenther <rguenther@suse.de>
Date: Tue, 16 Mar 2010 12:31:38 +0000 (+0000)
Subject: re PR tree-optimization/43379 (ICE: error: SSA_NAME_OCCURS_IN_ABNORMAL_PHI should... 
X-Git-Tag: releases/gcc-4.5.0~362
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7686fb74efd6744c19e457f7e72bdc714ba5ec3e;p=thirdparty%2Fgcc.git

re PR tree-optimization/43379 (ICE: error: SSA_NAME_OCCURS_IN_ABNORMAL_PHI should be set with -O2 -ftracer)

2010-03-16  Richard Guenther  <rguenther@suse.de>

	PR middle-end/43379
	* tree-cfg.c (gimple_merge_blocks): When propagating virtual
	PHI operands make sure to merge SSA_NAME_OCCURS_IN_ABNORMAL_PHI
	properly.

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

From-SVN: r157478
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fda7e80c4b15..cd624b5a4231 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2010-03-16  Richard Guenther  <rguenther@suse.de>
+
+	PR middle-end/43379
+	* tree-cfg.c (gimple_merge_blocks): When propagating virtual
+	PHI operands make sure to merge SSA_NAME_OCCURS_IN_ABNORMAL_PHI
+	properly.
+
 2010-03-16  Aldy Hernandez  <aldyh@redhat.com>
 	    Alexandre Oliva  <aoliva@redhat.com>
 
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index dfe0246adb9b..37d07651ee67 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-16  Richard Guenther  <rguenther@suse.de>
+
+	PR middle-end/43379
+	* gcc.dg/pr43379.c: New testcase.
+
 2010-03-16  Jakub Jelinek  <jakub@redhat.com>
 
 	PR debug/43051
diff --git a/gcc/testsuite/gcc.dg/pr43379.c b/gcc/testsuite/gcc.dg/pr43379.c
new file mode 100644
index 000000000000..de9bf66ae197
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr43379.c
@@ -0,0 +1,11 @@
+/* { dg-do compile } */
+/* { dg-options "-O2 -ftracer" } */
+
+void *foo(int i, int *p)
+{
+lab:
+  if (p) *p = i;
+  goto *p;
+  return &&lab;
+}
+
diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c
index 6f4e4167a6bc..01fefc306ef5 100644
--- a/gcc/tree-cfg.c
+++ b/gcc/tree-cfg.c
@@ -1617,6 +1617,9 @@ gimple_merge_blocks (basic_block a, basic_block b)
 	      FOR_EACH_IMM_USE_STMT (stmt, iter, def)
 		FOR_EACH_IMM_USE_ON_STMT (use_p, iter)
 		  SET_USE (use_p, use);
+
+	      if (SSA_NAME_OCCURS_IN_ABNORMAL_PHI (def))
+		SSA_NAME_OCCURS_IN_ABNORMAL_PHI (use) = 1;
 	    }
 	  else
             replace_uses_by (def, use);