From patchwork Fri Apr 28 14:26:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yao Qi X-Patchwork-Id: 20197 Received: (qmail 83400 invoked by alias); 28 Apr 2017 14:26:45 -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 83346 invoked by uid 89); 28 Apr 2017 14:26:44 -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=16257 X-HELO: mail-wr0-f196.google.com Received: from mail-wr0-f196.google.com (HELO mail-wr0-f196.google.com) (209.85.128.196) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 28 Apr 2017 14:26:41 +0000 Received: by mail-wr0-f196.google.com with SMTP id 6so7306620wrb.1 for ; Fri, 28 Apr 2017 07:26:42 -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=Iwv5hfFWpYHJZzNGFEvf0r09U/rR878+4NZcNlCZg8c=; b=ftS/4yvjz/j41CmZQ8J7NLdTmVnCAw5vDlb+Uu6ufGFjVPOWI7ifKdN1Tx/LNuQNMK E0v06/FFOZOuhk0dh68a/dgUhq/gwPgL60I0OviYwWdHD9J5tl8sg6yE7W+1FpvCBjz7 pq0qMZ+8WqR2eLN/dHB8zgbAF9i9aVT0XLpoWyzGXoiXMJ+ITY1tz755IIV2OfwVK+Bo ULt4oOiyUoCrJw0TBHhoRGlQVIj3hGra+1GxGXL5GxGwbcs/aiJM1/mS6cMK5C2I26Kw 07V30q9jXC8UBXMXHqe1WMzpFE/Z8c2KBx+T6NZAKpC32e5eN5w9kMsDTwP+h0cs5x1H aZzA== X-Gm-Message-State: AN3rC/5X7XzPeBq6WwAk7kTeOszOMjIK4nvVeaHpdNrFc14zV3UJOTj0 Xul5pGUXCgzQ542A X-Received: by 10.223.148.35 with SMTP id 32mr1951084wrq.175.1493389600079; Fri, 28 Apr 2017 07:26:40 -0700 (PDT) Received: from E107787-LIN.cambridge.arm.com ([194.214.185.158]) by smtp.gmail.com with ESMTPSA id 133sm6888691wms.22.2017.04.28.07.26.39 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 28 Apr 2017 07:26:39 -0700 (PDT) From: Yao Qi X-Google-Original-From: Yao Qi To: gdb-patches@sourceware.org Subject: [PATCH 4/4] Remove cleanup in get_return_value Date: Fri, 28 Apr 2017 15:26:34 +0100 Message-Id: <1493389594-24434-5-git-send-email-yao.qi@linaro.org> In-Reply-To: <1493389594-24434-1-git-send-email-yao.qi@linaro.org> References: <1493152106-3246-1-git-send-email-yao.qi@linaro.org> <1493389594-24434-1-git-send-email-yao.qi@linaro.org> X-IsSubscribed: yes With regcache ctor, we can use it to create local object in get_return_value (), so that the cleanup can be removed. gdb: 2017-04-27 Yao Qi * infcmd.c (get_return_value): Use regcache 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..dfdaefb 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; + regcache stop_regs (regcache::readonly, *get_current_regcache ()); + struct gdbarch *gdbarch = stop_regs.get_gdbarch (); 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; }