diff options
| author | Jason Merrill <jason@redhat.com> | 2017-06-29 17:44:11 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2017-06-29 17:44:11 -0400 |
| commit | 0395a464ed59ff246b97bad727bc0d81bbb5d017 (patch) | |
| tree | 2526edc8a5a07d65ca0cabf5a8ad2df2f7deb397 | |
| parent | 47304c6a0b365ca21d95be5e532e8d5925ed04f3 (diff) | |
| download | gcc-0395a464ed59ff246b97bad727bc0d81bbb5d017.zip gcc-0395a464ed59ff246b97bad727bc0d81bbb5d017.tar.gz gcc-0395a464ed59ff246b97bad727bc0d81bbb5d017.tar.bz2 | |
* constexpr.c, error.c, tree.c: Remove WITH_CLEANUP_EXPR handling.
From-SVN: r249818
| -rw-r--r-- | gcc/cp/ChangeLog | 2 | ||||
| -rw-r--r-- | gcc/cp/constexpr.c | 2 | ||||
| -rw-r--r-- | gcc/cp/error.c | 1 | ||||
| -rw-r--r-- | gcc/cp/tree.c | 6 |
4 files changed, 2 insertions, 9 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 5549f72..2117eb6 100644 --- 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 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 |