PR c++/91521 - wrong error with operator->.

	* decl.c (grokdeclarator): Return error_mark_node for an invalid
	trailing return type.

	* g++.dg/parse/operator8.C: New test.

From-SVN: r274892

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 512e4e7ac15f86f677f84ea7ed6c4fdcd1d9d7ea..adc0a83970887332aad0eee9a1b9fa5aee3f6d5a 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,12 @@
+2019-08-23  Marek Polacek  <polacek@redhat.com>
+
+       Backported from mainline
+       2019-08-23  Marek Polacek  <polacek@redhat.com>
+
+       PR c++/91521 - wrong error with operator->.
+       * decl.c (grokdeclarator): Return error_mark_node for an invalid
+       trailing return type.
+
 2019-08-16  Jason Merrill  <jason@redhat.com>
 
        PR c++/90393 - ICE with throw in ?:

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 92e58af8c144e31abd13668da7b3e77de365d0f7..05ceda89d4c9961096762051a996d3ceb0ce96d3 100644 (file)
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -11436,6 +11436,8 @@ grokdeclarator (const cp_declarator *declarator,
                else if (late_return_type
                         && sfk != sfk_conversion)
                  {
+                   if (late_return_type == error_mark_node)
+                     return error_mark_node;
                    if (cxx_dialect < cxx11)
                      /* Not using maybe_warn_cpp0x because this should
                         always be an error.  */

diff --git a/gcc/testsuite/g++.dg/parse/operator8.C b/gcc/testsuite/g++.dg/parse/operator8.C
new file mode 100644 (file)
index 0000000..c5ee3eb
--- /dev/null
+++ b/gcc/testsuite/g++.dg/parse/operator8.C
@@ -0,0 +1,13 @@
+// PR c++/91521 - wrong error with operator->.
+// { dg-do compile }
+
+struct foo {
+       int bar() { return 0; }
+       foo* operator->() { return this; }
+};
+
+int main()
+{
+       int pt(foo()->bar());
+       return pt;
+}