From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-io1-xd31.google.com (mail-io1-xd31.google.com [IPv6:2607:f8b0:4864:20::d31]) by sourceware.org (Postfix) with ESMTPS id CB6563858C54 for ; Thu, 22 Jun 2023 16:19:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org CB6563858C54 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-xd31.google.com with SMTP id ca18e2360f4ac-77e29871264so230353139f.0 for ; Thu, 22 Jun 2023 09:19:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1687450770; x=1690042770; 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=eNB7hKz/U/J2A0rDzq1+/reBGJcmLnr1UlqJzk1IfQpclYr+I48CgUV/N64kNOkDJJ ezGFw4EvmPwKl+kMBFJc7HsfTgbjFR95JHfoQVvLM2YgVtr0cbu7UuUWF1CHCId2bW3r beOrAmPfp9ulnYBAPybAMLtBKGnc2+lYKVMYUdXYxnm8lqPPDHYzW/fPVpNCKlUDJ0GD 9R3nAPe1TLsYGCfsHLmrjK6pdMyKUJutPMLiirl9LaYORMZB3ZDVIeBrRi7o7+t8xBNm pj6/z0vYHWp2vxZ68Pba7el/ge/XiQQPJv6KQMNd95zwRcFaaCF2q5NEJelfvV+69sWT IL8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687450770; x=1690042770; 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=Q8FB5jGy9rNg+X7FPhHoo4mz7eHItdi9Eh72aq3nUJTxX00n5JbFqTdim/hWYrZX5f tK3IzEfdeGPz3oldDyfadBaHM8gOqtBHzB6boF0GJJluhlBZKDNh8DV1pTWaH+MOuMt8 Wc38PqalfkdCFHYHta6KM9F19CFproqRZ2DKePDCWtoCgurk2DEErRKhqQXBNg4OBw16 BC5W0pnEzzq5/XOwuK83o005V8gvtOXxx3XGKRWcrP+aylzHcSkEXJxyqNYMmEas4tgD EOFOG7jvF+Q9Ly6TTKXMZFxJ8ZIGONpAQH7ERjXsEXmr+ZXFqsXUZ3hVgBgjThw3UVPA 2dsw== X-Gm-Message-State: AC+VfDx9lafp2T1oA+pyNo3fXX5f0VT7KXbSQEpu4rjP4MZdLhs8k/fI O6TToZmsasIlIeiefvT7/4oZuoecXLTTg2YgEnKpow== X-Google-Smtp-Source: ACHHUZ4EbyHKcYWJfd9Okg7buTPJHGUe/ZBmD21+MgSvjKedR3c4MCsi6cJn6n0TQXy5OrWt51s7hA== X-Received: by 2002:a5d:9c8e:0:b0:77e:2f0f:4684 with SMTP id p14-20020a5d9c8e000000b0077e2f0f4684mr9162431iop.15.1687450770225; Thu, 22 Jun 2023 09:19:30 -0700 (PDT) Received: from localhost.localdomain (75-166-136-83.hlrn.qwest.net. [75.166.136.83]) by smtp.gmail.com with ESMTPSA id y8-20020a6bd808000000b0077ac2261248sm2201987iob.5.2023.06.22.09.19.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jun 2023 09:19:29 -0700 (PDT) From: Tom Tromey Date: Thu, 22 Jun 2023 10:19:29 -0600 Subject: [PATCH v2 3/7] 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-v2-3-10628dfa6b60@adacore.com> References: <20230614-dap-frame-decor-v2-0-10628dfa6b60@adacore.com> In-Reply-To: <20230614-dap-frame-decor-v2-0-10628dfa6b60@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