re PR c++/12709 (ICE with __FUNCTION__ and function-try-block)

2004-01-13  Andrew Pinski  <pinskia@physics.uc.edu>

        PR c++/12709
        * c-common.c (finish_fname_decls): Use the chain only if the
        tree is an expr_stmt.

2004-01-13  Andrew Pinski  <pinskia@physics.uc.edu>

        PR c++/12709
        * g++.dg/parse/try-catch-1.C: New test.

From-SVN: r75814

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 408798a07144b37159e8eeca59773d465f097c70..aafb532d3ac8ee2af24a2b79a17622e8e6edec1d 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2004-01-13  Andrew Pinski  <pinskia@physics.uc.edu>
+
+       PR c++/12709
+       * c-common.c (finish_fname_decls): Use the chain only if the
+       tree is an expr_stmt.
+
 2004-01-13  Vladimir Makarov  <vmakarov@redhat.com>
 
         * rtl.def: Add comment about new option in automata_option.

diff --git a/gcc/c-common.c b/gcc/c-common.c
index e12a9c0fea840149bfe14880eb203c61f4b3e415..644511318c70709b5ff91fecdec8cf3461ce4e8b 100644 (file)
--- a/gcc/c-common.c
+++ b/gcc/c-common.c
@@ -1053,7 +1053,13 @@ finish_fname_decls (void)
       tree *p = &DECL_SAVED_TREE (current_function_decl);
       /* Skip the dummy EXPR_STMT and any EH_SPEC_BLOCK.  */
       while (TREE_CODE (*p) != COMPOUND_STMT)
-       p = &TREE_CHAIN (*p);
+       {
+         if (TREE_CODE (*p) == EXPR_STMT)
+           p = &TREE_CHAIN (*p);
+         else
+           p = &TREE_OPERAND(*p, 0);
+       }
+
       p = &COMPOUND_BODY (*p);
       if (TREE_CODE (*p) == SCOPE_STMT)
        p = &TREE_CHAIN (*p);

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 426e8cac441e6ab7786913c1e94f5102aa2d27e2..7a73238f8b50ba19d43f2ca7f86e1798a9d1ad55 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-13  Andrew Pinski  <pinskia@physics.uc.edu>
+
+       PR c++/12709
+       * g++.dg/parse/try-catch-1.C: New test.
+
 2004-01-13  Arnaud Charlet  <charlet@act-europe.fr>
 
        * ada/acats/run_all.sh: Add more verbose output in acats.log

diff --git a/gcc/testsuite/g++.dg/parse/try-catch-1.C b/gcc/testsuite/g++.dg/parse/try-catch-1.C
new file mode 100644 (file)
index 0000000..e4ed1ad
--- /dev/null
+++ b/gcc/testsuite/g++.dg/parse/try-catch-1.C
@@ -0,0 +1,14 @@
+// Test case from: <ncm-nospam@cantrip.org>
+// Reduced by <bangerth@dealii.org>
+// The problem was that g++ was ICE because
+// it was deferring an NULL pointer because
+// it should have been taking the operand 1
+// instead of the chain in finish_fname_decls.
+
+
+void fun()
+try
+{
+    __FUNCTION__;
+}
+catch (...) {}