From patchwork Thu Mar 21 19:03:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 87468 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 3029338582AA for ; Thu, 21 Mar 2024 19:04:08 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-io1-xd32.google.com (mail-io1-xd32.google.com [IPv6:2607:f8b0:4864:20::d32]) by sourceware.org (Postfix) with ESMTPS id 3AE013858C5E for ; Thu, 21 Mar 2024 19:03:32 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3AE013858C5E 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 3AE013858C5E Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::d32 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1711047813; cv=none; b=nC/0tHlLDGoFD3+RW8jhvSFoD7wZsKLH7dK46b0i0a336Pv/40ecgOeJEZcNIMw5jUFDjJN/leFuIYl06oyZ11UVXRTx84RFbDWIojI3w9m5DYY7djXxm+jg5Q0EqFUVTdlGEYkTX+ENocCUeQR30kAkgmHP0rBUhwmNAML7lww= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1711047813; c=relaxed/simple; bh=8HP0pY5ndQAibJwMmruueldC16AKiuXouSvwecO7iXM=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=MvDSS3Xv27LO8kI9F0v5muTV/X+ot/hXahdzGYcYZDn33SY+Q+FVt4oalg8rdA4f41Lj8Mu+kq6TxXEi5L1qjk+PBEXPse6PKwiN+AIjICJOOHekHGTf+hrIjViXwY/GG/EywZej/+IWuGZU+foczcXEi4/C8R+OKZkgJ7kl3mY= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-io1-xd32.google.com with SMTP id ca18e2360f4ac-7d02a82018eso15599339f.3 for ; Thu, 21 Mar 2024 12:03:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1711047811; x=1711652611; 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=fX0l3NR+gjC1debaZ7CjVpa4vdctBfxVrsXkxo3PO8o=; b=g38/p8pMMCRR6lSECUPLu42zKJOpCR/+97FT023hbZGCJfdBu2w9J0+Djz3FTEhsWf XehJFad5eq4U63+OX2YjPVo3l0uPNjm98LywB1jltoS/v0NbDV9yXNvYJiYD519TkzSn iufdDMtnVv+tNGnlM/wr//Cw6VoJYB9gN81V3nVV4CRZnQQH1YarezUFOgSWDWP3Opq+ qLJAjGGwJK///iu5XxSS9YT1XlzrqMni1ZZAmPtywkLmG3SMJzmiG6PlDysfwssBrOkB l+EKncgMhZ7ep/2KnGkQVh7DBppnVf53REhgJX3KUn8tLr8/9JGTczW00HKZeSPBVeV0 SD4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711047811; x=1711652611; 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=fX0l3NR+gjC1debaZ7CjVpa4vdctBfxVrsXkxo3PO8o=; b=E6bsJj8mmhL3u2dwO7qR7v+mt+ShUtQrNTykz4kAq0vtpuqmDQ/yd3qw0DuW8UIpTE dp/t6Q+I/KlcTrEia4Oxz6IOyV9xxNL1rsK6Wx/Wy7d37z48mSuLNqPP//mAcFjCA/D1 vmuqo8I0YUSV98wuVSAakWE4/FY8JQ5KVudVreCV36oy2wDOz8zMp/zHWQ5gocLisJPd zPN33SIG6oeEqzAxAYEj2TyDznJFqq/FF4FQ2Ck+651hhJ7OqBPB7i970F2a4x6OT5ur IzuwUZ0oqawMSzKtOuVinXZHXP9saGMbTvqHzilxQqdLvEyjmf45bXkaEbT5QW8Zl3J+ lADQ== X-Gm-Message-State: AOJu0YzEGNYOkD+cGOff6GMFM1usXLjqs3DJCgmX7KCmBThllK5xd/lQ HbJ+TH6A1QUUDuBIFvsbJFeyLrC5QKtQ23I7OM88t6zBT2CVlHg1ckNg3VM18DfhHLw0mFHuCtQ = X-Google-Smtp-Source: AGHT+IHQGCc3pywwcMkQB41f72Af9NkAe/4StHcteHjI8A+jkNKNJyxq0JZTdqcXrZVBEcurQQusZg== X-Received: by 2002:a6b:e211:0:b0:7c8:b7ac:23b with SMTP id z17-20020a6be211000000b007c8b7ac023bmr394398ioc.4.1711047811396; Thu, 21 Mar 2024 12:03:31 -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.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Mar 2024 12:03:31 -0700 (PDT) From: Tom Tromey Date: Thu, 21 Mar 2024 13:03:32 -0600 Subject: [PATCH 04/12] Move "int_storage" global into ada_parse_state MIME-Version: 1.0 Message-Id: <20240321-ada-iterated-assign-v1-4-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.2 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+patchwork=sourceware.org@sourceware.org This patch moves the "int_storage" global into ada_parse_state. --- gdb/ada-exp.y | 17 +++++++++++------ gdb/ada-lex.l | 3 +-- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/gdb/ada-exp.y b/gdb/ada-exp.y index 9452e63ab60..a8066414468 100644 --- a/gdb/ada-exp.y +++ b/gdb/ada-exp.y @@ -76,8 +76,19 @@ struct ada_parse_state std::string find_completion_bounds (); + const gdb_mpz *push_integer (gdb_mpz &&val) + { + auto &result = m_int_storage.emplace_back (new gdb_mpz (std::move (val))); + return result.get (); + } + private: + /* We don't have a good way to manage non-POD data in Yacc, so store + values here. The storage here is only valid for the duration of + the parse. */ + std::vector> m_int_storage; + /* The original expression string. */ const char *m_original_expr; }; @@ -86,11 +97,6 @@ private: static ada_parse_state *ada_parser; -/* We don't have a good way to manage non-POD data in Yacc, so store - values here. The storage here is only valid for the duration of - the parse. */ -static std::vector> int_storage; - int yyparse (void); static int yylex (void); @@ -1253,7 +1259,6 @@ ada_parse (struct parser_state *par_state) obstack_init (&temp_parse_space); components.clear (); associations.clear (); - int_storage.clear (); assignments.clear (); iterated_associations.clear (); diff --git a/gdb/ada-lex.l b/gdb/ada-lex.l index e1abf9adc25..109b95ccc35 100644 --- a/gdb/ada-lex.l +++ b/gdb/ada-lex.l @@ -465,8 +465,7 @@ processInt (struct parser_state *par_state, const char *base0, return FLOAT; } - const gdb_mpz *value - = int_storage.emplace_back (new gdb_mpz (std::move (result))).get (); + const gdb_mpz *value = ada_parser->push_integer (std::move (result)); int int_bits = gdbarch_int_bit (par_state->gdbarch ()); int long_bits = gdbarch_long_bit (par_state->gdbarch ());