From patchwork Mon Apr 10 14:19:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 67556 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 E0D3E385840A for ; Mon, 10 Apr 2023 14:19:40 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E0D3E385840A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1681136380; bh=pz87QsjwO0thu7KfVaQmmd6MUxmbNJscLDIOn9CESuE=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=ecvyksVx+GhmVyoIEVdfT6qCKm9dG2yhf1ZFDrtLxtxJqXbbJUOIE3uhx3OazG229 Dsr8+783M0Bk9NmQhfAndCv22OFjOxkNStqN30z6Bhft0KG+4dz1+TroFE/NoHbqRh NzXI6KIhclEwzfqKSh8oFOG3rEEfZfE1+OERODZI= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-yb1-xb32.google.com (mail-yb1-xb32.google.com [IPv6:2607:f8b0:4864:20::b32]) by sourceware.org (Postfix) with ESMTPS id 4A05C3858C52 for ; Mon, 10 Apr 2023 14:19:16 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4A05C3858C52 Received: by mail-yb1-xb32.google.com with SMTP id ch3so5807828ybb.4 for ; Mon, 10 Apr 2023 07:19:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681136355; x=1683728355; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=pz87QsjwO0thu7KfVaQmmd6MUxmbNJscLDIOn9CESuE=; b=YrkoPAt0HJ0UoIaKw8LTf7aq8RZKpVO8cXoP1NDGN5qSTQ17Sx22vcoSciaYg2pl1Y krfrlBoHb9icc3yBk0ncqZjJKnqABiUGQ2oAfo/hV8uOH2Xgw0DmjLnYhr9qSd61eJop HK+pR5nVILqBfBYQsvhAQ75hN4CLS+2Wb7kdhwNZ0YEcetgqWUTAkzRylyNfgqBnQJMq ojkHwArdTGZUdtQEE32chVDPwYF/qIwWXdPUZ9mEqhMW+1gUwL772gHS9tCaTeobaQ5f FqiLrKeQ6U7tDYn6Y2Iv7PYbsLJ8ScFsPdded/LOqoqeJMBV83NGosaLyZ6o9EVpskzM BrtQ== X-Gm-Message-State: AAQBX9cYCA8Qh6yfzKRFZ84/WgC2oobxb0cKO7BK5ikPD1Iyug9ovG5t 7ZMkro/Y0HEmfKI0bIABAzdFoIWhp566p8Vlg38gwA== X-Google-Smtp-Source: AKy350Y7o4VIUl0RsM0XTJQYjlLsshyiMUlB6+MIjlTWjHLQMh+LuiRKmpgUk+zm2wRa6fJiuZO6kQ== X-Received: by 2002:a25:48c6:0:b0:b8b:eb57:d776 with SMTP id v189-20020a2548c6000000b00b8beb57d776mr5040293yba.16.1681136355679; Mon, 10 Apr 2023 07:19:15 -0700 (PDT) Received: from localhost.localdomain (75-166-159-36.hlrn.qwest.net. [75.166.159.36]) by smtp.gmail.com with ESMTPSA id o41-20020a027429000000b003e545419425sm3229826jac.84.2023.04.10.07.19.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Apr 2023 07:19:15 -0700 (PDT) To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH] Filter out types from DAP scopes request Date: Mon, 10 Apr 2023 08:19:08 -0600 Message-Id: <20230410141908.2921047-1-tromey@adacore.com> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 X-Spam-Status: No, score=-11.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, 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.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Tom Tromey via Gdb-patches From: Tom Tromey Reply-To: Tom Tromey Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" The DAP scopes request examines the symbols in a block tree, but neglects to omit types. This patch fixes the problem. --- gdb/python/lib/gdb/dap/scopes.py | 2 +- gdb/testsuite/gdb.dap/scopes.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gdb/python/lib/gdb/dap/scopes.py b/gdb/python/lib/gdb/dap/scopes.py index 9ab454aa57b..be4f8fc28a0 100644 --- a/gdb/python/lib/gdb/dap/scopes.py +++ b/gdb/python/lib/gdb/dap/scopes.py @@ -41,7 +41,7 @@ def _block_vars(block): for var in block: if var.is_argument: args.append(var) - else: + elif var.is_variable or var.is_constant: locs.append(var) if block.function is not None: break diff --git a/gdb/testsuite/gdb.dap/scopes.c b/gdb/testsuite/gdb.dap/scopes.c index 7b35036cce1..ce87db1f13d 100644 --- a/gdb/testsuite/gdb.dap/scopes.c +++ b/gdb/testsuite/gdb.dap/scopes.c @@ -15,14 +15,14 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -struct dei_struct -{ - int x; - int more[5]; -}; - int main () { + struct dei_struct + { + int x; + int more[5]; + }; + struct dei_struct dei = { 2, { 3, 5, 7, 11, 13 } }; static int scalar = 23;