From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-io1-xd2b.google.com (mail-io1-xd2b.google.com [IPv6:2607:f8b0:4864:20::d2b]) by sourceware.org (Postfix) with ESMTPS id CCA473858C66 for ; Tue, 14 Mar 2023 20:04:49 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org CCA473858C66 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com Received: by mail-io1-xd2b.google.com with SMTP id b16so6902134iof.11 for ; Tue, 14 Mar 2023 13:04:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1678824289; 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=0L7VtPS/2rRDN9sHxeCEFeTZgh0aJe7BHhni+VPZJgo=; b=XzWq3X0EwqQIb+nDuKrmqGpthij8ApZF18M33yu4ZgQLjeR53dKkQ1pr2ynoNY0PgL Ka02zuZ/OZOMzHhxUqPIKLxAQhegWrPYoYmjiukNQPDCn+jCZbwb17xN/LYfr/RQGRgp cXckjXSHqcAvum3Vie0Rep+aIdYzM0Q2qO3MOUGO4R4p6IEoFySNX6Xc6s7P/x6VclDw NUWGF2QAFXxHMSAQQWVjPcV2IyPCPbwf9PaOhxuseF4bCjKqgJTt3oEmaBkTAmu/okDu Hhg7lmNJWRovRucAxl4LFQm7C0wyssm0orQDIvGo8Oab+0lRAOp9ds2bZQHCEi8eERoy GkVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678824289; 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=0L7VtPS/2rRDN9sHxeCEFeTZgh0aJe7BHhni+VPZJgo=; b=5H0ZK3t/TxOgbFudst8aOPxmdTkAdrJVTWph23Yo37Bci0q+hQA4M8BxMRFek00fEO oN6bZ7+HIumE2dFDWot3LENypuqNtJxhqmN/jMNDPfUnxqcmEhHc1c5r7wywHIBDmpWX IPvHtPuyZE5m/MYJi/4W3gVdnIfuxm/w4cnIAG4CGRfQETsbC97+zqRCsnqwjlN8s3Sz tDtEq9flmqbIbQRl6jON4o7C0ojnYJiNORDMZRRH/OWFFlfGubxNskAkQ9TUTH7g9koD Sejm9DZLyWYeVXtiP1BoDZxITIOAvZ97W32ZLHwTvk3we758efUkinrDY3K/RId1mnp9 3LYA== X-Gm-Message-State: AO0yUKXaeKRjEBhoiSWs3UYJOurwLygxmeDLsfPWV6TrsAgQUqYZKckE /++sDSi2PG97gij3wtWNiG9k44LQ+xzQq2dZ07w= X-Google-Smtp-Source: AK7set9EjkQZNqrZsZwHOr6wuyAZYr9PSmK6rsHPZWlzNsdERtSbZVnp2M52YfZ7gEOYp33a/Mifnw== X-Received: by 2002:a5d:8594:0:b0:74c:b436:4a9e with SMTP id f20-20020a5d8594000000b0074cb4364a9emr24790263ioj.16.1678824289000; Tue, 14 Mar 2023 13:04:49 -0700 (PDT) Received: from localhost.localdomain (71-211-185-113.hlrn.qwest.net. [71.211.185.113]) by smtp.gmail.com with ESMTPSA id m13-20020a056638224d00b003ee9720740esm1030257jas.153.2023.03.14.13.04.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Mar 2023 13:04:48 -0700 (PDT) From: Tom Tromey Date: Tue, 14 Mar 2023 14:04:47 -0600 Subject: [PATCH 3/5] Define symbol::value_block separately MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20230314-submit-pragma-import-export-v1-3-a235709f7e96@adacore.com> References: <20230314-submit-pragma-import-export-v1-0-a235709f7e96@adacore.com> In-Reply-To: <20230314-submit-pragma-import-export-v1-0-a235709f7e96@adacore.com> To: gdb-patches@sourceware.org X-Mailer: b4 0.12.1 X-Spam-Status: No, score=-10.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_STOCKGEN,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 List-Id: This moves the definition of symbol::value_block outside of the class. A subsequent patch will change this method to use SYMBOL_BLOCK_OPS, and it seemed simplest to move this method out-of-line, and cleaner to do this as a separate change. --- gdb/symtab.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/gdb/symtab.h b/gdb/symtab.h index 005b64b5a08..0a42fd2380c 100644 --- a/gdb/symtab.h +++ b/gdb/symtab.h @@ -1346,10 +1346,7 @@ struct symbol : public general_symbol_info, public allocate_on_obstack m_value.common_block = common_block; } - const block *value_block () const - { - return m_value.block; - } + const block *value_block () const; void set_value_block (const block *block) { @@ -1507,6 +1504,12 @@ struct block_symbol #define SYMBOL_REGISTER_OPS(symbol) ((symbol)->impl ().ops_register) #define SYMBOL_LOCATION_BATON(symbol) (symbol)->aux_value +inline const block * +symbol::value_block () const +{ + return m_value.block; +} + extern int register_symbol_computed_impl (enum address_class, const struct symbol_computed_ops *); -- 2.39.1