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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@129356 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f627ef7..2348ecc 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,14 @@
 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
        * tree-inline.c (copy_bb): Use bsi_replace to replace a
        __builtin_va_arg_pack-containing call stmt.

diff --git a/gcc/except.c b/gcc/except.c
index fe98299..0fbda61 100644 (file)
--- 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 7f09cdd..12b8cba 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,10 @@
 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
        * gcc.dg/va-arg-pack-2.c: New.
 

diff --git a/gcc/testsuite/g++.dg/torture/pr33735.C b/gcc/testsuite/g++.dg/torture/pr33735.C
new file mode 100644 (file)
index 0000000..0a90745
--- /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 7ebfbcd..55aef3d 100644 (file)
--- 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)));