From f4906a9a7441ef9c2758513420568994a1e7fed3 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Thu, 22 Jun 2017 10:31:20 +0200 Subject: [PATCH] environ-selftests: Ignore -Wself-move warning clang gives this warning: ..../gdb/unittests/environ-selftests.c:139:7: error: explicitly moving variable of type 'gdb_environ' to itself [-Werror,-Wself-move] env = std::move (env); ~~~ ^ ~~~ Ignoring the warning locally is the right thing to do, since it warns about behavior we want to unit test, while an explicit self-move in real code would likely be a mistake that we'd want to catch. To avoid cluttering the code with preprocessor conditionals, this commit adds the file common/diagnostics.h, in which we can put macros used to control compiler diagnostics. GCC enhancement request here: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81159 gdb/ChangeLog: 2017-06-22 Pedro Alves Simon Marchi * unittests/environ-selftests.c (run_tests): Ignore -Wself-move warning. * common/diagnostics.h: New file. --- gdb/ChangeLog | 7 ++++++ gdb/common/diagnostics.h | 40 +++++++++++++++++++++++++++++++ gdb/unittests/environ-selftests.c | 8 +++++++ 3 files changed, 55 insertions(+) create mode 100644 gdb/common/diagnostics.h diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 5e860b4d962..0b9fe3a4bca 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2017-06-22 Pedro Alves + Simon Marchi + + * unittests/environ-selftests.c (run_tests): Ignore -Wself-move + warning. + * common/diagnostics.h: New file. + 2017-06-22 Pedro Alves * common/agent.h: Add include guards. diff --git a/gdb/common/diagnostics.h b/gdb/common/diagnostics.h new file mode 100644 index 00000000000..5a63bfd8d4e --- /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 ecc395531de..28b16f828f3 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); -- 2.30.2