From patchwork Sat Feb 17 16:11:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 25952 Received: (qmail 115684 invoked by alias); 17 Feb 2018 16:11:11 -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 115651 invoked by uid 89); 17 Feb 2018 16:11:10 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.8 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= X-HELO: gateway22.websitewelcome.com Received: from gateway22.websitewelcome.com (HELO gateway22.websitewelcome.com) (192.185.47.100) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sat, 17 Feb 2018 16:11:08 +0000 Received: from cm11.websitewelcome.com (cm11.websitewelcome.com [100.42.49.5]) by gateway22.websitewelcome.com (Postfix) with ESMTP id ECE2E4120 for ; Sat, 17 Feb 2018 10:11:06 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id n54secUauvkfxn54se3ly9; Sat, 17 Feb 2018 10:11:06 -0600 Received: from 174-29-60-18.hlrn.qwest.net ([174.29.60.18]:49524 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.89) (envelope-from ) id 1en54s-003B79-N0; Sat, 17 Feb 2018 10:11:06 -0600 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [RFA] Remove a cleanup from call_function_by_hand_dummy Date: Sat, 17 Feb 2018 09:11:04 -0700 Message-Id: <20180217161104.4909-1-tom@tromey.com> X-BWhitelist: no X-Source-L: No X-Exim-ID: 1en54s-003B79-N0 X-Source-Sender: 174-29-60-18.hlrn.qwest.net (bapiya.Home) [174.29.60.18]:49524 X-Source-Auth: tom+tromey.com X-Email-Count: 1 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes This removes a cleanup from call_function_by_hand_dummy, replacing manual allocation with std::vector. Regression tested by the buildbot. gdb/ChangeLog 2018-02-16 Tom Tromey * infcall.c (call_function_by_hand_dummy): Use std::vector. --- gdb/ChangeLog | 4 ++++ gdb/infcall.c | 14 ++++---------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/gdb/infcall.c b/gdb/infcall.c index 8b75297251..6ff725a815 100644 --- a/gdb/infcall.c +++ b/gdb/infcall.c @@ -732,7 +732,6 @@ call_function_by_hand_dummy (struct value *function, struct type *ftype = check_typedef (value_type (function)); CORE_ADDR bp_addr; struct frame_id dummy_id; - struct cleanup *args_cleanup; struct frame_info *frame; struct gdbarch *gdbarch; struct cleanup *terminate_bp_cleanup; @@ -1054,21 +1053,18 @@ call_function_by_hand_dummy (struct value *function, } } + std::vector new_args; if (hidden_first_param_p) { - struct value **new_args; - /* Add the new argument to the front of the argument list. */ - new_args = XNEWVEC (struct value *, nargs + 1); + new_args.reserve (nargs + 1); + new_args[0] = value_from_pointer (lookup_pointer_type (values_type), struct_addr); memcpy (&new_args[1], &args[0], sizeof (struct value *) * nargs); - args = new_args; + args = new_args.data (); nargs++; - args_cleanup = make_cleanup (xfree, args); } - else - args_cleanup = make_cleanup (null_cleanup, NULL); /* Create the dummy stack frame. Pass in the call dummy address as, presumably, the ABI code knows where, in the call dummy, the @@ -1077,8 +1073,6 @@ call_function_by_hand_dummy (struct value *function, bp_addr, nargs, args, sp, struct_return, struct_addr); - do_cleanups (args_cleanup); - /* Set up a frame ID for the dummy frame so we can pass it to set_momentary_breakpoint. We need to give the breakpoint a frame ID so that the breakpoint code can correctly re-identify the