Commit 0395a464 by Jason Merrill Committed by Jason Merrill

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

From-SVN: r249818
parent 47304c6a
2017-06-29 Jason Merrill <jason@redhat.com> 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. PR c++/81180 - ICE with C++17 deduction of member class template.
* pt.c (build_deduction_guide): Correct member template handling. * pt.c (build_deduction_guide): Correct member template handling.
......
...@@ -4519,7 +4519,6 @@ cxx_eval_constant_expression (const constexpr_ctx *ctx, tree t, ...@@ -4519,7 +4519,6 @@ cxx_eval_constant_expression (const constexpr_ctx *ctx, tree t,
/* GCC internal stuff. */ /* GCC internal stuff. */
case VA_ARG_EXPR: case VA_ARG_EXPR:
case OBJ_TYPE_REF: case OBJ_TYPE_REF:
case WITH_CLEANUP_EXPR:
case NON_DEPENDENT_EXPR: case NON_DEPENDENT_EXPR:
case BASELINK: case BASELINK:
case OFFSET_REF: case OFFSET_REF:
...@@ -5533,7 +5532,6 @@ potential_constant_expression_1 (tree t, bool want_rval, bool strict, ...@@ -5533,7 +5532,6 @@ potential_constant_expression_1 (tree t, bool want_rval, bool strict,
case BIND_EXPR: case BIND_EXPR:
return RECUR (BIND_EXPR_BODY (t), want_rval); return RECUR (BIND_EXPR_BODY (t), want_rval);
case WITH_CLEANUP_EXPR:
case CLEANUP_POINT_EXPR: case CLEANUP_POINT_EXPR:
case MUST_NOT_THROW_EXPR: case MUST_NOT_THROW_EXPR:
case TRY_CATCH_EXPR: case TRY_CATCH_EXPR:
......
...@@ -2664,7 +2664,6 @@ dump_expr (cxx_pretty_printer *pp, tree t, int flags) ...@@ -2664,7 +2664,6 @@ dump_expr (cxx_pretty_printer *pp, tree t, int flags)
break; break;
case TRY_CATCH_EXPR: case TRY_CATCH_EXPR:
case WITH_CLEANUP_EXPR:
case CLEANUP_POINT_EXPR: case CLEANUP_POINT_EXPR:
dump_expr (pp, TREE_OPERAND (t, 0), flags); dump_expr (pp, TREE_OPERAND (t, 0), flags);
break; break;
......
...@@ -90,7 +90,6 @@ lvalue_kind (const_tree ref) ...@@ -90,7 +90,6 @@ lvalue_kind (const_tree ref)
case PREINCREMENT_EXPR: case PREINCREMENT_EXPR:
case PREDECREMENT_EXPR: case PREDECREMENT_EXPR:
case TRY_CATCH_EXPR: case TRY_CATCH_EXPR:
case WITH_CLEANUP_EXPR:
case REALPART_EXPR: case REALPART_EXPR:
case IMAGPART_EXPR: case IMAGPART_EXPR:
return lvalue_kind (TREE_OPERAND (ref, 0)); return lvalue_kind (TREE_OPERAND (ref, 0));
...@@ -3584,11 +3583,6 @@ cp_tree_equal (tree t1, tree t2) ...@@ -3584,11 +3583,6 @@ cp_tree_equal (tree t1, tree t2)
return cp_tree_equal (TREE_OPERAND (t1, 1), TREE_OPERAND (t2, 1)); 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: case PARM_DECL:
/* For comparing uses of parameters in late-specified return types /* For comparing uses of parameters in late-specified return types
with an out-of-class definition of the function, but can also come with an out-of-class definition of the function, but can also come
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment