From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id wJfGDtyE/GW5lxAAWB0awg (envelope-from ) for ; Thu, 21 Mar 2024 15:05:00 -0400 Authentication-Results: simark.ca; dkim=pass (2048-bit key; secure) header.d=adacore.com header.i=@adacore.com header.a=rsa-sha256 header.s=google header.b=gi62vqrK; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 359D91E0C1; Thu, 21 Mar 2024 15:05:00 -0400 (EDT) Received: from server2.sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 1DF721E08C for ; Thu, 21 Mar 2024 15:04:58 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C6C953858C55 for ; Thu, 21 Mar 2024 19:04:57 +0000 (GMT) Received: from mail-io1-xd2c.google.com (mail-io1-xd2c.google.com [IPv6:2607:f8b0:4864:20::d2c]) by sourceware.org (Postfix) with ESMTPS id DB8883858C35 for ; Thu, 21 Mar 2024 19:03:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DB8883858C35 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org DB8883858C35 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::d2c ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1711047817; cv=none; b=E2Vu1uMB5K0NIuC6UhmeGiteQjcFunp6RBfiEVq9xEj1vM5MvYy1JGK+IyNjfPIDunBN8Oc/vZjiYbZCPxVRY/Uo6PwaupMGHs291D0f2oSuhUzBtUCx1hKesr0uqYojHgWvasTG8RRpjLGLHRUoxUwzt62tOctu4Acq3gDN7ow= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1711047817; c=relaxed/simple; bh=20W2CFnlnQzJPpmwfBiOJ13jmM3Ax4u4HOE+4Rj/j00=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=aJmxiErFBl8Hzbz5Jykc0oWnHCjgi6Lvk9rMJba3FjjxK3MU0x+RluteGDvdWq27QQeuftkgN9Dom1URFfSyhkaxoBJ+rWuuHMxnES47mqYRf9yr2ZTV40+zkdv32dzN4UtrXcfwHEdmFTfJKLybTQs4NmD1PcBvyyniGloJQU4= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-io1-xd2c.google.com with SMTP id ca18e2360f4ac-7c8dd755793so35562639f.0 for ; Thu, 21 Mar 2024 12:03:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1711047813; x=1711652613; darn=sourceware.org; h=to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=s858rJiDoxBmkCNaQjfP09kTRxIas8tyMzMyvwM8JTM=; b=gi62vqrKwaUTEka8JARbss7cOV0SohFQScRK2YGkB0aGqgl+FbyIPZ2CgpyExlI2B8 /FTb7C8jcnyqf6sfPgKIBMjRE88GnBq2Rt/mLSg/v4+m847iT0mYyb88xm19yd2HNKdR 791io52Ba6tzTXnjrtsPm5oEafsSfthy/eCBmh2m4Bo1QEFYN4ePFOmhGYdhvbC1VUcp squJ/xvD06Y/k2Uhz3fYoNUDktb1AEHap/bOJezwtThb5CxJ1FAw7QpY29gsUhqQaqg5 dHRoZxGGZkIcOBb++9vxMwi2xp9KxQEKWYCxamr15kn2m9Uh17DBQLSiM5gBtVFrjeDM dvQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711047813; x=1711652613; h=to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=s858rJiDoxBmkCNaQjfP09kTRxIas8tyMzMyvwM8JTM=; b=jL2pFUczfDdIBVxecWw8eolPjVTaIQRnuK10RSuUpDiwC5Jy9g0GhBLyph6Qd+AQgi hJ/mOh2YCVvlKPSjwlRciOvzw49u8guFgays1tJ7I8pGIVewVwJteAXJZ3JRVrxU/GtY tQJOckBQRnCWe6OZSC+3zOuwDBceHDHTYLAjuoBr6w+BtT/7eKH97hbSD0XqrEbFlTS4 G0uXu6OzehRNGgM2uYBKT36SFKqgwHL6CV1C7OMiueuxUPBMM98klw1v5Tpkra9Wx8DX JfmOSqhpyCIWxBY/E0HpB+ISkC/LDHpC2M2wg1mOZ8xkq8iQUf2MyaC7x+G39b2K5/qt e+6A== X-Gm-Message-State: AOJu0YxtO5iau0pSP9LBgU58oBb6amKRs+xmx9OyS2UWWqCbSSpiB5Xd t8t9ZqPmHnvIvVEfAcE/4ayX0SW5GziWGSdo/OVX6DevTi0lUlg67IUmwO3QkJk18ledrsJY3m0 = X-Google-Smtp-Source: AGHT+IExNVmFT/weovnX8ZUHU5aCW/XI8yjiFh5tfm4ptaywo9lbK7tZ6W+Yfd0R7OoXr0QGlM7C5Q== X-Received: by 2002:a6b:ea08:0:b0:7cb:6050:805f with SMTP id m8-20020a6bea08000000b007cb6050805fmr391766ioc.1.1711047812899; Thu, 21 Mar 2024 12:03:32 -0700 (PDT) Received: from localhost.localdomain (97-122-82-115.hlrn.qwest.net. [97.122.82.115]) by smtp.gmail.com with ESMTPSA id dp10-20020a0566381c8a00b00476f2bfc3f8sm53358jab.87.2024.03.21.12.03.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Mar 2024 12:03:32 -0700 (PDT) From: Tom Tromey Date: Thu, 21 Mar 2024 13:03:36 -0600 Subject: [PATCH 08/12] Move "temp_parse_space" into ada_parse_state MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20240321-ada-iterated-assign-v1-8-925cdd4f1f4a@adacore.com> References: <20240321-ada-iterated-assign-v1-0-925cdd4f1f4a@adacore.com> In-Reply-To: <20240321-ada-iterated-assign-v1-0-925cdd4f1f4a@adacore.com> To: gdb-patches@sourceware.org X-Mailer: b4 0.12.4 X-Spam-Status: No, score=-11.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+public-inbox=simark.ca@sourceware.org This patch moves the "temp_parse_space" global into ada_parse_state. It is also renamed to remove the redundant "parse". Finally, it is changed to an auto_obstack to avoid the need for any manual management. --- gdb/ada-exp.y | 28 +++++++++++----------------- gdb/ada-lex.l | 7 ++++--- 2 files changed, 15 insertions(+), 20 deletions(-) diff --git a/gdb/ada-exp.y b/gdb/ada-exp.y index 615b74d14d8..73178a58a0c 100644 --- a/gdb/ada-exp.y +++ b/gdb/ada-exp.y @@ -101,6 +101,8 @@ struct ada_parse_state std::unordered_map> iterated_associations; + auto_obstack temp_space; + private: /* We don't have a good way to manage non-POD data in Yacc, so store @@ -1234,8 +1236,6 @@ primary : '*' primary %prec '.' #define yyrestart ada_yyrestart #define yytext ada_yytext -static struct obstack temp_parse_space; - /* The following kludge was found necessary to prevent conflicts between */ /* defs.h and non-standard stdlib.h files. */ #define qsort __qsort__dummy @@ -1255,8 +1255,6 @@ ada_parse (struct parser_state *par_state) par_state->debug); lexer_init (yyin); /* (Re-)initialize lexer. */ - obstack_free (&temp_parse_space, NULL); - obstack_init (&temp_parse_space); int result = yyparse (); if (!result) @@ -1323,7 +1321,7 @@ write_object_renaming (struct parser_state *par_state, if (orig_left_context == NULL) orig_left_context = get_selected_block (NULL); - name = obstack_strndup (&temp_parse_space, renamed_entity, + name = obstack_strndup (&ada_parser->temp_space, renamed_entity, renamed_entity_len); ada_lookup_encoded_symbol (name, orig_left_context, SEARCH_VFT, &sym_info); if (sym_info.symbol == NULL) @@ -1389,7 +1387,8 @@ write_object_renaming (struct parser_state *par_state, if (end == NULL) end = renaming_expr + strlen (renaming_expr); - index_name = obstack_strndup (&temp_parse_space, renaming_expr, + index_name = obstack_strndup (&ada_parser->temp_space, + renaming_expr, end - renaming_expr); renaming_expr = end; @@ -1608,10 +1607,10 @@ static void write_ambiguous_var (struct parser_state *par_state, const struct block *block, const char *name, int len) { - struct symbol *sym = new (&temp_parse_space) symbol (); + struct symbol *sym = new (&ada_parser->temp_space) symbol (); sym->set_domain (UNDEF_DOMAIN); - sym->set_linkage_name (obstack_strndup (&temp_parse_space, name, len)); + sym->set_linkage_name (obstack_strndup (&ada_parser->temp_space, name, len)); sym->set_language (language_ada, nullptr); block_symbol bsym { sym, block }; @@ -1719,7 +1718,8 @@ write_var_or_type (struct parser_state *par_state, } name_len = name_storage.size (); - encoded_name = obstack_strndup (&temp_parse_space, name_storage.c_str (), + encoded_name = obstack_strndup (&ada_parser->temp_space, + name_storage.c_str (), name_len); for (depth = 0; depth < MAX_RENAMING_CHAIN_LENGTH; depth += 1) { @@ -1765,7 +1765,8 @@ write_var_or_type (struct parser_state *par_state, { int alloc_len = renaming_len + name_len - tail_index + 1; char *new_name - = (char *) obstack_alloc (&temp_parse_space, alloc_len); + = (char *) obstack_alloc (&ada_parser->temp_space, + alloc_len); strncpy (new_name, renaming, renaming_len); strcpy (new_name + renaming_len, encoded_name + tail_index); encoded_name = new_name; @@ -1987,10 +1988,3 @@ type_system_address (struct parser_state *par_state) "system__address"); return type != NULL ? type : parse_type (par_state)->builtin_data_ptr; } - -void _initialize_ada_exp (); -void -_initialize_ada_exp () -{ - obstack_init (&temp_parse_space); -} diff --git a/gdb/ada-lex.l b/gdb/ada-lex.l index 109b95ccc35..90cb5ba1b8a 100644 --- a/gdb/ada-lex.l +++ b/gdb/ada-lex.l @@ -531,7 +531,7 @@ processReal (struct parser_state *par_state, const char *num0) static struct stoken processId (const char *name0, int len) { - char *name = (char *) obstack_alloc (&temp_parse_space, len + 11); + char *name = (char *) obstack_alloc (&ada_parser->temp_space, len + 11); int i0, i; struct stoken result; @@ -593,7 +593,7 @@ processString (const char *text, int len) const char *lim = text + len; struct stoken result; - q = (char *) obstack_alloc (&temp_parse_space, len); + q = (char *) obstack_alloc (&ada_parser->temp_space, len); result.ptr = q; p = text; while (p < lim) @@ -706,7 +706,8 @@ processAttribute (const char *str) { /* This is enforced by YY_INPUT. */ gdb_assert (pstate->parse_completion); - yylval.sval.ptr = obstack_strndup (&temp_parse_space, str, len - 1); + yylval.sval.ptr = obstack_strndup (&ada_parser->temp_space, + str, len - 1); yylval.sval.length = len - 1; return TICK_COMPLETE; } -- 2.43.0