diff options
| author | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2017-08-03 09:26:17 +0000 |
|---|---|---|
| committer | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2017-08-03 09:26:17 +0000 |
| commit | c5e55d1c4264e66a0a34bd7410130c865d4bfc84 (patch) | |
| tree | 6f795c4db3c36f8b4c5eda23929eb85082064554 | |
| parent | 93c7cd0fa8578068ab8c51ced5f9af60b80da577 (diff) | |
| download | gcc-c5e55d1c4264e66a0a34bd7410130c865d4bfc84.tar.gz | |
/cp
2017-08-03 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/71440
* typeck.c (build_x_unary_op): Avoid pretty-printing constructor /
destructor as expressions.
/testsuite
2017-08-03 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/71440
* g++.dg/template/crash127.C: New.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@250848 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/typeck.c | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/crash127.C | 22 |
4 files changed, 36 insertions, 3 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 8be42940bd8..041c6c44bbe 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2017-08-03 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/71440 + * typeck.c (build_x_unary_op): Avoid pretty-printing constructor / + destructor as expressions. + 2017-08-02 Jakub Jelinek <jakub@redhat.com> PR c++/81640 diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c index 3dc64045e1a..a58de1d6206 100644 --- a/gcc/cp/typeck.c +++ b/gcc/cp/typeck.c @@ -5487,9 +5487,9 @@ build_x_unary_op (location_t loc, enum tree_code code, cp_expr xarg, { if (complain & tf_error) error (DECL_CONSTRUCTOR_P (fn) - ? G_("taking address of constructor %qE") - : G_("taking address of destructor %qE"), - xarg.get_value ()); + ? G_("taking address of constructor %qD") + : G_("taking address of destructor %qD"), + fn); return error_mark_node; } } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index a8077a53341..58e1b87c6dc 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2017-08-03 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/71440 + * g++.dg/template/crash127.C: New. + 2017-08-03 Jakub Jelinek <jakub@redhat.com> PR middle-end/81052 diff --git a/gcc/testsuite/g++.dg/template/crash127.C b/gcc/testsuite/g++.dg/template/crash127.C new file mode 100644 index 00000000000..b7c03251f8c --- /dev/null +++ b/gcc/testsuite/g++.dg/template/crash127.C @@ -0,0 +1,22 @@ +// PR c++/71440 + +struct A +{ + void f () {} +}; + +typedef void (A::*Ptr) (); + +template < Ptr > struct B {}; + +template < class T > +struct C : public A +{ + void bar () + { + B < &A::A > b; // { dg-error "taking address of constructor 'A::A" "" { target c++98_only } } + // { dg-error "taking address of constructor 'constexpr A::A" "" { target c++11 } .-1 } + } +}; + +template class C < int >; |