procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR c++/49932 ([C++0x] ICE on instantiating decltype(expr)::type with template)

Browse source 
PR c++/49932
gcc/cp/
	* mangle.c (write_prefix): Handle decltype.
libiberty/
	* cp-demangle.c (d_prefix): Handle decltype.

From-SVN: r177074
This commit is contained in:
Jason Merrill 2011-08-01 17:02:07 -04:00 • committed by Jason Merrill
parent 3748a54ca3
commit 4bbff96e36
7 changed files with 57 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
gcc/cp/ChangeLog
View file

@ -1,5 +1,8 @@
2011-08-01 Jason Merrill <jason@redhat.com>
PR c++/49932
* mangle.c (write_prefix): Handle decltype.
PR c++/49924
* semantics.c (cxx_eval_vec_init_1): Fix logic.

7
gcc/cp/mangle.c
View file

@ -952,6 +952,7 @@ write_nested_name (const tree decl)
/* <prefix> ::= <prefix> <unqualified-name>
::= <template-param>
::= <template-prefix> <template-args>
::= <decltype>
::= # empty
::= <substitution> */
@ -968,6 +969,12 @@ write_prefix (const tree node)
MANGLE_TRACE_TREE ("prefix", node);
if (TREE_CODE (node) == DECLTYPE_TYPE)
{
write_type (node);
return;
}
if (find_substitution (node))
return;

3
gcc/testsuite/ChangeLog
View file

@ -1,5 +1,8 @@
2011-08-01 Jason Merrill <jason@redhat.com>
PR c++/49932
* g++.dg/abi/mangle49.C: New.
PR c++/49924
* g++.dg/cpp0x/constexpr-array4.C: New.

22
gcc/testsuite/g++.dg/abi/mangle49.C Normal file
View file

@ -0,0 +1,22 @@
// PR c++/49932
// { dg-options "-std=c++0x -fabi-version=0" }
template < typename T >
auto
f1( T x ) // ICE on here
-> typename decltype( x )::type {}
template < typename T >
typename decltype( T() )::type
f2( T x ) {} // ICE on here
struct S { typedef void type; };
void g()
{
f1( S() );
f2( S() );
}
// { dg-final { scan-assembler "_Z2f1I1SENDtfp_E4typeET_" } }
// { dg-final { scan-assembler "_Z2f2I1SENDTcvT__EE4typeES1_" } }

6
libiberty/ChangeLog
View file

@ -1,3 +1,9 @@
2011-08-01 Jason Merrill <jason@redhat.com>
PR c++/49932
* cp-demangle.c (d_prefix): Handle decltype.
* testsuite/demangle-expected: Test it.
2011-07-26 H.J. Lu <hongjiu.lu@intel.com>
* testsuite/demangle-expected: Remove an extra line.

14
libiberty/cp-demangle.c
View file

@ -1280,6 +1280,7 @@ d_nested_name (struct d_info *di)
/* <prefix> ::= <prefix> <unqualified-name>
::= <template-prefix> <template-args>
::= <template-param>
::= <decltype>
::=
::= <substitution>
@ -1308,10 +1309,19 @@ d_prefix (struct d_info *di)
<template-param> here. */
comb_type = DEMANGLE_COMPONENT_QUAL_NAME;
if (IS_DIGIT (peek)
if (peek == 'D')
{
char peek2 = d_peek_next_char (di);
if (peek2 == 'T' || peek2 == 't')
/* Decltype. */
dc = cplus_demangle_type (di);
else
/* Destructor name. */
dc = d_unqualified_name (di);
}
else if (IS_DIGIT (peek)
|| IS_LOWER (peek)
|| peek == 'C'
|| peek == 'D'
|| peek == 'U'
|| peek == 'L')
dc = d_unqualified_name (di);

4
libiberty/testsuite/demangle-expected
View file

@ -3901,6 +3901,10 @@ java resource java/util/iso4217.properties
--format=gnu-v3
_Z3addIidEDTplfp_fp0_ET_T0_
decltype ({parm#1}+{parm#2}) add<int, double>(int, double)
# decltype scope test
--format=gnu-v3
_Z1fI1SENDtfp_E4typeET_
decltype ({parm#1})::type f<S>(S)
# decltype/fn call test
--format=gnu-v3
_Z4add3IidEDTclL_Z1gEfp_fp0_EET_T0_