From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-io1-xd2f.google.com (mail-io1-xd2f.google.com [IPv6:2607:f8b0:4864:20::d2f]) by sourceware.org (Postfix) with ESMTPS id 896043858C53 for ; Thu, 22 Jun 2023 16:19:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 896043858C53 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-xd2f.google.com with SMTP id ca18e2360f4ac-780cdb2aa01so19620139f.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=1687450771; x=1690042771; 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=ivy7varaUmIFwUeOhcV5dj/IjvuBfxefHhUPu8mR7t0=; b=cXspTSvZg5L5bys/DQckVAY6zhMsyP88CO38y0qsvApkf3FQkQcv7cuL9Fqi/rW1sM X0vnBZyKGmE58hHFlll+VF5capih2EwOPnTFgGSixxvCaPyp2EIZBy9xMuSRdN9Nv8dc NZT7v58SCKrovXO65JS0rxiVf6t4yY+Bptlo+LASRHGP86+Z0pVB/AqMhfWqYOJ3M5dx VddkO2jJXlY5xk42hynkYWLl5qbBqkAkxzyUEFklbmrA/ByZfd8GS12vw6n0YvQjf+JG b2fBY4+CxaB3RG3legnZZM8WTO+v+WutDmJibycVFcFIg5yTS97bDNROjmHWB/Dxok+p vJhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687450771; x=1690042771; 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=ivy7varaUmIFwUeOhcV5dj/IjvuBfxefHhUPu8mR7t0=; b=Xh52VuZOr2TAABgGYOvo+ozNd+08EXCHFH8du1RxWGnekGZf1mA0sHc0oIADPDAneU g93YA9LS9Jhru5k2jpLza/n64niyQjnRQK/3x7fTdG9HptKwZE7OBwHEZ+GdG2EIZ2zl hr4O4xzs5KJEdx6q483ShPrQoBiI9vC8tochhpIr4tvAgOdUcS/MEpsDA2gFRBRLV7WF dL+1eUFJ+B4LjEe/hxh67dxehLHRQ+P3IWTEwBO0wAw6G8riPAAhZbfj7Ydrdkdkfed9 V1PZDO7tX2gvFwCCo084M6kE48ClRXrvddc1gJPZYeSumFZl3EmV11lN+6ZJM1EzpHUa 5lsg== X-Gm-Message-State: AC+VfDyrXfGhD0goNucUH7GvBOawcvSbRW4I0MP2GTS4wZIZAUCIuS+1 UVhJ0P2mRH5lrpCIbHFkix0rMMSbNgeOg4dfMhYtLw== X-Google-Smtp-Source: ACHHUZ65uWNSIfJQG3mqvD4ZgkOcxBauXZUjTJTtmAdZgWrbvbmoPiM1WB/DEU3c8Cq/v8n1D05xBg== X-Received: by 2002:a05:6602:3404:b0:780:ce57:8810 with SMTP id n4-20020a056602340400b00780ce578810mr1962186ioz.4.1687450770799; 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.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jun 2023 09:19:30 -0700 (PDT) From: Tom Tromey Date: Thu, 22 Jun 2023 10:19:30 -0600 Subject: [PATCH v2 4/7] Simplify FrameVars MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20230614-dap-frame-decor-v2-4-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=-10.7 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..050cb934b7c 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: lvars.append(SymValueWrapper(sym, None)) # Stop when the function itself is seen, to avoid showing -- 2.40.1