diff options
| author | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-10-21 18:18:55 +0000 |
|---|---|---|
| committer | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-10-21 18:18:55 +0000 |
| commit | 2e358325c8117bb973f3d3169a2f6675e9ca9188 (patch) | |
| tree | 62ea0e195344c092241f8f23009c4faeb6e0ce83 /gcc | |
| parent | 1f46ee3914923d28579fa65f64307b089549e1ae (diff) | |
| download | ppe42-gcc-2e358325c8117bb973f3d3169a2f6675e9ca9188.tar.gz ppe42-gcc-2e358325c8117bb973f3d3169a2f6675e9ca9188.zip | |
/cp
2011-10-21 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/31423
* typeck2.c (cxx_incomplete_type_diagnostic): Improve error message
for invalid use of member function.
/testsuite
2011-10-21 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/31423
* g++.dg/parse/error43.C: New.
* g++.dg/parse/error44.C: Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@180309 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/typeck2.c | 11 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/parse/error43.C | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/parse/error44.C | 11 |
5 files changed, 37 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 11994ee4b13..b58ee153457 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2011-10-21 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/31423 + * typeck2.c (cxx_incomplete_type_diagnostic): Improve error message + for invalid use of member function. + 2011-10-21 Ville Voutilainen <ville.voutilainen@gmail.com> PR c++/50811 diff --git a/gcc/cp/typeck2.c b/gcc/cp/typeck2.c index 580f6690b29..0cb1104dc38 100644 --- a/gcc/cp/typeck2.c +++ b/gcc/cp/typeck2.c @@ -428,8 +428,15 @@ cxx_incomplete_type_diagnostic (const_tree value, const_tree type, case OFFSET_TYPE: bad_member: - emit_diagnostic (diag_kind, input_location, 0, - "invalid use of member (did you forget the %<&%> ?)"); + if (DECL_FUNCTION_MEMBER_P (TREE_OPERAND (value, 1)) + && ! flag_ms_extensions) + emit_diagnostic (diag_kind, input_location, 0, + "invalid use of member function " + "(did you forget the %<()%> ?)"); + else + emit_diagnostic (diag_kind, input_location, 0, + "invalid use of member " + "(did you forget the %<&%> ?)"); break; case TEMPLATE_TYPE_PARM: diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index ef3404611df..ae3e60fddf8 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2011-10-21 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/31423 + * g++.dg/parse/error43.C: New. + * g++.dg/parse/error44.C: Likewise. + 2011-10-21 H.J. Lu <hongjiu.lu@intel.com> Kirill Yukhin <kirill.yukhin@intel.com> diff --git a/gcc/testsuite/g++.dg/parse/error43.C b/gcc/testsuite/g++.dg/parse/error43.C new file mode 100644 index 00000000000..e352fa5c70d --- /dev/null +++ b/gcc/testsuite/g++.dg/parse/error43.C @@ -0,0 +1,5 @@ +// PR c++/31423 +// { dg-options "" } + +class C { public: C* f(); int get(); }; +int f(C* p) { return p->f->get(); } // { dg-error "forget the '\\(\\)'|base operand" } diff --git a/gcc/testsuite/g++.dg/parse/error44.C b/gcc/testsuite/g++.dg/parse/error44.C new file mode 100644 index 00000000000..2ebbe710c7c --- /dev/null +++ b/gcc/testsuite/g++.dg/parse/error44.C @@ -0,0 +1,11 @@ +// PR c++/31423 +// { dg-options "-fms-extensions" } + +struct C { + int f() { return 1; } + int g() { return 2; } +}; + +int f(C& c) { + return c.g == &c.f; // { dg-error "forget the '&'" } +} |
