diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2017-02-06 21:05:09 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2017-02-06 21:05:09 +0100 |
| commit | e8b0383c1324a80e554e9e0401dc5830c700bb0e (patch) | |
| tree | fd703b0324b6a08e36660618e2b6bbd5bb8e8108 | |
| parent | a5e8cbd150d7e7200d54e2e1e125161139e2c7b8 (diff) | |
| download | gcc-e8b0383c1324a80e554e9e0401dc5830c700bb0e.zip gcc-e8b0383c1324a80e554e9e0401dc5830c700bb0e.tar.gz gcc-e8b0383c1324a80e554e9e0401dc5830c700bb0e.tar.bz2 | |
re PR c++/79377 (ICE with increment operator in -fpermissive mode)
PR c++/79377
* tree.c (build_min_non_dep_op_overload): For POST{INC,DEC}REMENT_EXPR
allow one fewer than expected arguments if flag_permissive.
* g++.dg/lookup/pr79377.C: New test.
From-SVN: r245219
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/tree.c | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/lookup/pr79377.C | 36 |
4 files changed, 47 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 9889c17..a318c7f 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2017-02-06 Jakub Jelinek <jakub@redhat.com> + PR c++/79377 + * tree.c (build_min_non_dep_op_overload): For POST{INC,DEC}REMENT_EXPR + allow one fewer than expected arguments if flag_permissive. + PR c++/79372 * decl.c (cp_finish_decomp): On error set decl type to error_mark_node. * pt.c (tsubst_expr): Don't call tsubst_decomp_names on decompositions diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c index 3ecc2b0..afd442f 100644 --- a/gcc/cp/tree.c +++ b/gcc/cp/tree.c @@ -2938,8 +2938,10 @@ build_min_non_dep_op_overload (enum tree_code op, nargs = call_expr_nargs (non_dep); expected_nargs = cp_tree_code_length (op); - if (op == POSTINCREMENT_EXPR - || op == POSTDECREMENT_EXPR) + if ((op == POSTINCREMENT_EXPR + || op == POSTDECREMENT_EXPR) + /* With -fpermissive non_dep could be operator++(). */ + && (!flag_permissive || nargs != expected_nargs)) expected_nargs += 1; gcc_assert (nargs == expected_nargs); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 954851b..3313268 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,8 @@ 2017-02-06 Jakub Jelinek <jakub@redhat.com> + PR c++/79377 + * g++.dg/lookup/pr79377.C: New test. + PR c++/79372 * g++.dg/cpp1z/decomp25.C: New test. diff --git a/gcc/testsuite/g++.dg/lookup/pr79377.C b/gcc/testsuite/g++.dg/lookup/pr79377.C new file mode 100644 index 0000000..baf9a25 --- /dev/null +++ b/gcc/testsuite/g++.dg/lookup/pr79377.C @@ -0,0 +1,36 @@ +// PR c++/79377 +// { dg-do run } +// { dg-options "-fpermissive" } + +struct A +{ + A () : a (0) {} + A& operator++ () { ++a; ++c; return *this; } + int a; + static int c; +}; + +int A::c = 0; + +template <typename> +void +foo (A& a) +{ + a++; // { dg-warning "trying prefix operator instead" } + if (A::c != 3 || a.a != 3) __builtin_abort (); + ++a; + if (A::c != 4 || a.a != 4) __builtin_abort (); +} + +int +main () +{ + A a; + if (A::c != 0 || a.a != 0) __builtin_abort (); + ++a; + if (A::c != 1 || a.a != 1) __builtin_abort (); + a++; // { dg-warning "trying prefix operator instead" } + if (A::c != 2 || a.a != 2) __builtin_abort (); + foo<int> (a); + if (A::c != 4 || a.a != 4) __builtin_abort (); +} |