From patchwork Sat Mar 9 17:22:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 31802 Received: (qmail 29596 invoked by alias); 9 Mar 2019 17:23:08 -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 29458 invoked by uid 89); 9 Mar 2019 17:23:08 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-21.4 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_STOCKGEN, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS autolearn=ham version=3.3.1 spammy=Suppress, 20190303, unique X-HELO: gateway30.websitewelcome.com Received: from gateway30.websitewelcome.com (HELO gateway30.websitewelcome.com) (192.185.192.34) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sat, 09 Mar 2019 17:23:05 +0000 Received: from cm13.websitewelcome.com (cm13.websitewelcome.com [100.42.49.6]) by gateway30.websitewelcome.com (Postfix) with ESMTP id 191F418413 for ; Sat, 9 Mar 2019 11:23:04 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id 2fgdhiku2YTGM2fgdhxk8f; Sat, 09 Mar 2019 11:23:04 -0600 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=DVX/RNh2t/xrcofSsVaZlFmeGK63yKsNxWQmqFiOwDw=; b=c66Oj+7x7Uoh0bU+pgW4y1GGfc bNHEHc1Q0vZ8qXu5HLXDCDGpyhmW5HtkxnMTYYqm+MCSsCSKFbk0W0vBhQzbPGPh1LF0sW1WmB1PP XIeSpicVxsCvNy3AGeM2l8/cO; Received: from 75-166-85-218.hlrn.qwest.net ([75.166.85.218]:56494 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.91) (envelope-from ) id 1h2fgc-003et2-TL; Sat, 09 Mar 2019 11:23:03 -0600 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [RFC 2/6] Remove static buffer from ada_decode Date: Sat, 9 Mar 2019 10:22:56 -0700 Message-Id: <20190309172300.2764-3-tom@tromey.com> In-Reply-To: <20190309172300.2764-1-tom@tromey.com> References: <20190309172300.2764-1-tom@tromey.com> ada_decode has a static buffer, which means it is not thread-safe. This patch removes the buffer and adds a parameter so that the storage can be managed by the caller. 2019-03-03 Tom Tromey * ada-varobj.c (ada_varobj_describe_simple_array_child): Update. * ada-lang.h (ada_decode): Add "storage" parameter. * ada-lang.c (ada_decode): Add "storage" parameter. (ada_decode_symbol, ada_la_decode, ada_sniff_from_mangled_name) (is_valid_name_for_wild_match, name_matches_regex) (ada_add_global_exceptions): Update. * ada-exp.y (write_object_renaming): Update. --- gdb/ChangeLog | 10 +++++++++ gdb/ada-exp.y | 6 +++++- gdb/ada-lang.c | 55 ++++++++++++++++++++++++++++++------------------ gdb/ada-lang.h | 3 ++- gdb/ada-varobj.c | 3 ++- 5 files changed, 54 insertions(+), 23 deletions(-) diff --git a/gdb/ada-exp.y b/gdb/ada-exp.y index 5925416e88f..1cadc19496c 100644 --- a/gdb/ada-exp.y +++ b/gdb/ada-exp.y @@ -817,7 +817,11 @@ write_object_renaming (struct parser_state *par_state, renamed_entity_len); ada_lookup_encoded_symbol (name, orig_left_context, VAR_DOMAIN, &sym_info); if (sym_info.symbol == NULL) - error (_("Could not find renamed variable: %s"), ada_decode (name)); + { + gdb::unique_xmalloc_ptr storage; + error (_("Could not find renamed variable: %s"), + ada_decode (name, &storage)); + } else if (SYMBOL_CLASS (sym_info.symbol) == LOC_TYPEDEF) /* We have a renaming of an old-style renaming symbol. Don't trust the block information. */ diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index 17a11842634..77ebdb10f8f 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -1156,22 +1156,18 @@ ada_remove_Xbn_suffix (const char *encoded, int *len) /* If ENCODED follows the GNAT entity encoding conventions, then return the decoded form of ENCODED. Otherwise, return "<%s>" where "%s" is - replaced by ENCODED. - - The resulting string is valid until the next call of ada_decode. - If the string is unchanged by decoding, the original string pointer - is returned. */ + replaced by ENCODED. */ const char * -ada_decode (const char *encoded) +ada_decode (const char *encoded, gdb::unique_xmalloc_ptr *storage) { int i, j; int len0; const char *p; char *decoded; int at_start_name; - static char *decoding_buffer = NULL; - static size_t decoding_buffer_size = 0; + char *decoding_buffer = NULL; + size_t decoding_buffer_size = 0; /* With function descriptors on PPC64, the value of a symbol named ".FN", if it exists, is the entry point of the function "FN". */ @@ -1399,9 +1395,15 @@ ada_decode (const char *encoded) goto Suppress; if (strcmp (decoded, encoded) == 0) - return encoded; + { + xfree (decoding_buffer); + return encoded; + } else - return decoded; + { + storage->reset (decoded); + return decoded; + } Suppress: GROW_VECT (decoding_buffer, decoding_buffer_size, strlen (encoded) + 3); @@ -1410,8 +1412,8 @@ Suppress: strcpy (decoded, encoded); else xsnprintf (decoded, decoding_buffer_size, "<%s>", encoded); + storage->reset (decoded); return decoded; - } /* Table for keeping permanent unique copies of decoded names. Once @@ -1440,7 +1442,8 @@ ada_decode_symbol (const struct general_symbol_info *arg) if (!gsymbol->ada_mangled) { - const char *decoded = ada_decode (gsymbol->name); + gdb::unique_xmalloc_ptr storage; + const char *decoded = ada_decode (gsymbol->name, &storage); struct obstack *obstack = gsymbol->language_specific.obstack; gsymbol->ada_mangled = 1; @@ -1470,7 +1473,8 @@ ada_decode_symbol (const struct general_symbol_info *arg) static char * ada_la_decode (const char *encoded, int options) { - return xstrdup (ada_decode (encoded)); + gdb::unique_xmalloc_ptr storage; + return xstrdup (ada_decode (encoded, &storage)); } /* Implement la_sniff_from_mangled_name for Ada. */ @@ -1478,7 +1482,8 @@ ada_la_decode (const char *encoded, int options) static int ada_sniff_from_mangled_name (const char *mangled, char **out) { - const char *demangled = ada_decode (mangled); + gdb::unique_xmalloc_ptr storage; + const char *demangled = ada_decode (mangled, &storage); *out = NULL; @@ -6071,7 +6076,8 @@ is_name_suffix (const char *str) static int is_valid_name_for_wild_match (const char *name0) { - const char *decoded_name = ada_decode (name0); + gdb::unique_xmalloc_ptr storage; + const char *decoded_name = ada_decode (name0, &storage); int i; /* If the decoded name starts with an angle bracket, it means that @@ -6319,8 +6325,9 @@ ada_lookup_name_info::matches is not a suitable completion. */ const char *sym_name_copy = sym_name; bool has_angle_bracket; + gdb::unique_xmalloc_ptr storage; - sym_name = ada_decode (sym_name); + sym_name = ada_decode (sym_name, &storage); has_angle_bracket = (sym_name[0] == '<'); match = (has_angle_bracket == m_verbatim_p); sym_name = sym_name_copy; @@ -6342,12 +6349,14 @@ ada_lookup_name_info::matches /* Second: Try wild matching... */ + gdb::unique_xmalloc_ptr sym_name_storage; if (!match && m_wild_match_p) { /* Since we are doing wild matching, this means that TEXT may represent an unqualified symbol name. We therefore must also compare TEXT against the unqualified name of the symbol. */ - sym_name = ada_unqualified_name (ada_decode (sym_name)); + sym_name = ada_unqualified_name (ada_decode (sym_name, + &sym_name_storage)); if (strncmp (sym_name, text, text_len) == 0) match = true; @@ -6363,7 +6372,10 @@ ada_lookup_name_info::matches std::string &match_str = comp_match_res->match.storage (); if (!m_encoded_p) - match_str = ada_decode (sym_name); + { + gdb::unique_xmalloc_ptr storage; + match_str = ada_decode (sym_name, &storage); + } else { if (m_verbatim_p) @@ -13501,8 +13513,9 @@ ada_add_exceptions_from_frame (compiled_regex *preg, static bool name_matches_regex (const char *name, compiled_regex *preg) { + gdb::unique_xmalloc_ptr storage; return (preg == NULL - || preg->exec (ada_decode (name), 0, NULL, 0) == 0); + || preg->exec (ada_decode (name, &storage), 0, NULL, 0) == 0); } /* Add all exceptions defined globally whose name name match @@ -13535,7 +13548,9 @@ ada_add_global_exceptions (compiled_regex *preg, lookup_name_info::match_any (), [&] (const char *search_name) { - const char *decoded = ada_decode (search_name); + gdb::unique_xmalloc_ptr storage; + const char *decoded = ada_decode (search_name, + &storage); return name_matches_regex (decoded, preg); }, NULL, diff --git a/gdb/ada-lang.h b/gdb/ada-lang.h index ee03dbd2aad..754779911be 100644 --- a/gdb/ada-lang.h +++ b/gdb/ada-lang.h @@ -227,7 +227,8 @@ extern struct type *ada_get_decoded_type (struct type *type); extern const char *ada_decode_symbol (const struct general_symbol_info *); -extern const char *ada_decode (const char*); +extern const char *ada_decode (const char *, + gdb::unique_xmalloc_ptr *storage); extern enum language ada_update_initial_language (enum language); diff --git a/gdb/ada-varobj.c b/gdb/ada-varobj.c index a4d553d3786..29a4c86cc5f 100644 --- a/gdb/ada-varobj.c +++ b/gdb/ada-varobj.c @@ -624,6 +624,7 @@ ada_varobj_describe_simple_array_child (struct value *parent_value, of the array index type when such type qualification is needed. */ const char *index_type_name = NULL; + gdb::unique_xmalloc_ptr storage; /* If the index type is a range type, find the base type. */ while (TYPE_CODE (index_type) == TYPE_CODE_RANGE) @@ -634,7 +635,7 @@ ada_varobj_describe_simple_array_child (struct value *parent_value, { index_type_name = ada_type_name (index_type); if (index_type_name) - index_type_name = ada_decode (index_type_name); + index_type_name = ada_decode (index_type_name, &storage); } if (index_type_name != NULL)