From 1432b19f40085f820a883101a40e878452b15e2a Mon Sep 17 00:00:00 2001
From: Alexandre Oliva <aoliva@redhat.com>
Date: Mon, 15 Oct 2007 17:07:20 +0000
Subject: [PATCH] re PR tree-optimization/33735 (verify_stmts failed: missing
PHI def)
gcc/ChangeLog:
PR tree-optimization/33735
PR tree-optimization/33572
* tree-inline.c (update_ssa_across_abnormal_edges): Revert
2007-10-09's change.
* except.c (duplicate_eh_regions): Don't look for prev_try
beyond ERT_ALLOWED_EXCEPTIONS with an empty list.
gcc/testsuite/ChangeLog:
PR tree-optimization/33735
* g++.dg/torture/pr33735.C: New.
From-SVN: r129356
---
gcc/ChangeLog | 9 +++++++++
gcc/except.c | 4 +++-
gcc/testsuite/ChangeLog | 5 +++++
gcc/testsuite/g++.dg/torture/pr33735.C | 21 +++++++++++++++++++++
gcc/tree-inline.c | 3 +--
5 files changed, 39 insertions(+), 3 deletions(-)
create mode 100644 gcc/testsuite/g++.dg/torture/pr33735.C
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f627ef7d157d..2348ecc98438 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2007-10-15 Alexandre Oliva <aoliva@redhat.com>
+
+ PR tree-optimization/33735
+ PR tree-optimization/33572
+ * tree-inline.c (update_ssa_across_abnormal_edges): Revert
+ 2007-10-09's change.
+ * except.c (duplicate_eh_regions): Don't look for prev_try
+ beyond ERT_ALLOWED_EXCEPTIONS with an empty list.
+
2007-10-15 Alexandre Oliva <aoliva@redhat.com>
PR middle-end/33706
diff --git a/gcc/except.c b/gcc/except.c
index fe98299450d1..0fbda613961a 100644
--- a/gcc/except.c
+++ b/gcc/except.c
@@ -1005,7 +1005,9 @@ duplicate_eh_regions (struct function *ifun, duplicate_eh_regions_map map,
for (prev_try = VEC_index (eh_region, cfun->eh->region_array, outer_region);
prev_try && prev_try->type != ERT_TRY;
prev_try = prev_try->outer)
- if (prev_try->type == ERT_MUST_NOT_THROW)
+ if (prev_try->type == ERT_MUST_NOT_THROW
+ || (prev_try->type == ERT_ALLOWED_EXCEPTIONS
+ && !prev_try->u.allowed.type_list))
{
prev_try = NULL;
break;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 7f09cddb89ca..12b8cba6cb2f 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-15 Alexandre Oliva <aoliva@redhat.com>
+
+ PR tree-optimization/33735
+ * g++.dg/torture/pr33735.C: New.
+
2007-10-15 Alexandre Oliva <aoliva@redhat.com>
PR middle-end/33706
diff --git a/gcc/testsuite/g++.dg/torture/pr33735.C b/gcc/testsuite/g++.dg/torture/pr33735.C
new file mode 100644
index 000000000000..0a90745b91e5
--- /dev/null
+++ b/gcc/testsuite/g++.dg/torture/pr33735.C
@@ -0,0 +1,21 @@
+// { dg-do compile }
+#include <string>
+typedef struct _ts { } PyThreadState;
+PyThreadState * Py_NewInterpreter(void);
+void Py_EndInterpreter(PyThreadState *);
+class ApplicationError {
+public:
+ ApplicationError(std::string errormsg) : errormsg(errormsg) { }
+ std::string errormsg;
+};
+void run()
+{
+ PyThreadState *py_state=__null;
+ try {
+ if (!(py_state=Py_NewInterpreter()))
+ throw ApplicationError("error");
+ }
+ catch(ApplicationError e) {
+ Py_EndInterpreter(py_state);
+ }
+}
diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c
index 7ebfbcd4a6ce..55aef3d5c6e3 100644
--- a/gcc/tree-inline.c
+++ b/gcc/tree-inline.c
@@ -1064,8 +1064,7 @@ update_ssa_across_abnormal_edges (basic_block bb, basic_block ret_bb,
}
re = find_edge (ret_bb, e->dest);
- if (!re)
- continue;
+ gcc_assert (re);
gcc_assert ((re->flags & (EDGE_EH | EDGE_ABNORMAL))
== (e->flags & (EDGE_EH | EDGE_ABNORMAL)));
--
GitLab