From c19267cbaf0188acd862e628b72fb32e68d08d48 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Wed, 21 Mar 2012 00:04:39 -0400 Subject: [PATCH] mangle.c (write_type): Handle 'auto'. gcc/cp/ * mangle.c (write_type): Handle 'auto'. * init.c (build_new): Don't do auto deduction where it might affect template mangling. libiberty/ * cp-demangle.c (cplus_demangle_type): Handle 'auto'. From-SVN: r185595 --- gcc/cp/ChangeLog | 4 ++++ gcc/cp/init.c | 4 +++- gcc/cp/mangle.c | 7 +++++++ gcc/testsuite/ChangeLog | 4 ++++ gcc/testsuite/g++.dg/cpp0x/auto32.C | 9 +++++++++ libiberty/ChangeLog | 4 ++++ libiberty/cp-demangle.c | 5 +++++ libiberty/testsuite/demangle-expected | 6 ++++++ 8 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/cpp0x/auto32.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 5fbf3f57a45..8dcc4462d04 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2012-03-20 Jason Merrill + * mangle.c (write_type): Handle 'auto'. + * init.c (build_new): Don't do auto deduction where it might + affect template mangling. + PR c++/52510 * decl.c (reshape_init_class): Handle repeated reshaping. * search.c (lookup_field_1): Add sanity check. diff --git a/gcc/cp/init.c b/gcc/cp/init.c index 1b2a1ef15ae..bcb5ab7a23b 100644 --- a/gcc/cp/init.c +++ b/gcc/cp/init.c @@ -2774,7 +2774,9 @@ build_new (VEC(tree,gc) **placement, tree type, tree nelts, if (type == error_mark_node) return error_mark_node; - if (nelts == NULL_TREE && VEC_length (tree, *init) == 1) + if (nelts == NULL_TREE && VEC_length (tree, *init) == 1 + /* Don't do auto deduction where it might affect mangling. */ + && (!processing_template_decl || at_function_scope_p ())) { tree auto_node = type_uses_auto (type); if (auto_node) diff --git a/gcc/cp/mangle.c b/gcc/cp/mangle.c index 5d6beb5d578..1536828a32c 100644 --- a/gcc/cp/mangle.c +++ b/gcc/cp/mangle.c @@ -1933,6 +1933,13 @@ write_type (tree type) break; case TEMPLATE_TYPE_PARM: + if (is_auto (type)) + { + write_identifier ("Da"); + ++is_builtin_type; + break; + } + /* else fall through. */ case TEMPLATE_PARM_INDEX: write_template_param (type); break; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index cca054e87f7..71f1fe7ed77 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2012-03-20 Jason Merrill + + * g++.dg/cpp0x/auto32.C: New. + 2012-03-20 Georg-Johann Lay PR testsuite/52641 diff --git a/gcc/testsuite/g++.dg/cpp0x/auto32.C b/gcc/testsuite/g++.dg/cpp0x/auto32.C new file mode 100644 index 00000000000..2aad34e40ac --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/auto32.C @@ -0,0 +1,9 @@ +// { dg-do compile { target c++11 } } + +// { dg-final { scan-assembler "_Z1fIiEDTnw_Dapifp_EET_" } } +template auto f(T t) -> decltype (new auto(t)); + +int main() +{ + f(1); +} diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 97bdfed4cc6..add9ff9d1a7 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,7 @@ +2012-03-20 Jason Merrill + + * cp-demangle.c (cplus_demangle_type): Handle 'auto'. + 2012-03-07 Jason Merrill * cp-demangle.c (cplus_demangle_operators): Add li. diff --git a/libiberty/cp-demangle.c b/libiberty/cp-demangle.c index 2b3d1820c60..d95b56c71a9 100644 --- a/libiberty/cp-demangle.c +++ b/libiberty/cp-demangle.c @@ -2270,6 +2270,11 @@ cplus_demangle_type (struct d_info *di) cplus_demangle_type (di), NULL); can_subst = 1; break; + + case 'a': + /* auto */ + ret = d_make_name (di, "auto", 4); + break; case 'f': /* 32-bit decimal floating point */ diff --git a/libiberty/testsuite/demangle-expected b/libiberty/testsuite/demangle-expected index 036c4813513..d489692f0b6 100644 --- a/libiberty/testsuite/demangle-expected +++ b/libiberty/testsuite/demangle-expected @@ -4075,6 +4075,12 @@ decltype (new int{}) f1(int) --format=gnu-v3 _Zli2_wPKc operator"" _w(char const*) +--format=gnu-v3 +_Z1fIiEDTnw_Dapifp_EET_ +decltype (new auto({parm#1})) f(int) +--format=gnu-v3 +_Z1fIiERDaRKT_S1_ +auto& f(int const&, int) # # Ada (GNAT) tests. #