From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1930) id 03B8B386184C; Wed, 1 Jul 2020 14:33:52 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 03B8B386184C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1593614032; bh=xf0wahwB1cEf+NUErJQtnfm8+3xZtREdNdVWj3v3ed0=; h=From:To:Subject:Date:From; b=qeW3sA3MpbCmKxSRNpZiTyYK/5/6aqy5v1LbjrahewJ5Vx34TrJpldRG/Jr4/byOB +f+1wXu6fpjhwX7f5X6Af/qKxq5zYxN0eWZf1X55gUnRWQ1qgbeXHUI/95Oeru5qON 1X5Orgx7KEXEs5jmQ54GmTM2DN4lw0GQmh6GcQ5M= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Martin Sebor To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r11-1760] Adjust text of expected warnings changed in PR c++/86568. X-Act-Checkin: gcc X-Git-Author: Martin Sebor X-Git-Refname: refs/heads/master X-Git-Oldrev: aa8b5ca0b540fde5890f3114f2d7076d5238fc2e X-Git-Newrev: 8461191b826654a30eaaa57257bcca8e548f11c2 Message-Id: <20200701143352.03B8B386184C@sourceware.org> Date: Wed, 1 Jul 2020 14:33:52 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Jul 2020 14:33:52 -0000 https://gcc.gnu.org/g:8461191b826654a30eaaa57257bcca8e548f11c2 commit r11-1760-g8461191b826654a30eaaa57257bcca8e548f11c2 Author: Martin Sebor Date: Wed Jul 1 08:30:52 2020 -0600 Adjust text of expected warnings changed in PR c++/86568. libstdc++-v3/ChangeLog: * testsuite/21_strings/basic_string_view/cons/char/nonnull.cc: Adjust text of expected warning. * testsuite/21_strings/basic_string_view/cons/wchar_t/nonnull.cc: Same. * testsuite/21_strings/basic_string_view/operations/compare/char/nonnull.cc: Same. * testsuite/21_strings/basic_string_view/operations/find/char/nonnull.cc: Same. * testsuite/21_strings/basic_string_view/operations/rfind/char/nonnull.cc: Same. Diff: --- .../21_strings/basic_string_view/cons/char/nonnull.cc | 6 +++--- .../21_strings/basic_string_view/cons/wchar_t/nonnull.cc | 6 +++--- .../basic_string_view/operations/compare/char/nonnull.cc | 4 ++-- .../basic_string_view/operations/find/char/nonnull.cc | 12 ++++++------ .../basic_string_view/operations/rfind/char/nonnull.cc | 4 ++-- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/cons/char/nonnull.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/cons/char/nonnull.cc index dc93cd67a1f..81c6fc5d29a 100644 --- a/libstdc++-v3/testsuite/21_strings/basic_string_view/cons/char/nonnull.cc +++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/cons/char/nonnull.cc @@ -23,7 +23,7 @@ void test01() { - std::string_view s((const char*)nullptr); // { dg-warning "null arg" } - std::string_view t((char*)nullptr); // { dg-warning "null arg" } - std::string_view u(nullptr); // { dg-warning "null arg" } + std::string_view s((const char*)nullptr); // { dg-warning "\\\[-Wnonnull" } + std::string_view t((char*)nullptr); // { dg-warning "\\\[-Wnonnull" } + std::string_view u(nullptr); // { dg-warning "\\\[-Wnonnull" } } diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/cons/wchar_t/nonnull.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/cons/wchar_t/nonnull.cc index ded89c2ce45..ce95884e5de 100644 --- a/libstdc++-v3/testsuite/21_strings/basic_string_view/cons/wchar_t/nonnull.cc +++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/cons/wchar_t/nonnull.cc @@ -23,7 +23,7 @@ void test01() { - std::wstring_view s((const wchar_t*)nullptr); // { dg-warning "null arg" } - std::wstring_view t((wchar_t*)nullptr); // { dg-warning "null arg" } - std::wstring_view u(nullptr); // { dg-warning "null arg" } + std::wstring_view s((const wchar_t*)nullptr); // { dg-warning "\\\[-Wnonnull" } + std::wstring_view t((wchar_t*)nullptr); // { dg-warning "\\\[-Wnonnull" } + std::wstring_view u(nullptr); // { dg-warning "\\\[-Wnonnull" } } diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/compare/char/nonnull.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/compare/char/nonnull.cc index 0deba716ed3..7060ffb0109 100644 --- a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/compare/char/nonnull.cc +++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/compare/char/nonnull.cc @@ -24,6 +24,6 @@ int test01() { std::string_view s = "abcd"; - return s.compare((const char*)nullptr); // { dg-warning "null arg" } - return s.compare(0, 2, (const char*)nullptr); // { dg-warning "null arg" } + return s.compare((const char*)nullptr); // { dg-warning "\\\[-Wnonnull" } + return s.compare(0, 2, (const char*)nullptr); // { dg-warning "\\\[-Wnonnull" } } diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/find/char/nonnull.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/find/char/nonnull.cc index d097866b704..97c7629d388 100644 --- a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/find/char/nonnull.cc +++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/find/char/nonnull.cc @@ -24,10 +24,10 @@ int test01() { std::string_view s = "abcd"; - return s.find((const char*)nullptr); // { dg-warning "null arg" } - return s.find((const char*)nullptr, 1); // { dg-warning "null arg" } - return s.find_first_of((const char*)nullptr); // { dg-warning "null arg" } - return s.find_first_of((const char*)nullptr, 1); // { dg-warning "null arg" } - return s.find_first_not_of((const char*)nullptr); // { dg-warning "null arg" } - return s.find_first_not_of((const char*)nullptr, 1); // { dg-warning "null arg" } + return s.find((const char*)nullptr); // { dg-warning "\\\[-Wnonnull" } + return s.find((const char*)nullptr, 1); // { dg-warning "\\\[-Wnonnull" } + return s.find_first_of((const char*)nullptr); // { dg-warning "\\\[-Wnonnull" } + return s.find_first_of((const char*)nullptr, 1); // { dg-warning "\\\[-Wnonnull" } + return s.find_first_not_of((const char*)nullptr); // { dg-warning "\\\[-Wnonnull" } + return s.find_first_not_of((const char*)nullptr, 1); // { dg-warning "\\\[-Wnonnull" } } diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/rfind/char/nonnull.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/rfind/char/nonnull.cc index 55119b59a8f..91525a54d1a 100644 --- a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/rfind/char/nonnull.cc +++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/rfind/char/nonnull.cc @@ -24,6 +24,6 @@ int test01() { std::string_view s = "abcd"; - return s.rfind((const char*)nullptr); // { dg-warning "null arg" } - return s.rfind((const char*)nullptr, 1); // { dg-warning "null arg" } + return s.rfind((const char*)nullptr); // { dg-warning "\\\[-Wnonnull" } + return s.rfind((const char*)nullptr, 1); // { dg-warning "\\\[-Wnonnull" } }