From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-io1-xd2d.google.com (mail-io1-xd2d.google.com [IPv6:2607:f8b0:4864:20::d2d]) by sourceware.org (Postfix) with ESMTPS id 2A727385828E for ; Wed, 14 Jun 2023 16:30:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 2A727385828E 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-xd2d.google.com with SMTP id ca18e2360f4ac-77ad093aad9so373492739f.1 for ; Wed, 14 Jun 2023 09:30:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1686760250; x=1689352250; 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=dDOBl/UDBkGp9GS1uhHTtSp0MZq/xy6vrSWiXeuQ5C0=; b=BuYy9Hwxl2Vefu7CvfMpvsjIdXB2r/43gPI6bSxYjEVysHULQpvLBGQodQjkQpI2wh Ac022L+/pYVKOv72mZTS5ddq8ChlBype2jrOgv2nCVCr2noa/tWr7Ui7gSCKh2LcZdm6 +j+uME7QcZecWhxbUaSOHMtJ1Ziy66j5YecdKHmt3gkpzcOsC+Pwi4bhd3JIYyIQMoGZ TS6U5nTpJgoD2yM9V0JTyJv6g+S8DQ49GpgvIcKUFdem0HuLCSfVB0pKeiRxs1DcejEx P2nquTy3QkKgs5uAgwxGK3KGry4NmeRz0LmsoXyyOGG6dNlDqpzPfgHpZZCLtNsBzTCQ PUPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686760250; x=1689352250; 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=dDOBl/UDBkGp9GS1uhHTtSp0MZq/xy6vrSWiXeuQ5C0=; b=PVJyOMfclq1INoSipqRmxqIht+5FQ8tZNBrSwXTHLRJlfPxfejYFnEJJP9R1IgUkEX 5xORXox5EcukaqZA/3ukHcEOlBtR3mo2lELNptgIe7anezi80OTWcz3USMaxr3ZpIiXw y90xlnTzBXIXT2Rcvaw1HsIOv7JzqjhUa8GWOlKWpcL6YTLeyijVHdAo/36j6YsuEkoB WPSmTXEosXiAnQedRacrhWDv5jEwtzHn01rCLLfQxQ6pkZSpPZDO2Fm0Bc0hKJjCR/Rc bQkBLb3D7R+tTVoU3WZLc8fZcqvQmp5KQu0OiV14tWAy0sByHct2ODb1oLTXYojg2R4f tySA== X-Gm-Message-State: AC+VfDxstbkDhhnJHVwtbOD25Syix7jnqPcr39V7KVMGvqFHJ2yEDbIN EZ6OAeK6NNxTTQX5R/T9bvYCuhhEw/FEyZNuChHEyQ== X-Google-Smtp-Source: ACHHUZ5rHlw6kX3Fy/77nHOggpcBakattzrzMSGT+ztUX5OeQQYZODhottJEq9uZPojewjKnUQCKDA== X-Received: by 2002:a6b:e901:0:b0:753:786a:c003 with SMTP id u1-20020a6be901000000b00753786ac003mr14050445iof.3.1686760250057; Wed, 14 Jun 2023 09:30:50 -0700 (PDT) Received: from localhost.localdomain (75-166-136-83.hlrn.qwest.net. [75.166.136.83]) by smtp.gmail.com with ESMTPSA id t5-20020a028785000000b0040fa5258658sm5020983jai.77.2023.06.14.09.30.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jun 2023 09:30:49 -0700 (PDT) From: Tom Tromey Date: Wed, 14 Jun 2023 10:30:49 -0600 Subject: [PATCH 3/5] Fix oversights in frame decorator code MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20230614-dap-frame-decor-v1-3-af87db6467b2@adacore.com> References: <20230614-dap-frame-decor-v1-0-af87db6467b2@adacore.com> In-Reply-To: <20230614-dap-frame-decor-v1-0-af87db6467b2@adacore.com> To: gdb-patches@sourceware.org X-Mailer: b4 0.12.2 X-Spam-Status: No, score=-11.4 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 List-Id: The frame decorator "FrameVars" code misses a couple of cases, discovered when working on related DAP changes. First, fetch_frame_locals does not stop when reaching a function boundary. This means it would return locals from any enclosing functions. Second, fetch_frame_args assumes that all arguments are at the outermost scope, but this doesn't seem to be required by gdb. --- gdb/python/lib/gdb/FrameDecorator.py | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/gdb/python/lib/gdb/FrameDecorator.py b/gdb/python/lib/gdb/FrameDecorator.py index 6773780735b..7293be86185 100644 --- a/gdb/python/lib/gdb/FrameDecorator.py +++ b/gdb/python/lib/gdb/FrameDecorator.py @@ -269,6 +269,11 @@ class FrameVars(object): if self.fetch_b(sym): lvars.append(SymValueWrapper(sym, None)) + # Stop when the function itself is seen, to avoid showing + # variables from outer functions in a nested function. + if block.function is not None: + break + block = block.superblock return lvars @@ -286,14 +291,18 @@ class FrameVars(object): block = None while block is not None: - if block.function is not None: + if block.is_global or block.is_static: break - block = block.superblock - - if block is not None: for sym in block: if not sym.is_argument: continue args.append(SymValueWrapper(sym, None)) + # Stop when the function itself is seen, to avoid showing + # variables from outer functions in a nested function. + if block.function is not None: + break + + block = block.superblock + return args -- 2.40.1