diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/cp/mangle.c | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 3f77f1b..01480e3 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,8 @@ 2012-01-06 Jason Merrill <jason@redhat.com> + * 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 <dodji@redhat.com> diff --git a/gcc/cp/mangle.c b/gcc/cp/mangle.c index 548998a..e5c2895 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 |