From patchwork Wed Nov 1 17:09:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 78886 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 E07E5385701C for ; Wed, 1 Nov 2023 17:10:36 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-il1-x12c.google.com (mail-il1-x12c.google.com [IPv6:2607:f8b0:4864:20::12c]) by sourceware.org (Postfix) with ESMTPS id 25EE13858D35 for ; Wed, 1 Nov 2023 17:09:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 25EE13858D35 Authentication-Results: sourceware.org; dmarc=pass (p=none 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 25EE13858D35 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::12c ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1698858588; cv=none; b=Vl3T/xDytFItTyPFMDMt7WZWRqE5uMx2wYvMksn/6IP90UuUOs1p23Q0yygrkZmuWcw9W1VH2a3cZok0MjsE2tayjD2KSUD4fcygIIDUE9mpLk5CssjE0zdgT6wKXfP9CdxdTg9G3SJpVUgPRdqZyEn6dp0Ct8ce4ZYEXpUXUU0= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1698858588; c=relaxed/simple; bh=kRJ8Dc+kjyVpgMlD0VxsDcnmu08tvpqa3bR7k8M9uX4=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=KCp2PIrZ5eIl2WpBsi/vO3onLyFphKSVcoWyV2z8NUeFHOmSkP1x8L6bn25PGhD3jIxmUn214UISubcdJl5Nt58VdAEbg9bNfAqV3D//SQLTZmXX62UvYifnfF7Md4+BPxFmmwezgrvBPawRWC8UywtZ93Lw7KtEoQATCcYeNlk= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-il1-x12c.google.com with SMTP id e9e14a558f8ab-358ff34cd9eso18156275ab.1 for ; Wed, 01 Nov 2023 10:09:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1698858579; x=1699463379; 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=ix0xkc9JuWp6J6yE3M2VPjcvQLxc+8OobdlhSJOoBJg=; b=Yd08IcYNdDxaVduDE9gl2MBLeB+ArLB8sgYwXNPv+fSBrwc8WS0zT1wyP69uWiqxts cRlNRoC3+1u2H4vuFbtMshJn3kVBMenlpxq73wY/DUuuoJpWsdqa9wiMouKd6q2HAfS2 5mNhA7W5ceqD6KH2+lPVhBIMo/tg/L92pSkBGsj8d9PbyEK+rFXCUA6+ZdiG2ZAjDUAl zs2XNe1ijXF5L74mYxC4PuDmj/Old7iXklwMhIBU24kSX/e8Ksrn8+oEh0Hx1AjitNLx nhwViA+0n/Pc5Xr3dzrL56bnHV7S0OxfGewGT0PUHGcprYYheGsLq2nCjN860hI0nwGW QtBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698858579; x=1699463379; 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=ix0xkc9JuWp6J6yE3M2VPjcvQLxc+8OobdlhSJOoBJg=; b=djMFBtdO7N/qjEk/9G/KpmQwPe4xSGR426rjRFbGf3eUbdSLT5qL1A7Oeeo08wdrO8 Z1T29VwK2EQqUOU6nGdG+QER7+oL3J26Bp++/uEC0cfsKgpsqV7YcnAmBVGgh59Hj1TB E3StA9UU7rUXXEVtrEN30IP+CNW7wUJoqQue97mTQVNLNtcUhJvSjDyjGMt3xgC9zoBf 4Ie/NXK9HimnYx6WR89girEwnypRvPGqnO0JEDtK9ya1OpYpXjs9iBldwqKcPyCBjvt+ jUV1iHMHNOQO5q171QVQ1nRUKu+se3/5oMfnaUcgg8BHiAd+y8rf29dFGaPUBZhca4Pv RR/A== X-Gm-Message-State: AOJu0YzJdbLID1BfuCQBKD++45p+DHvOi+5Wpg8Ooj8NpWkx/hAU/kjK akcjMAYxYcMGJR8RoAakFBBt2KdvWYJJVgHJ4GO6DQ== X-Google-Smtp-Source: AGHT+IHnl+AsMWWmKiVO9opIYpM/2ZHpKvjj9L3zddp7fMdE/7lUeI1+HPVwDm2IWqTgXGYJbTMopg== X-Received: by 2002:a92:7613:0:b0:359:42b0:cb01 with SMTP id r19-20020a927613000000b0035942b0cb01mr2304621ilc.19.1698858579308; Wed, 01 Nov 2023 10:09:39 -0700 (PDT) Received: from localhost.localdomain (97-122-77-73.hlrn.qwest.net. [97.122.77.73]) by smtp.gmail.com with ESMTPSA id gm2-20020a0566382b8200b0042b3a328ee0sm1017019jab.166.2023.11.01.10.09.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Nov 2023 10:09:38 -0700 (PDT) From: Tom Tromey Date: Wed, 01 Nov 2023 11:09:34 -0600 Subject: [PATCH 2/7] Add block::function_block MIME-Version: 1.0 Message-Id: <20231101-dap-nested-function-v1-2-0b0c3b228ac7@adacore.com> References: <20231101-dap-nested-function-v1-0-0b0c3b228ac7@adacore.com> In-Reply-To: <20231101-dap-nested-function-v1-0-0b0c3b228ac7@adacore.com> To: gdb-patches@sourceware.org X-Mailer: b4 0.12.4 X-Spam-Status: No, score=-11.8 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, T_SCC_BODY_TEXT_LINE 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 adds the method block::function_block, to easily access a block's enclosing function block. --- gdb/block.c | 13 +++++++++++++ gdb/block.h | 6 ++++++ 2 files changed, 19 insertions(+) diff --git a/gdb/block.c b/gdb/block.c index 6ada69c388f..e588a68aa2f 100644 --- a/gdb/block.c +++ b/gdb/block.c @@ -378,6 +378,19 @@ block::global_block () const /* See block.h. */ +const struct block * +block::function_block () const +{ + const block *block = this; + + while (block != nullptr && block->function () == nullptr) + block = block->superblock (); + + return block; +} + +/* See block.h. */ + void block::set_compunit_symtab (struct compunit_symtab *cu) { diff --git a/gdb/block.h b/gdb/block.h index 9fccbe02b99..a29298517b0 100644 --- a/gdb/block.h +++ b/gdb/block.h @@ -273,6 +273,12 @@ struct block : public allocate_on_obstack bool is_global_block () const { return superblock () == nullptr; } + /* Return the function block for this block. Returns nullptr if + there is no enclosing function, i.e., if this block is a static + or global block. */ + + const struct block *function_block () const; + /* Set the compunit of this block, which must be a global block. */ void set_compunit_symtab (struct compunit_symtab *);