From bf7e247271fe1ae00a94d1d4ba8e26db9767d5cb Mon Sep 17 00:00:00 2001
From: Richard Henderson <rth@redhat.com>
Date: Wed, 5 Oct 2005 17:02:57 -0700
Subject: [PATCH] re PR middle-end/23714 (ICE in expand_assignment)

        PR 23714
        * tree-cfg.c (mark_array_ref_addressable_1): New.
        (mark_array_ref_addressable): New.
        * tree-flow.h (mark_array_ref_addressable): Declare.
        * tree-optimize.c (execute_cleanup_cfg_post_optimizing): Use it.

From-SVN: r105022
---
 gcc/ChangeLog                      |  8 ++++++++
 gcc/testsuite/g++.dg/opt/pr23714.C | 16 +++++++++++++++
 gcc/tree-cfg.c                     | 33 ++++++++++++++++++++++++++++++
 gcc/tree-flow.h                    |  1 +
 gcc/tree-optimize.c                |  1 +
 5 files changed, 59 insertions(+)
 create mode 100644 gcc/testsuite/g++.dg/opt/pr23714.C

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 930e25b4bd3..a1ad3245328 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2005-10-05  Richard Henderson  <rth@redhat.com>
+
+	PR 23714
+	* tree-cfg.c (mark_array_ref_addressable_1): New.
+	(mark_array_ref_addressable): New.
+	* tree-flow.h (mark_array_ref_addressable): Declare.
+	* tree-optimize.c (execute_cleanup_cfg_post_optimizing): Use it.
+
 2005-10-05  Andrew Pinski  <pinskia@physics.uc.edu>
 
 	PR middle-end/20606
diff --git a/gcc/testsuite/g++.dg/opt/pr23714.C b/gcc/testsuite/g++.dg/opt/pr23714.C
new file mode 100644
index 00000000000..bf1b4ac5c96
--- /dev/null
+++ b/gcc/testsuite/g++.dg/opt/pr23714.C
@@ -0,0 +1,16 @@
+// { dg-do compile }
+// { dg-options "-O2 -fnon-call-exceptions" }
+
+void run (void) {
+  float stack[1];
+  float *sp = stack;
+  try
+  {
+    float value2 = ((float) *(--sp));
+    float value1 = ((float) *(--sp));
+    *(sp++) = (value1 - value2);
+  }
+  catch (int *ex)
+  {
+  }
+}
diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c
index d5d466edf49..74e6063c0ab 100644
--- a/gcc/tree-cfg.c
+++ b/gcc/tree-cfg.c
@@ -421,6 +421,39 @@ fold_cond_expr_cond (void)
     }
 }
 
+/* Mark the array of any remaining ARRAY_REFs as addressable.  */
+
+static tree
+mark_array_ref_addressable_1 (tree *tp, int *walk_subtrees,
+			      void *data ATTRIBUTE_UNUSED)
+{
+  tree t = *tp;
+
+  if (DECL_P (t) || TYPE_P (t))
+    *walk_subtrees = 0;
+  else if (TREE_CODE (t) == ARRAY_REF)
+    {
+      tree base = get_base_address (TREE_OPERAND (t, 0));
+      if (base && DECL_P (base))
+	TREE_ADDRESSABLE (base) = 1;
+    }
+
+  return NULL_TREE;
+}
+
+void
+mark_array_ref_addressable (void)
+{
+  basic_block bb;
+  block_stmt_iterator i;
+
+  FOR_EACH_BB (bb)
+    {
+      for (i = bsi_start (bb); !bsi_end_p(i); bsi_next(&i))
+	walk_tree (bsi_stmt_ptr (i), mark_array_ref_addressable_1, NULL, NULL);
+    }
+}
+
 /* Join all the blocks in the flowgraph.  */
 
 static void
diff --git a/gcc/tree-flow.h b/gcc/tree-flow.h
index ac34f66c55d..f00f09ebba9 100644
--- a/gcc/tree-flow.h
+++ b/gcc/tree-flow.h
@@ -556,6 +556,7 @@ extern tree gimplify_build3 (block_stmt_iterator *, enum tree_code,
 			     tree, tree, tree, tree);
 extern void init_empty_tree_cfg (void);
 extern void fold_cond_expr_cond (void);
+extern void mark_array_ref_addressable (void);
 extern void replace_uses_by (tree, tree);
 extern void start_recording_case_labels (void);
 extern void end_recording_case_labels (void);
diff --git a/gcc/tree-optimize.c b/gcc/tree-optimize.c
index 0678889c772..64b11d29927 100644
--- a/gcc/tree-optimize.c
+++ b/gcc/tree-optimize.c
@@ -133,6 +133,7 @@ static void
 execute_cleanup_cfg_post_optimizing (void)
 {
   fold_cond_expr_cond ();
+  mark_array_ref_addressable ();
   cleanup_tree_cfg ();
   cleanup_dead_labels ();
   group_case_labels ();
-- 
2.30.2