* constexpr.c, error.c, tree.c: Remove WITH_CLEANUP_EXPR handling.

From-SVN: r249818

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 5549f720141f3cafef75074c3d2b1b79ed1b20c5..2117eb6f5a1c4897803642489ae0d073175d708d 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,7 @@
 2017-06-29  Jason Merrill  <jason@redhat.com>
 
+       * constexpr.c, error.c, tree.c: Remove WITH_CLEANUP_EXPR handling.
+
        PR c++/81180 - ICE with C++17 deduction of member class template.
        * pt.c (build_deduction_guide): Correct member template handling.
 

diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c
index 5a57452486641254448a29e0a689a349e07e1cb8..32180a74c3fd3cb974193f96b31bdc4b13c7f692 100644 (file)
--- a/gcc/cp/constexpr.c
+++ b/gcc/cp/constexpr.c
@@ -4519,7 +4519,6 @@ cxx_eval_constant_expression (const constexpr_ctx *ctx, tree t,
       /* GCC internal stuff.  */
     case VA_ARG_EXPR:
     case OBJ_TYPE_REF:
-    case WITH_CLEANUP_EXPR:
     case NON_DEPENDENT_EXPR:
     case BASELINK:
     case OFFSET_REF:
@@ -5533,7 +5532,6 @@ potential_constant_expression_1 (tree t, bool want_rval, bool strict,
     case BIND_EXPR:
       return RECUR (BIND_EXPR_BODY (t), want_rval);
 
-    case WITH_CLEANUP_EXPR:
     case CLEANUP_POINT_EXPR:
     case MUST_NOT_THROW_EXPR:
     case TRY_CATCH_EXPR:

diff --git a/gcc/cp/error.c b/gcc/cp/error.c
index 86fa804b317a895e7a1e54f1fa1c8feb395d0721..43b5cec0a95f17f829256cf280b8bb2e3cb2aed3 100644 (file)
--- a/gcc/cp/error.c
+++ b/gcc/cp/error.c
@@ -2664,7 +2664,6 @@ dump_expr (cxx_pretty_printer *pp, tree t, int flags)
       break;
 
     case TRY_CATCH_EXPR:
-    case WITH_CLEANUP_EXPR:
     case CLEANUP_POINT_EXPR:
       dump_expr (pp, TREE_OPERAND (t, 0), flags);
       break;

diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c
index a52a9e8fa9f1a8ce4d864d7e11542cb9327dda49..c037b2c744000c9306b445540a2f384b3b345eb5 100644 (file)
--- a/gcc/cp/tree.c
+++ b/gcc/cp/tree.c
@@ -90,7 +90,6 @@ lvalue_kind (const_tree ref)
     case PREINCREMENT_EXPR:
     case PREDECREMENT_EXPR:
     case TRY_CATCH_EXPR:
-    case WITH_CLEANUP_EXPR:
     case REALPART_EXPR:
     case IMAGPART_EXPR:
       return lvalue_kind (TREE_OPERAND (ref, 0));
@@ -3584,11 +3583,6 @@ cp_tree_equal (tree t1, tree t2)
        return cp_tree_equal (TREE_OPERAND (t1, 1), TREE_OPERAND (t2, 1));
       }
 
-    case WITH_CLEANUP_EXPR:
-      if (!cp_tree_equal (TREE_OPERAND (t1, 0), TREE_OPERAND (t2, 0)))
-       return false;
-      return cp_tree_equal (TREE_OPERAND (t1, 1), TREE_OPERAND (t1, 1));
-
     case PARM_DECL:
       /* For comparing uses of parameters in late-specified return types
         with an out-of-class definition of the function, but can also come