procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid more -Wformat-diag warnings [PR103758]

Browse source 
Let's use "%<x>, %<y>, or %<z>" rather than "[x|y|z]" as in the rest of
our codebase.

	PR c++/103758

gcc/c-family/ChangeLog:

	* c-pragma.c (handle_pragma_scalar_storage_order): Use %< %> in
	diagnostic messages.
	(handle_pragma_diagnostic): Likewise.

gcc/testsuite/ChangeLog:

	* gcc.dg/sso-6.c: Update dg-warning.
This commit is contained in:
Marek Polacek 2022-01-05 17:53:30 -05:00
parent 0fbefa25b3
commit 1935db2968
2 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
gcc/c-family/c-pragma.c
View file

@ -441,7 +441,8 @@ handle_pragma_scalar_storage_order (cpp_reader *ARG_UNUSED(dummy))
token = pragma_lex (&x);
if (token != CPP_NAME)
GCC_BAD ("missing [big-endian|little-endian|default] after %<#pragma scalar_storage_order%>");
GCC_BAD ("missing %<big-endian%>, %<little-endian%>, or %<default%> after "
"%<#pragma scalar_storage_order%>");
kind_string = IDENTIFIER_POINTER (x);
if (strcmp (kind_string, "default") == 0)
global_sso = default_sso;
@ -450,7 +451,8 @@ handle_pragma_scalar_storage_order (cpp_reader *ARG_UNUSED(dummy))
else if (strcmp (kind_string, "little") == 0)
global_sso = SSO_LITTLE_ENDIAN;
else
GCC_BAD ("expected [big-endian|little-endian|default] after %<#pragma scalar_storage_order%>");
GCC_BAD ("expected %<big-endian%>, %<little-endian%>, or %<default%> after "
"%<#pragma scalar_storage_order%>");
}
/* GCC supports two #pragma directives for renaming the external
@ -771,8 +773,9 @@ handle_pragma_diagnostic(cpp_reader *ARG_UNUSED(dummy))
if (token != CPP_NAME)
{
warning_at (loc, OPT_Wpragmas,
"missing [error|warning|ignored|push|pop|ignored_attributes]"
" after %<#pragma GCC diagnostic%>");
"missing %<error%>, %<warning%>, %<ignored%>, %<push%>, "
"%<pop%>, or %<ignored_attributes%> after "
"%<#pragma GCC diagnostic%>");
return;
}
@ -830,8 +833,9 @@ handle_pragma_diagnostic(cpp_reader *ARG_UNUSED(dummy))
else
{
warning_at (loc, OPT_Wpragmas,
"expected [error|warning|ignored|push|pop|ignored_attributes]"
" after %<#pragma GCC diagnostic%>");
"expected %<error%>, %<warning%>, %<ignored%>, %<push%>, "
"%<pop%>, %<ignored_attributes%> after "
"%<#pragma GCC diagnostic%>");
return;
}

4
gcc/testsuite/gcc.dg/sso-6.c
View file

@ -3,7 +3,7 @@
/* { dg-do run } */
/* { dg-require-effective-target int32plus } */
#pragma scalar_storage_order /* { dg-warning "missing .big-endian.little-endian.default." } */
#pragma scalar_storage_order /* { dg-warning "missing .big-endian., .little-endian., or .default." } */
#pragma scalar_storage_order big-endian
@ -36,7 +36,7 @@ struct S5
int i;
};
#pragma scalar_storage_order other /* { dg-warning "expected .big-endian.little-endian.default." } */
#pragma scalar_storage_order other /* { dg-warning "expected .big-endian., .little-endian., or .default." } */
struct S1 my_s1 = { 0x12345678 };
struct S2 my_s2 = { 0x12345678 };