The C++ front end hasn't generated WITH_CLEANUP_EXPR in a very long time (20+ years?), so there's no need to handle it.
Tested x86_64-pc-linux-gnu, applying to trunk.
commit 8ce76bba3bf7866a2338125b4c55b0a1e3ce9221 Author: Jason Merrill <ja...@redhat.com> Date: Thu Jun 29 15:56:20 2017 -0400 * constexpr.c, error.c, tree.c: Remove WITH_CLEANUP_EXPR handling. diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c index 5a57452..32180a7 100644 --- 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 86fa804..43b5cec 100644 --- 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 a52a9e8..c037b2c 100644 --- 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