tree.c (mapcar): Handle TRY_CATCH_EXPR et al.

	* tree.c (mapcar): Handle TRY_CATCH_EXPR et al.
	* error.c (dump_expr): Likewise.

From-SVN: r17115

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index b4196fc1a196363e807164e429f5c4d897e02952..86e0b2f55d90083a1c8a06ea2086202b496564dd 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+Tue Dec 16 10:31:20 1997  Jason Merrill  <jason@yorick.cygnus.com>
+
+       * tree.c (mapcar): Handle TRY_CATCH_EXPR et al.
+       * error.c (dump_expr): Likewise.
+
 Mon Dec 15 12:22:04 1997  Jason Merrill  <jason@yorick.cygnus.com>
 
        * typeck.c (build_function_call_real): Remove "inline called before

diff --git a/gcc/cp/error.c b/gcc/cp/error.c
index 016573dfc871fa75d8888bc4b90d1172936d2514..6366a50b462f8099c56eeb622cabbb95b269e370 100644 (file)
--- a/gcc/cp/error.c
+++ b/gcc/cp/error.c
@@ -1534,6 +1534,12 @@ dump_expr (t, nop)
       OB_PUTS ("{unparsed}");
       break;
 
+    case TRY_CATCH_EXPR:
+    case WITH_CLEANUP_EXPR:
+    case CLEANUP_POINT_EXPR:
+      dump_expr (TREE_OPERAND (t, 0), nop);
+      break;
+
     case TREE_LIST:
       if (TREE_VALUE (t) && TREE_CODE (TREE_VALUE (t)) == FUNCTION_DECL)
        {

diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c
index 2d048abff4278dc4d613707309617d2ba357c9e5..0c03de9c93c76ba526980c0bb61b7c8645674170 100644 (file)
--- a/gcc/cp/tree.c
+++ b/gcc/cp/tree.c
@@ -1545,6 +1545,8 @@ mapcar (t, func)
     case POSTINCREMENT_EXPR:
     case ARRAY_REF:
     case SCOPE_REF:
+    case TRY_CATCH_EXPR:
+    case WITH_CLEANUP_EXPR:
       t = copy_node (t);
       TREE_OPERAND (t, 0) = mapcar (TREE_OPERAND (t, 0), func);
       TREE_OPERAND (t, 1) = mapcar (TREE_OPERAND (t, 1), func);
@@ -1573,6 +1575,7 @@ mapcar (t, func)
     case TRUTH_NOT_EXPR:
     case NOP_EXPR:
     case COMPONENT_REF:
+    case CLEANUP_POINT_EXPR:
       t = copy_node (t);
       TREE_OPERAND (t, 0) = mapcar (TREE_OPERAND (t, 0), func);
       return t;