From patchwork Sun Aug 30 16:02:22 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Evans X-Patchwork-Id: 8521 Received: (qmail 123977 invoked by alias); 30 Aug 2015 16:03:26 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 123965 invoked by uid 89); 30 Aug 2015 16:03:25 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.8 required=5.0 tests=AWL, BAYES_00, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-pa0-f54.google.com Received: from mail-pa0-f54.google.com (HELO mail-pa0-f54.google.com) (209.85.220.54) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-GCM-SHA256 encrypted) ESMTPS; Sun, 30 Aug 2015 16:03:24 +0000 Received: by pabpg12 with SMTP id pg12so6017471pab.3 for ; Sun, 30 Aug 2015 09:03:22 -0700 (PDT) X-Received: by 10.66.148.71 with SMTP id tq7mr37772727pab.0.1440950602677; Sun, 30 Aug 2015 09:03:22 -0700 (PDT) Received: from seba.sebabeach.org.gmail.com (173-13-178-53-sfba.hfc.comcastbusiness.net. [173.13.178.53]) by smtp.gmail.com with ESMTPSA id ri9sm11642522pbc.4.2015.08.30.09.03.21 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 30 Aug 2015 09:03:22 -0700 (PDT) From: Doug Evans To: gdb-patches@sourceware.org Subject: [PATCH] remove language_specific.mangled_lang Date: Sun, 30 Aug 2015 09:02:22 -0700 Message-ID: MIME-Version: 1.0 X-IsSubscribed: yes Hi. It's unlikely we'll ever put anything more into this struct so this patch just deletes it and moves its only member up into the containing union. 2015-08-30 Doug Evans * symtab.h (general_symbol_info) : Delete struct, move only member demangled_name up. All uses updated. diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index 7e6b6dc..f146ff7 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -1414,7 +1414,7 @@ ada_decode_symbol (const struct general_symbol_info *arg) { struct general_symbol_info *gsymbol = (struct general_symbol_info *) arg; const char **resultp = - &gsymbol->language_specific.mangled_lang.demangled_name; + &gsymbol->language_specific.demangled_name; if (!gsymbol->ada_mangled) { diff --git a/gdb/symtab.c b/gdb/symtab.c index 1ba691e..7d1052c 100644 --- a/gdb/symtab.c +++ b/gdb/symtab.c @@ -596,11 +596,11 @@ symbol_set_demangled_name (struct general_symbol_info *gsymbol, else { gsymbol->ada_mangled = 1; - gsymbol->language_specific.mangled_lang.demangled_name = name; + gsymbol->language_specific.demangled_name = name; } } else - gsymbol->language_specific.mangled_lang.demangled_name = name; + gsymbol->language_specific.demangled_name = name; } /* Return the demangled name of GSYMBOL. */ @@ -615,7 +615,7 @@ symbol_get_demangled_name (const struct general_symbol_info *gsymbol) /* Fall through. */ } - return gsymbol->language_specific.mangled_lang.demangled_name; + return gsymbol->language_specific.demangled_name; } diff --git a/gdb/symtab.h b/gdb/symtab.h index 4ff8ae7..64650b7 100644 --- a/gdb/symtab.h +++ b/gdb/symtab.h @@ -137,11 +137,7 @@ struct general_symbol_info /* This is used by languages which wish to store a demangled name. currently used by Ada, C++, Java, and Objective C. */ - struct mangled_lang - { - const char *demangled_name; - } - mangled_lang; + const char *demangled_name; } language_specific;