From patchwork Tue Apr 25 20:28:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yao Qi X-Patchwork-Id: 20156 Received: (qmail 118350 invoked by alias); 25 Apr 2017 20:28:58 -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 118272 invoked by uid 89); 25 Apr 2017 20:28:57 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.4 required=5.0 tests=BAYES_00, FREEMAIL_FROM, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM, SPF_PASS autolearn=ham version=3.3.2 spammy=16418 X-HELO: mail-wm0-f52.google.com Received: from mail-wm0-f52.google.com (HELO mail-wm0-f52.google.com) (74.125.82.52) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 25 Apr 2017 20:28:55 +0000 Received: by mail-wm0-f52.google.com with SMTP id w64so32947876wma.0 for ; Tue, 25 Apr 2017 13:28:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=KyiGvi8tU1NlXe5EMthPFB+MT7IgqAf3bkT6uhPx6Is=; b=jJcGBDbaAgmQNDjxZVDEg6FWfMSEeXG7gETkUStc7vVljORdpWVud8y7vV+5AT0Sym flgmuSFOHwmuzwgVXHLo2Gy+DEV83agN2F16gkabp6IVi9Rzb6mwsE3vkfsG723M5ikL ikeMufhwRL6H+e89P+RX/kvwfG2m5Bn32xJq+xkDpIAwbqjW0kUrUL6UYQvuA0u3HhZn jC8T9rTR4IXGW/avMlb/VabpUAf19dVJnsq5Au6uJM8q0oagwEgXKvuzXYxA+ijstHPD WQL8wcAalVYikDDWPf7h+VMsGJ/bK4BakyUrv1CmnKKBQJOoiZJ0O+cPBnYKhv6B3Kcb eqzw== X-Gm-Message-State: AN3rC/7cG5P3GTClOepkUqREk86LujTCSylB/2DheGyDsgQHl2p0IJuh FKF2S2taHV97+VWz X-Received: by 10.28.238.211 with SMTP id j80mr3398179wmi.97.1493152135110; Tue, 25 Apr 2017 13:28:55 -0700 (PDT) Received: from E107787-LIN.Home ([194.214.185.158]) by smtp.gmail.com with ESMTPSA id d17sm5635491wmi.21.2017.04.25.13.28.53 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 25 Apr 2017 13:28:54 -0700 (PDT) From: Yao Qi X-Google-Original-From: Yao Qi To: gdb-patches@sourceware.org Subject: [PATCH 6/6] Remove cleanup in get_return_value Date: Tue, 25 Apr 2017 21:28:26 +0100 Message-Id: <1493152106-3246-7-git-send-email-yao.qi@linaro.org> In-Reply-To: <1493152106-3246-1-git-send-email-yao.qi@linaro.org> References: <1493152106-3246-1-git-send-email-yao.qi@linaro.org> X-IsSubscribed: yes With regcache copy ctor, we can use it to create local object in get_return_value (), so that the cleanup can be removed. gdb: 2017-04-25 Yao Qi * infcmd.c (get_return_value): Use regcache copy ctor, and remove cleanup. --- gdb/infcmd.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/gdb/infcmd.c b/gdb/infcmd.c index 22b2c7a..090da8e 100644 --- a/gdb/infcmd.c +++ b/gdb/infcmd.c @@ -1604,15 +1604,9 @@ advance_command (char *arg, int from_tty) struct value * get_return_value (struct value *function, struct type *value_type) { - struct regcache *stop_regs; - struct gdbarch *gdbarch; + struct regcache stop_regs = regcache (*get_current_regcache ()); + struct gdbarch *gdbarch = stop_regs.get_arch (); struct value *value; - struct cleanup *cleanup; - - stop_regs = regcache_dup (get_current_regcache ()); - cleanup = make_cleanup_regcache_xfree (stop_regs); - - gdbarch = get_regcache_arch (stop_regs); value_type = check_typedef (value_type); gdb_assert (TYPE_CODE (value_type) != TYPE_CODE_VOID); @@ -1631,7 +1625,7 @@ get_return_value (struct value *function, struct type *value_type) case RETURN_VALUE_ABI_RETURNS_ADDRESS: case RETURN_VALUE_ABI_PRESERVES_ADDRESS: value = allocate_value (value_type); - gdbarch_return_value (gdbarch, function, value_type, stop_regs, + gdbarch_return_value (gdbarch, function, value_type, &stop_regs, value_contents_raw (value), NULL); break; case RETURN_VALUE_STRUCT_CONVENTION: @@ -1641,8 +1635,6 @@ get_return_value (struct value *function, struct type *value_type) internal_error (__FILE__, __LINE__, _("bad switch")); } - do_cleanups (cleanup); - return value; }