re PR c++/38313 (g++ fails to parse a member function with a parenthesized type name...

/cp
2013-11-03  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/38313
	* parser.c (cp_parser_constructor_declarator_p): Check that the
	class-name matches current_class_type.

/testsuite
2013-11-03  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/38313
	* g++.dg/lookup/name-clash10.C: New.

From-SVN: r204339

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index cadf6749e6cb20aebd22faa2193c323b024d2cd5..acdf4b5da11c40fdd116345790fd60e940ac5659 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2013-11-03  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       PR c++/38313
+       * parser.c (cp_parser_constructor_declarator_p): Check that the
+       class-name matches current_class_type.
+
 2013-11-03  Marek Polacek  <polacek@redhat.com>
 
        * decl.c (cp_finish_decl): Move C++1y bounds checking...

diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 4e06e8af0b66500348a7e88f96b9fe135a1343c6..3df746a3683fbe799d9c54b950eef874eb3c008b 100644 (file)
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -22211,6 +22211,7 @@ static bool
 cp_parser_constructor_declarator_p (cp_parser *parser, bool friend_p)
 {
   bool constructor_p;
+  bool outside_class_specifier_p;
   tree nested_name_specifier;
   cp_token *next_token;
 
@@ -22243,11 +22244,14 @@ cp_parser_constructor_declarator_p (cp_parser *parser, bool friend_p)
                                            /*check_dependency_p=*/false,
                                            /*type_p=*/false,
                                            /*is_declaration=*/false));
+
+  outside_class_specifier_p = (!at_class_scope_p ()
+                              || !TYPE_BEING_DEFINED (current_class_type)
+                              || friend_p);
+
   /* Outside of a class-specifier, there must be a
      nested-name-specifier.  */
-  if (!nested_name_specifier &&
-      (!at_class_scope_p () || !TYPE_BEING_DEFINED (current_class_type)
-       || friend_p))
+  if (!nested_name_specifier && outside_class_specifier_p)
     constructor_p = false;
   else if (nested_name_specifier == error_mark_node)
     constructor_p = false;
@@ -22286,8 +22290,16 @@ cp_parser_constructor_declarator_p (cp_parser *parser, bool friend_p)
                                        /*check_dependency_p=*/false,
                                        /*class_head_p=*/false,
                                        /*is_declaration=*/false);
-      /* If there was no class-name, then this is not a constructor.  */
-      constructor_p = !cp_parser_error_occurred (parser);
+      /* If there was no class-name, then this is not a constructor.
+        Otherwise, if we are in a class-specifier and we aren't
+        handling a friend declaration, check that its type matches
+        current_class_type (c++/38313).  Note: error_mark_node
+        is left alone for error recovery purposes.  */
+      constructor_p = (!cp_parser_error_occurred (parser)
+                      && (outside_class_specifier_p
+                          || type_decl == error_mark_node
+                          || same_type_p (current_class_type,
+                                          TREE_TYPE (type_decl))));
 
       /* If we're still considering a constructor, we have to see a `(',
         to begin the parameter-declaration-clause, followed by either a

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index c4358a94a6a1ddb355528587bbf808871c08653c..09dc34363e3110f6e1f10d077a4f1017b68d5524 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-03  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       PR c++/38313
+       * g++.dg/lookup/name-clash10.C: New.
+
 2013-11-03  Kugan Vivekanandarajah  <kuganv@linaro.org>
 
        * gcc.target/arm/neon-vcond-gt.c: Scan for vbsl or vbit or vbif.

diff --git a/gcc/testsuite/g++.dg/lookup/name-clash10.C b/gcc/testsuite/g++.dg/lookup/name-clash10.C
new file mode 100644 (file)
index 0000000..0a089be
--- /dev/null
+++ b/gcc/testsuite/g++.dg/lookup/name-clash10.C
@@ -0,0 +1,8 @@
+// PR c++/38313
+
+struct foo { };
+struct bar { };
+
+struct baz {
+  static foo (bar)();
+};