From patchwork Sat Jul 21 18:47:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 28562 Received: (qmail 19949 invoked by alias); 21 Jul 2018 18:47:33 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 19614 invoked by uid 89); 21 Jul 2018 18:47:28 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-25.7 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=Hx-languages-length:1924 X-HELO: gateway34.websitewelcome.com Received: from gateway34.websitewelcome.com (HELO gateway34.websitewelcome.com) (192.185.150.114) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sat, 21 Jul 2018 18:47:25 +0000 Received: from cm13.websitewelcome.com (cm13.websitewelcome.com [100.42.49.6]) by gateway34.websitewelcome.com (Postfix) with ESMTP id 47407127877 for ; Sat, 21 Jul 2018 13:47:24 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id gwuafYBcc79N3gwuaftsj9; Sat, 21 Jul 2018 13:47:24 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=HbjZFNBjGzRvirc65aaVgdi458EPldnsyGDsuIEWgC0=; b=fqK/QnSEAfw7zh85hEbq54JwCb tUF15qvibaY/XSVn7OmxaDLwdvcD4fUQxQzK2m2XjxvWK3yFSwBXuaXtFbEGxYVlNqueIMThg6fen K5tdwnSws4z7lkxpltTMTT755; Received: from 75-166-85-72.hlrn.qwest.net ([75.166.85.72]:44394 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.91) (envelope-from ) id 1fgwua-002Auc-24; Sat, 21 Jul 2018 13:47:24 -0500 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [RFA v2 07/13] Call value_fetch_lazy when needed in pretty-printers Date: Sat, 21 Jul 2018 12:47:14 -0600 Message-Id: <20180721184720.3263-8-tom@tromey.com> In-Reply-To: <20180721184720.3263-1-tom@tromey.com> References: <20180721184720.3263-1-tom@tromey.com> This removes some unused variables, and replaces the calls to value_contents_for_printing with a call to value_fetch_lazy, when needed. gdb/ChangeLog 2018-07-21 Tom Tromey * python/py-prettyprint.c (gdbpy_apply_val_pretty_printer): Remove unused variable. Call value_fetch_lazy when needed. * guile/scm-pretty-print.c (gdbscm_apply_val_pretty_printer): Remove unused variable. Call value_fetch_lazy when needed. --- gdb/ChangeLog | 7 +++++++ gdb/guile/scm-pretty-print.c | 4 +++- gdb/python/py-prettyprint.c | 4 +++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/gdb/guile/scm-pretty-print.c b/gdb/guile/scm-pretty-print.c index 3fe36820a6a..f292960dbbd 100644 --- a/gdb/guile/scm-pretty-print.c +++ b/gdb/guile/scm-pretty-print.c @@ -949,7 +949,9 @@ gdbscm_apply_val_pretty_printer (const struct extension_language_defn *extlang, enum display_hint hint; enum ext_lang_rc result = EXT_LANG_RC_NOP; enum string_repr_result print_result; - const gdb_byte *valaddr = value_contents_for_printing (val); + + if (value_lazy (val)) + value_fetch_lazy (val); /* No pretty-printer support for unavailable values. */ if (!value_bytes_available (val, embedded_offset, TYPE_LENGTH (type))) diff --git a/gdb/python/py-prettyprint.c b/gdb/python/py-prettyprint.c index 21b1ce94879..a8a84899309 100644 --- a/gdb/python/py-prettyprint.c +++ b/gdb/python/py-prettyprint.c @@ -662,7 +662,9 @@ gdbpy_apply_val_pretty_printer (const struct extension_language_defn *extlang, struct gdbarch *gdbarch = get_type_arch (type); struct value *value; enum string_repr_result print_result; - const gdb_byte *valaddr = value_contents_for_printing (val); + + if (value_lazy (val)) + value_fetch_lazy (val); /* No pretty-printer support for unavailable values. */ if (!value_bytes_available (val, embedded_offset, TYPE_LENGTH (type)))