OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR c++/45401 ([C++0x] reference collapsing and reference qualifiers)

Browse Source 
PR c++/45401
	* decl.c (grokdeclarator): Don't change type when adding rvalue ref
	to another reference type.

From-SVN: r174255
This commit is contained in:
Jason Merrill 2011-05-25 22:22:39 -04:00 committed by Jason Merrill
parent c688bbdd63
commit dc31ddad44
4 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gcc/cp/ChangeLog
View File

@ -1,5 +1,9 @@
2011-05-25 Jason Merrill <jason@redhat.com>
PR c++/45401
* decl.c (grokdeclarator): Don't change type when adding rvalue ref
to another reference type.
PR c++/44311
* decl.c (case_conversion): New.
(finish_case_label): Use it.

17
gcc/cp/decl.c
View File

@ -9200,13 +9200,18 @@ grokdeclarator (const cp_declarator *declarator,
to create the type "rvalue reference to cv TD' creates the
type TD."
*/
if (!VOID_TYPE_P (type))
if (VOID_TYPE_P (type))
/* We already gave an error. */;
else if (TREE_CODE (type) == REFERENCE_TYPE)
{
if (declarator->u.reference.rvalue_ref)
/* Leave type alone. */;
else
type = cp_build_reference_type (TREE_TYPE (type), false);
}
else
type = cp_build_reference_type
((TREE_CODE (type) == REFERENCE_TYPE
? TREE_TYPE (type) : type),
(declarator->u.reference.rvalue_ref
&& (TREE_CODE(type) != REFERENCE_TYPE
|| TYPE_REF_IS_RVALUE (type))));
(type, declarator->u.reference.rvalue_ref);
/* In C++0x, we need this check for direct reference to
reference declarations, which are forbidden by

2
gcc/testsuite/ChangeLog
View File

@ -1,5 +1,7 @@
2011-05-25 Jason Merrill <jason@redhat.com>
* g++.dg/cpp0x/rv-restrict.C: New.
* g++.dg/cpp0x/enum15.C: New.
* g++.dg/cpp0x/constexpr-switch2.C: New.

6
gcc/testsuite/g++.dg/cpp0x/rv-restrict.C Normal file
View File

@ -0,0 +1,6 @@
// PR c++/45401
// { dg-options -std=c++0x }
typedef int &__restrict restrictLvref;
typedef restrictLvref &&rvrefToRestrictLvref;
typedef restrictLvref rvrefToRestrictLvref;