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

Fix PR 108980: note without warning due to array bounds check

Browse source 
The problem here is after r13-4748-g2a27ae32fabf85, in some
cases we were calling inform without a corresponding warning.
This changes the logic such that we only cause that to happen
if there was a warning happened before hand.

Changes since
* v1: Fix formating and dump message as suggested by Jakub.

OK? Bootstrapped and tested on x86_64-linux-gnu with no regressions.

gcc/ChangeLog:

	PR tree-optimization/108980
	* gimple-array-bounds.cc (array_bounds_checker::check_array_ref):
	Reorgnize the call to warning for not strict flexible arrays
	to be before the check of warned.
This commit is contained in:
Andrew Pinski 2023-03-01 11:13:21 -08:00
parent 3df9760d56
commit c6232ba229
1 changed files with 26 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
gcc/gimple-array-bounds.cc
View file

@ -397,8 +397,6 @@ array_bounds_checker::check_array_ref (location_t location, tree ref,
"of an interior zero-length array %qT")), "of an interior zero-length array %qT")),
low_sub, artype); low_sub, artype);
if (warned || out_of_bound)
{
if (warned && dump_file && (dump_flags & TDF_DETAILS)) if (warned && dump_file && (dump_flags & TDF_DETAILS))
{ {
fprintf (dump_file, "Array bound warning for "); fprintf (dump_file, "Array bound warning for ");
@ -406,18 +404,31 @@ array_bounds_checker::check_array_ref (location_t location, tree ref,
fprintf (dump_file, "\n"); fprintf (dump_file, "\n");
} }
/* issue warnings for -Wstrict-flex-arrays according to the level of /* Issue warnings for -Wstrict-flex-arrays according to the level of
flag_strict_flex_arrays. */ flag_strict_flex_arrays. */
if ((out_of_bound && warn_strict_flex_arrays) if (out_of_bound && warn_strict_flex_arrays
&& (((sam == special_array_member::trail_0) && (sam == special_array_member::trail_0
|| (sam == special_array_member::trail_1) || sam == special_array_member::trail_1
|| (sam == special_array_member::trail_n)) || sam == special_array_member::trail_n)
&& DECL_NOT_FLEXARRAY (afield_decl))) && DECL_NOT_FLEXARRAY (afield_decl))
warned = warning_at (location, OPT_Wstrict_flex_arrays, {
bool warned1
= warning_at (location, OPT_Wstrict_flex_arrays,
"trailing array %qT should not be used as " "trailing array %qT should not be used as "
"a flexible array member", "a flexible array member",
artype); artype);
if (warned1 && dump_file && (dump_flags & TDF_DETAILS))
{
fprintf (dump_file, "Trailing non flexible-like array bound warning for ");
dump_generic_expr (MSG_NOTE, TDF_SLIM, ref);
fprintf (dump_file, "\n");
}
warned |= warned1;
}
if (warned)
{
/* Avoid more warnings when checking more significant subscripts /* Avoid more warnings when checking more significant subscripts
of the same expression. */ of the same expression. */
ref = TREE_OPERAND (ref, 0); ref = TREE_OPERAND (ref, 0);