From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-io1-xd35.google.com (mail-io1-xd35.google.com [IPv6:2607:f8b0:4864:20::d35]) by sourceware.org (Postfix) with ESMTPS id 8BABF3858C1F for ; Wed, 14 Jun 2023 16:30:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8BABF3858C1F 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-xd35.google.com with SMTP id ca18e2360f4ac-777a9d7efabso246252239f.0 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=KWwza7UTZdzpZ5GkFOA4UuSaqDWXCUkxnrH42bOX/fk=; b=LvdQWnrkHzPulL9nCeZ6/Uf1Ny+L6u92bmqua9TNWI+ThAQixLwAO8Qtucbsq4XOi/ 9QGXT+/DhglJyP7npr473j9nwkPcoT8ywVOTjeAuZprZTUQLbeQckXv0yuBeCFncen7r Y4Ecvlla4/klLqmLaR23HkWBd2/8nucPJy6lnooeDgzH0Z8nX3YVLLBGai48/UlNDY+P LXEFUfzT33rn0RYtVoY0EF/HkFoboTEsE+qcE+y7qf4Oxm+9UkytwO2KwhWLmkAfiAde RHhoep2UXaYvzIpvODNsiyNsDWGxOtrQ3fJBLpqacArHUk3PkRyvvU/eq89j05mC9QRd 6Hmg== 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=KWwza7UTZdzpZ5GkFOA4UuSaqDWXCUkxnrH42bOX/fk=; b=DNwUtO9RvZ7iat8EwVmKi2YInpnP1nrRuTiUtpfGycxSS/2/f1OB3S75h5Irn9v7+f Ch2zILiXo7XSv8VcxPLkuv9zh9MIJJN1jyJwcXox8g6KYqlnBy5dYHJL70K2p//d1sLY HknEoj05mxNRQcH0YEB8pF2Frt1BcfoD9b7Rb+oY/4eB9yZnun9McwbQ82Mk5PhQh7Mv lWO3Xyrmwfvaa5WpmbVB77BerMsYR6tDvEZ63ye+PpOVEMx1IWUkyLbjWebfy2B8ymUh gDIa12mT5ID3sp5BDUP9e6xHqR2kNOR/kracOvks5nbekXY4J8kPoc6wcxMaPmrWd+lk Lz3A== X-Gm-Message-State: AC+VfDxPmHzeVS94Ry9zgzMyDTD/5l6xjmSpWlDHJGfW4DpZ1hd2SWn9 gn+9MdHq/9YT5S+ORBbK1t85jwNoI55g73eM/TBorg== X-Google-Smtp-Source: ACHHUZ6+uHodxrKTZrSs1iceWfsQGll5Y8GK3SPRFo8O9P666TPLJktnCvKtYSGXf26105iRiT8GPQ== X-Received: by 2002:a5e:da46:0:b0:777:aaed:32c9 with SMTP id o6-20020a5eda46000000b00777aaed32c9mr13196690iop.10.1686760250646; 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.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jun 2023 09:30:50 -0700 (PDT) From: Tom Tromey Date: Wed, 14 Jun 2023 10:30:50 -0600 Subject: [PATCH 4/5] Simplify FrameVars MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20230614-dap-frame-decor-v1-4-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=-10.6 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,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: FrameVars implements its own variant of Symbol.is_variable and/or Symbol.is_control. This patch replaces this code. --- gdb/python/lib/gdb/FrameDecorator.py | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/gdb/python/lib/gdb/FrameDecorator.py b/gdb/python/lib/gdb/FrameDecorator.py index 7293be86185..fc3aa51c7c4 100644 --- a/gdb/python/lib/gdb/FrameDecorator.py +++ b/gdb/python/lib/gdb/FrameDecorator.py @@ -223,31 +223,6 @@ class FrameVars(object): def __init__(self, frame): self.frame = frame - self.symbol_class = { - gdb.SYMBOL_LOC_STATIC: True, - gdb.SYMBOL_LOC_REGISTER: True, - gdb.SYMBOL_LOC_ARG: True, - gdb.SYMBOL_LOC_REF_ARG: True, - gdb.SYMBOL_LOC_LOCAL: True, - gdb.SYMBOL_LOC_REGPARM_ADDR: True, - gdb.SYMBOL_LOC_COMPUTED: True, - } - - def fetch_b(self, sym): - """Local utility method to determine if according to Symbol - type whether it should be included in the iterator. Not all - symbols are fetched, and only symbols that return - True from this method should be fetched.""" - - # SYM may be a string instead of a symbol in the case of - # synthetic local arguments or locals. If that is the case, - # always fetch. - if isinstance(sym, str): - return True - - sym_type = sym.addr_class - - return self.symbol_class.get(sym_type, False) def fetch_frame_locals(self): """Public utility method to fetch frame local variables for @@ -266,7 +241,7 @@ class FrameVars(object): for sym in block: if sym.is_argument: continue - if self.fetch_b(sym): + if sym.is_variable or sym.is_constant: lvars.append(SymValueWrapper(sym, None)) # Stop when the function itself is seen, to avoid showing -- 2.40.1