[PATCH] adjust expected -Wnonnull messages

[Jonathan Wakely]

On 30/06/20 17:25 -0600, Martin Sebor via Libstdc++ wrote:
>In testing a recent change to -Wnonnull, including the wording
>of the warning, I overlooked failures in a number of tests,
>including a few in libstdc++.  Attached is a patch that makes
>adjustments to let them pass again.

OK for master, thanks.


>Sorry about the unexpected fallout!
>
>Martin

>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 --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" }
> }