From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-io1-xd2b.google.com (mail-io1-xd2b.google.com [IPv6:2607:f8b0:4864:20::d2b]) by sourceware.org (Postfix) with ESMTPS id 138CA3858D32 for ; Mon, 24 Apr 2023 16:22:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 138CA3858D32 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-xd2b.google.com with SMTP id ca18e2360f4ac-760c58486d3so115532239f.0 for ; Mon, 24 Apr 2023 09:22:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1682353343; x=1684945343; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=WVocAvg3T/XvWS2qRC3m2Nxzkw4CUFtOSJwR5A167a4=; b=DE1Oj8IsU8lZho9FKn2P+7cm+R7Ghk+d77vJhxSBpFMGaRQebrHC8muMaJpzLH09Wm RBwUq7jc8RAtI0yPloA4QAJW27lYN1/84CIPLgipBqMkgGjB7w8a7H3LGtP1y8qC5ZNo TERgYpm4vrvZe+XufEoaoKIsTER0UqMoxcUYMWqC8QjkJX/vqPPLaWgXDWZDOPpbPxzY ZGiIGPcToW6fizzxuPZ/z+K0X5kwfom9F1s0RkY4gpXpCAATEVSNYUwrJkWqL8tvCafj Q7XS/Unj8qQoXcEGioLpmx4WiYfUixYB9vV6jF8Ko4MVpNQSKCY6eaLdKJyb6+eMiaz6 axtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682353343; x=1684945343; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WVocAvg3T/XvWS2qRC3m2Nxzkw4CUFtOSJwR5A167a4=; b=BoB6Pm7k8Gm2d6tKplSd/JW/+N0RKGjiCWI5PrteLokN9mVO2NT44PTgsw2tAitMCb XtdCSybe31yuoj/ZLDNvjU1C7C2zqfHn3GfcH9nCXStG+qeBKodnngmm7QOLgIc6NLjB H7iwyDWvoeD/iUCvsEZQhDz3eAGY7EMMw1jo2iEUv7v7FTrLzS7MfbdGiVzzY0LOczvz /zNCys3Li4lp/2zX3MN4Z+UKmxeLQ4AUlLqg69NNPHNEKgWtop9XcLL5K8YEf4P9pwuZ RtLFajPXm6F2DrJlmVsZXWCaxP//2efh0pFbuYLprtsJufv26P8sAR9OnfmWZee0n695 sfVQ== X-Gm-Message-State: AAQBX9czdy1r/l3K9HWyPgau7hmDT+YnabqHTa0Fxa/kFNSM9Rl564HN W1IjUYtvZP40NPgU+KO3X7UC6/epQVc2/Ps5VddFTQ== X-Google-Smtp-Source: AKy350Z03L0eB8KW1ky7uAzmvsnJQ/GJ+nzeiPUGHIfNUTv3RzuBZ4Qa/QOJZMLK6gqXms88XQnz4A== X-Received: by 2002:a92:d1c8:0:b0:32b:434a:6be3 with SMTP id u8-20020a92d1c8000000b0032b434a6be3mr6090251ilg.1.1682353343223; Mon, 24 Apr 2023 09:22:23 -0700 (PDT) Received: from localhost.localdomain (71-211-191-82.hlrn.qwest.net. [71.211.191.82]) by smtp.gmail.com with ESMTPSA id cx27-20020a056638491b00b0040fa19472bcsm3444049jab.92.2023.04.24.09.22.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Apr 2023 09:22:22 -0700 (PDT) From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [RFC 02/10] Minor cleanup in loclist_describe_location Date: Mon, 24 Apr 2023 10:22:03 -0600 Message-Id: <20230424162211.682763-3-tromey@adacore.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230424162211.682763-1-tromey@adacore.com> References: <20230424162211.682763-1-tromey@adacore.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.2 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: loclist_describe_location already has a per_objfile local variable, so use it consistently. --- gdb/dwarf2/loc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gdb/dwarf2/loc.c b/gdb/dwarf2/loc.c index d9615870aeb..c1955f28a44 100644 --- a/gdb/dwarf2/loc.c +++ b/gdb/dwarf2/loc.c @@ -3968,7 +3968,7 @@ loclist_describe_location (struct symbol *symbol, CORE_ADDR addr, if (dlbaton->per_cu->version () < 5 && dlbaton->from_dwo) kind = decode_debug_loc_dwo_addresses (dlbaton->per_cu, - dlbaton->per_objfile, + per_objfile, loc_ptr, buf_end, &new_ptr, &low, &high, byte_order); else if (dlbaton->per_cu->version () < 5) @@ -3978,7 +3978,7 @@ loclist_describe_location (struct symbol *symbol, CORE_ADDR addr, signed_addr_p); else kind = decode_debug_loclists_addresses (dlbaton->per_cu, - dlbaton->per_objfile, + per_objfile, loc_ptr, buf_end, &new_ptr, &low, &high, byte_order, addr_size, signed_addr_p); @@ -4041,7 +4041,7 @@ loclist_describe_location (struct symbol *symbol, CORE_ADDR addr, /* Now describe this particular location. */ locexpr_describe_location_1 (symbol, low, stream, loc_ptr, length, addr_size, offset_size, - dlbaton->per_cu, dlbaton->per_objfile); + dlbaton->per_cu, per_objfile); gdb_printf (stream, "\n"); -- 2.39.1