From: Paolo Carlini <paolo.carlini@oracle.com>
Date: Tue, 2 Jun 2015 10:28:14 +0000 (+0000)
Subject: re PR c++/61683 (decltype-specifier not accepted as mem-initializer-id)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a983abd29c19a3bbfa39512d1622e92797f22521;p=gcc.git

re PR c++/61683 (decltype-specifier not accepted as mem-initializer-id)

/cp
2015-06-02  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/61683
	* parser.c (cp_parser_mem_initializer): Allow for decltype-specifier.

/testsuite
2015-06-02  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/61683
	* g++.dg/cpp0x/decltype-mem-initializer1.C: New.

From-SVN: r224022
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index be1a3f96717..c6f1a6d2282 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2015-06-02  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/61683
+	* parser.c (cp_parser_mem_initializer): Allow for decltype-specifier.
+
 2015-06-01  Jason Merrill  <jason@redhat.com>
 
 	PR c++/65942
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index bc48c11cbc6..9ae555c1354 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -12803,11 +12803,12 @@ cp_parser_mem_initializer (cp_parser* parser)
 
    mem-initializer-id:
      :: [opt] nested-name-specifier [opt] class-name
+     decltype-specifier (C++11)
      identifier
 
-   Returns a TYPE indicating the class to be initializer for the first
-   production.  Returns an IDENTIFIER_NODE indicating the data member
-   to be initialized for the second production.  */
+   Returns a TYPE indicating the class to be initialized for the first
+   production (and the second in C++11).  Returns an IDENTIFIER_NODE
+   indicating the data member to be initialized for the last production.  */
 
 static tree
 cp_parser_mem_initializer_id (cp_parser* parser)
@@ -12865,14 +12866,18 @@ cp_parser_mem_initializer_id (cp_parser* parser)
 				 /*is_declaration=*/true);
   /* Otherwise, we could also be looking for an ordinary identifier.  */
   cp_parser_parse_tentatively (parser);
-  /* Try a class-name.  */
-  id = cp_parser_class_name (parser,
-			     /*typename_keyword_p=*/true,
-			     /*template_keyword_p=*/false,
-			     none_type,
-			     /*check_dependency_p=*/true,
-			     /*class_head_p=*/false,
-			     /*is_declaration=*/true);
+  if (cp_lexer_next_token_is_decltype (parser->lexer))
+    /* Try a decltype-specifier.  */
+    id = cp_parser_decltype (parser);
+  else
+    /* Otherwise, try a class-name.  */
+    id = cp_parser_class_name (parser,
+			       /*typename_keyword_p=*/true,
+			       /*template_keyword_p=*/false,
+			       none_type,
+			       /*check_dependency_p=*/true,
+			       /*class_head_p=*/false,
+			       /*is_declaration=*/true);
   /* If we found one, we're done.  */
   if (cp_parser_parse_definitely (parser))
     return id;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 39617815ba6..2ea81dd1bba 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2015-06-02  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/61683
+	* g++.dg/cpp0x/decltype-mem-initializer1.C: New.
+
 2015-06-02  Bin Cheng  <bin.cheng@arm.com>
 
 	PR tree-optimization/48052
diff --git a/gcc/testsuite/g++.dg/cpp0x/decltype-mem-initializer1.C b/gcc/testsuite/g++.dg/cpp0x/decltype-mem-initializer1.C
new file mode 100644
index 00000000000..d036b2929f9
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/decltype-mem-initializer1.C
@@ -0,0 +1,8 @@
+// PR c++/61683
+// { dg-do compile { target c++11 } }
+
+struct A {};
+A a;
+struct B : A {
+  B(): decltype(a)() {}
+};