From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 83929 invoked by alias); 17 Jan 2018 23:07:25 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 83918 invoked by uid 89); 17 Jan 2018 23:07:24 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.6 required=5.0 tests=BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,SPF_HELO_PASS,TRACKER_ID,T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 spammy= X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 17 Jan 2018 23:07:22 +0000 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B9D4A883AC; Wed, 17 Jan 2018 23:07:21 +0000 (UTC) Received: from localhost (unused-10-15-17-193.yyz.redhat.com [10.15.17.193]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 842455D970; Wed, 17 Jan 2018 23:07:21 +0000 (UTC) From: Sergio Durigan Junior To: Simon Marchi Cc: GDB Patches , Eli Zaretskii Subject: Re: [PATCH] Fix warning on gdb/compile/compile.c (C++-ify "triplet_rx") References: <87po69zkxe.fsf@redhat.com> <20180116194641.22361-1-sergiodj@redhat.com> Date: Wed, 17 Jan 2018 23:07:00 -0000 In-Reply-To: (Simon Marchi's message of "Wed, 17 Jan 2018 12:17:02 -0500") Message-ID: <87shb4ccev.fsf@redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-IsSubscribed: yes X-SW-Source: 2018-01/txt/msg00359.txt.bz2 On Wednesday, January 17 2018, Simon Marchi wrote: > On 2018-01-16 14:46, Sergio Durigan Junior wrote: >> This fixes a GCC warning that happens when compiling >> gdb/compile/compile.c on some GCC versions (e.g., "gcc (GCC) 7.2.1 >> 20180104 (Red Hat 7.2.1-6)"). >> >> It's a simple patch that converts "triplet_rx" from "char *" to >> "std::string", thus guaranteeing that it will be always initialized. >> >> I've regtested this patch and did not find any regressions. OK to >> apply on both master and 8.1 (after creating a bug for it)? >> >> gdb/ChangeLog: >> 2018-01-16 Sergio Durigan Junior >> >> * compile/compile.c (compile_to_object): Convert "triplet_rx" >> to "std::string". >> --- >> gdb/compile/compile.c | 15 ++++++++------- >> 1 file changed, 8 insertions(+), 7 deletions(-) >> >> diff --git a/gdb/compile/compile.c b/gdb/compile/compile.c >> index 2ee75930ac..47646169c8 100644 >> --- a/gdb/compile/compile.c >> +++ b/gdb/compile/compile.c >> @@ -463,7 +463,7 @@ compile_to_object (struct command_line *cmd, const >> char *cmd_string, >> char **argv; >> int ok; >> struct gdbarch *gdbarch = get_current_arch (); >> - char *triplet_rx; >> + std::string triplet_rx; >> char *error_message; >> >> if (!target_has_execution) >> @@ -527,15 +527,15 @@ compile_to_object (struct command_line *cmd, >> const char *cmd_string, >> } >> else >> { >> - const char *os_rx = osabi_triplet_regexp (gdbarch_osabi >> (gdbarch)); >> - const char *arch_rx = gdbarch_gnu_triplet_regexp (gdbarch); >> + std::string os_rx = osabi_triplet_regexp (gdbarch_osabi >> (gdbarch)); >> + std::string arch_rx = gdbarch_gnu_triplet_regexp (gdbarch); > > Making these std::string makes unnecessary copies. > > You can write the line below like this: > > triplet_rx = std::string (arch_rx) + "(-[^-]*)?-" + os_rx; > > Otherwise, LGTM. Thanks, Simon. Pushed to master: 7d937cad0acdccd0ff485435fbe16f005e994c66 Is it OK to push this to the 8.1 branch as well? If so, I'm not sure I should create a bug for this, or just go ahead and push it. Thanks, -- Sergio GPG key ID: 237A 54B1 0287 28BF 00EF 31F4 D0EB 7628 65FC 5E36 Please send encrypted e-mail if possible http://sergiodj.net/