From patchwork Thu Jun 22 10:52:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pedro Alves X-Patchwork-Id: 21195 Received: (qmail 11886 invoked by alias); 22 Jun 2017 10:52:29 -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 11875 invoked by uid 89); 22 Jun 2017 10:52:28 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_HELO_PASS, 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; Thu, 22 Jun 2017 10:52:26 +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 86373C01CB61; Thu, 22 Jun 2017 10:52:25 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 86373C01CB61 Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=palves@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 86373C01CB61 Received: from [127.0.0.1] (ovpn04.gateway.prod.ext.ams2.redhat.com [10.39.146.4]) by smtp.corp.redhat.com (Postfix) with ESMTP id 80BD15D969; Thu, 22 Jun 2017 10:52:24 +0000 (UTC) Subject: Re: [PATCH v2] environ-selftests: Ignore -Wself-move warning To: Simon Marchi , gdb-patches@sourceware.org References: <1498076108-29914-2-git-send-email-simon.marchi@ericsson.com> <1498120280-17996-1-git-send-email-simon.marchi@ericsson.com> <49a24b04-421e-fb52-547b-0f980416d041@redhat.com> Cc: sergiodj@sergiodj.net From: Pedro Alves Message-ID: <250f1e46-f9e1-6f1d-b978-2eadf45a3055@redhat.com> Date: Thu, 22 Jun 2017 11:52:23 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.4.0 MIME-Version: 1.0 In-Reply-To: <49a24b04-421e-fb52-547b-0f980416d041@redhat.com> On 06/22/2017 10:51 AM, Pedro Alves wrote: > On 06/22/2017 09:31 AM, Simon Marchi wrote: >> +#if defined (__clang__) >> + >> +#define DIAG_PUSH_IGNORE_SELF_MOVE \ >> + _Pragma("clang diagnostic push") \ >> + _Pragma("clang diagnostic ignored \"-Wself-move\"") >> +#define DIAG_POP_IGNORE_SELF_MOVE _Pragma("clang diagnostic pop") >> + >> +#else >> + >> +#define DIAG_PUSH_IGNORE_SELF_MOVE >> +#define DIAG_POP_IGNORE_SELF_MOVE >> + >> +#endif > > > Let me try writing a quick patch that puts a "STRINGIZE" macro > in common/preprocessor.h, so we can write the above like I had > suggested before, which is a bit more generic. There are several > copies in the tree of such a macro, so that'll be a good thing > on its own anyway, IMO. > > I'm not sure whether the single push-ignore macro is a good idea, > since if we follow the pattern going forward, it requires more > boilerplace if we need different warnings around the same code: This is what I had in mind. I think it should work with clang, though I haven't tried it. Subject: [PATCH] environ-selftests: Ignore -Wself-move warning --- gdb/common/diagnostics.h | 40 +++++++++++++++++++++++++++++++++++++++ gdb/unittests/environ-selftests.c | 8 ++++++++ 2 files changed, 48 insertions(+) create mode 100644 gdb/common/diagnostics.h diff --git a/gdb/common/diagnostics.h b/gdb/common/diagnostics.h new file mode 100644 index 0000000..5a63bfd --- /dev/null +++ b/gdb/common/diagnostics.h @@ -0,0 +1,40 @@ +/* Copyright (C) 2017 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +#ifndef COMMON_DIAGNOSTICS_H +#define COMMON_DIAGNOSTICS_H + +#include "common/preprocessor.h" + +#ifdef __GNUC__ +# define DIAGNOSTIC_PUSH _Pragma ("GCC diagnostic push") +# define DIAGNOSTIC_POP _Pragma ("GCC diagnostic pop") +# define DIAGNOSTIC_IGNORE(option) \ + _Pragma (STRINGIFY (GCC diagnostic ignored option)) +#else +# define DIAGNOSTIC_PUSH +# define DIAGNOSTIC_POP +# define DIAGNOSTIC_IGNORE(option) +#endif + +#ifdef __clang__ +# define DIAGNOSTIC_IGNORE_SELF_MOVE DIAGNOSTIC_IGNORE ("-Wself-move") +#else +# define DIAGNOSTIC_IGNORE_SELF_MOVE +#endif + +#endif /* COMMON_DIAGNOSTICS_H */ diff --git a/gdb/unittests/environ-selftests.c b/gdb/unittests/environ-selftests.c index ecc3955..28b16f8 100644 --- a/gdb/unittests/environ-selftests.c +++ b/gdb/unittests/environ-selftests.c @@ -20,6 +20,7 @@ #include "defs.h" #include "selftest.h" #include "common/environ.h" +#include "common/diagnostics.h" namespace selftests { namespace gdb_environ_tests { @@ -136,7 +137,14 @@ run_tests () env.clear (); env.set ("A", "1"); SELF_CHECK (strcmp (env.get ("A"), "1") == 0); + + /* Some compilers warn about moving to self, but that's precisely what we want + to test here, so turn this warning off. */ + DIAGNOSTIC_PUSH + DIAGNOSTIC_IGNORE_SELF_MOVE env = std::move (env); + DIAGNOSTIC_POP + SELF_CHECK (strcmp (env.get ("A"), "1") == 0); SELF_CHECK (strcmp (env.envp ()[0], "A=1") == 0); SELF_CHECK (env.envp ()[1] == NULL);