From 7a852b59df9f76478b9a3ce8144c0992ef6fc89a Mon Sep 17 00:00:00 2001 From: Nathan Sidwell Date: Thu, 5 Oct 2017 10:16:38 +0000 Subject: [PATCH] Re: [C++ PATCH] Move mangling alias out of :: https://gcc.gnu.org/ml/gcc-patches/2017-10/msg00230.html * decl2.c (record_mangling): Fix spello and formatting from previous patch. From-SVN: r253440 --- gcc/cp/ChangeLog | 5 +++++ gcc/cp/decl2.c | 6 ++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 277b6469e02..fcef8efe2ab 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2017-10-05 Nathan Sidwell + + * decl2.c (record_mangling): Fix spello and formatting from + previous patch. + 2017-10-04 Nathan Sidwell Give builtin types the correct name. diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c index 354d503da6d..3aa2db5bc54 100644 --- a/gcc/cp/decl2.c +++ b/gcc/cp/decl2.c @@ -4377,10 +4377,8 @@ record_mangling (tree decl, bool need_warning) tree *slot = &mangled_decls->get_or_insert (id, &existed); /* If this is already an alias, remove the alias, because the real - decl takes presidence. */ - if (!existed) - ; - else if (DECL_ARTIFICIAL (*slot) && DECL_IGNORED_P (*slot)) + decl takes precedence. */ + if (existed && DECL_ARTIFICIAL (*slot) && DECL_IGNORED_P (*slot)) if (symtab_node *n = symtab_node::get (*slot)) if (n->cpp_implicit_alias) { -- 2.30.2