From: Jason Merrill Date: Fri, 6 Jan 2012 21:39:27 +0000 (-0500) Subject: mangle.c (mangle_decl): Don't generate mangling aliases for maybe-in-charge [cd]tors. X-Git-Tag: releases/gcc-4.7.0~1131 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1be3db365ddbf781ee183be2632140bcedfcf66c;p=thirdparty%2Fgcc.git mangle.c (mangle_decl): Don't generate mangling aliases for maybe-in-charge [cd]tors. * mangle.c (mangle_decl): Don't generate mangling aliases for maybe-in-charge [cd]tors. From-SVN: r182968 --- diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 3f77f1b15c86..01480e3f9f20 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,8 @@ 2012-01-06 Jason Merrill + * mangle.c (mangle_decl): Don't generate mangling aliases + for maybe-in-charge [cd]tors. + * error.c (dump_expr): Print type of CONSTRUCTOR. 2012-01-05 Dodji Seketeli diff --git a/gcc/cp/mangle.c b/gcc/cp/mangle.c index 548998a086f9..e5c28952df6c 100644 --- a/gcc/cp/mangle.c +++ b/gcc/cp/mangle.c @@ -3194,7 +3194,10 @@ mangle_decl (const tree decl) tree id = get_mangled_id (decl); SET_DECL_ASSEMBLER_NAME (decl, id); - if (G.need_abi_warning) + if (G.need_abi_warning + /* Don't do this for a fake symbol we aren't going to emit anyway. */ + && !DECL_MAYBE_IN_CHARGE_CONSTRUCTOR_P (decl) + && !DECL_MAYBE_IN_CHARGE_DESTRUCTOR_P (decl)) { #ifdef ASM_OUTPUT_DEF /* If the mangling will change in the future, emit an alias with the