Re: [PATCH] Make Warray-bounds alias to Warray-bounds= [PR107787]
On Thu, Nov 24, 2022 at 4:27 PM Iskander Shakirzyanov
wrote:
>
> How did you test the patch? If you bootstrapped it and ran the
> testsuite then it's OK.
>
> Yes, i ran testsuite and bootstrapped and everything seemed OK, but i missed
> fail of tests gcc.dg/Warray-bounds-34.c and gcc.dg/Warray-bounds-43.c, so
> Franz is right. After that I fixed the regexps in dg directives and now
> everything seems OK.
>
> I'm pretty sure the testsuite will have regressions, as I have a very similar
> patch lying around that needs these testsuite changes.
>
> You are right, thank you. I missed this, attaching corrected version of patch.
>
> This also shows nicely why I don't like warnings with levels, what if I want
> -Werror=array-bounds=2 + -Warray-bounds=1?
>
> I completely agree with you, because I also thought about using -Werror=opt=X
> + -Wopt=Y, this functionality looks useful. As I know, gcc, while parsing an
> option with the same OPT, overwrites the old config of OPT.
>
> Because I think at least -Wuse-after-free= and Wattributes= have the same
> problem.
>
> Yes, looks like this, probably should be fixed too.
>
> BTW, is the duplicated warning description "Warn if an array is accessed out
> of bounds." needed or not with Alias()?
>
> According to other examples in common.opt, duplicated description is not
> necessary, you are right.
>
> I've attached my patch, feel free to integrate the testsuite changes.
>
> Thanks, but it seems to me that duplicating existing tests seems redundant to
> test functionality of -Werror=array-bounds=X.
>
>
> From bf047e36392dab138db10be2ec257d08c376ada5 Mon Sep 17 00:00:00 2001
> From: Iskander Shakirzyanov
> Date: Thu, 24 Nov 2022 14:26:59 +
> Subject: [PATCH] Make Warray-bounds alias to Warray-bounds= [PR107787]
>
> According to documentation the -Werror= option makes the specified warning
> into an error and also automatically implies this option. Then it seems that
> the behavior of the compiler when specifying -Werror=array-bounds=X should be
> the same as specifying "-Werror=array-bounds -Warray-bounds=X", so we expect
> to
> receive array-bounds pass triggers and they must be processed as errors.
> In practice, we observe that the array-bounds pass is indeed called, but
> its responses are processed as warnings, not errors.
> As I understand, this happens because Warray-bounds and Warray-bounds= are
> declared as 2 different options in common.opt, so when
> diagnostic_classify_diagnostic() is called, DK_ERROR is set for
> the Warray-bounds= option, but in diagnostic_report_diagnostic() through
> warning_at() passes opt_index of Warray-bounds, so information about
> DK_ERROR is lost. Fixed by using Alias() in declaration of
> Warray-bounds (similarly as in Wattribute-alias etc.)
OK if this passed bootstrap & regtest.
Thanks,
Richard.
> PR driver/107787
>
> Co-authored-by: Franz Sirl
>
> gcc/ChangeLog:
>
> * common.opt (Warray-bounds): Turn into alias to
> -Warray-bounds=1.
> * builtins.cc (warn_array_bounds): Use OPT_Warray_bounds_
> instead of OPT_Warray_bounds.
> * diagnostic-spec.cc: Likewise.
> * gimple-array-bounds.cc: Likewise.
> * gimple-ssa-warn-restrict.cc: Likewise.
>
> gcc/testsuite/ChangeLog:
>
> * gcc.dg/Warray-bounds-34.c: Correct the regular
> expression for -Warray-bounds=.
> * gcc.dg/Warray-bounds-43.c: Likewise.
> * gcc.dg/pr107787.c: New test.
>
> gcc/c-family/ChangeLog:
>
> * c-common.cc (warn_array_bounds): Use OPT_Warray_bounds_
> instead of OPT_Warray_bounds.
> ---
> gcc/builtins.cc | 6 ++--
> gcc/c-family/c-common.cc| 4 +--
> gcc/common.opt | 3 +-
> gcc/diagnostic-spec.cc | 1 -
> gcc/gimple-array-bounds.cc | 38 -
> gcc/gimple-ssa-warn-restrict.cc | 2 +-
> gcc/testsuite/gcc.dg/Warray-bounds-34.c | 2 +-
> gcc/testsuite/gcc.dg/Warray-bounds-43.c | 6 ++--
> gcc/testsuite/gcc.dg/pr107787.c | 13 +
> 9 files changed, 43 insertions(+), 32 deletions(-)
> create mode 100644 gcc/testsuite/gcc.dg/pr107787.c
>
> diff --git a/gcc/builtins.cc b/gcc/builtins.cc
> index 4dc1ca672b2..02c4fefa86f 100644
> --- a/gcc/builtins.cc
> +++ b/gcc/builtins.cc
> @@ -696,14 +696,14 @@ c_strlen (tree arg, int only_value, c_strlen_data
> *data, unsigned eltsize)
> {
>/* Suppress multiple warnings for propagated constant strings. */
>if (only_value != 2
> - && !warning_suppressed_p (arg, OPT_Warray_bounds)
> - && warning_at (loc, OPT_Warray_bounds,
> + && !warning_suppressed_p (arg, OPT_Warray_bounds_)
Re: [PATCH] Make Warray-bounds alias to Warray-bounds= [PR107787]
>> How did you test the patch? If you bootstrapped it and ran the
>> testsuite then it's OK.
Yes, i ran testsuite and bootstrapped and everything seemed OK, but i missed
fail of tests gcc.dg/Warray-bounds-34.c and gcc.dg/Warray-bounds-43.c, so Franz
is right. After that I fixed the regexps in dg directives and now everything
seems OK.
> I'm pretty sure the testsuite will have regressions, as I have a very similar
> patch lying around that needs these testsuite changes.
You are right, thank you. I missed this, attaching corrected version of patch.
> This also shows nicely why I don't like warnings with levels, what if I want
> -Werror=array-bounds=2 + -Warray-bounds=1?
I completely agree with you, because I also thought about using -Werror=opt=X +
-Wopt=Y, this functionality looks useful. As I know, gcc, while parsing an
option with the same OPT, overwrites the old config of OPT.
> Because I think at least -Wuse-after-free= and Wattributes= have the same
> problem.
Yes, looks like this, probably should be fixed too.
> BTW, is the duplicated warning description "Warn if an array is accessed out
> of bounds." needed or not with Alias()?
According to other examples in common.opt, duplicated description is not
necessary, you are right.
> I've attached my patch, feel free to integrate the testsuite changes.
Thanks, but it seems to me that duplicating existing tests seems redundant to
test functionality of -Werror=array-bounds=X.
From bf047e36392dab138db10be2ec257d08c376ada5 Mon Sep 17 00:00:00 2001
From: Iskander Shakirzyanov
Date: Thu, 24 Nov 2022 14:26:59 +0000
Subject: [PATCH] Make Warray-bounds alias to Warray-bounds= [PR107787]
According to documentation the -Werror= option makes the specified warning
into an error and also automatically implies this option. Then it seems that
the behavior of the compiler when specifying -Werror=array-bounds=X should be
the same as specifying "-Werror=array-bounds -Warray-bounds=X", so we expect to
receive array-bounds pass triggers and they must be processed as errors.
In practice, we observe that the array-bounds pass is indeed called, but
its responses are processed as warnings, not errors.
As I understand, this happens because Warray-bounds and Warray-bounds= are
declared as 2 different options in common.opt, so when
diagnostic_classify_diagnostic() is called, DK_ERROR is set for
the Warray-bounds= option, but in diagnostic_report_diagnostic() through
warning_at() passes opt_index of Warray-bounds, so information about
DK_ERROR is lost. Fixed by using Alias() in declaration of
Warray-bounds (similarly as in Wattribute-alias etc.)
PR driver/107787
Co-authored-by: Franz Sirl
gcc/ChangeLog:
* common.opt (Warray-bounds): Turn into alias to
-Warray-bounds=1.
* builtins.cc (warn_array_bounds): Use OPT_Warray_bounds_
instead of OPT_Warray_bounds.
* diagnostic-spec.cc: Likewise.
* gimple-array-bounds.cc: Likewise.
* gimple-ssa-warn-restrict.cc: Likewise.
gcc/testsuite/ChangeLog:
* gcc.dg/Warray-bounds-34.c: Correct the regular
expression for -Warray-bounds=.
* gcc.dg/Warray-bounds-43.c: Likewise.
* gcc.dg/pr107787.c: New test.
gcc/c-family/ChangeLog:
* c-common.cc (warn_array_bounds): Use OPT_Warray_bounds_
instead of OPT_Warray_bounds.
---
gcc/builtins.cc | 6 ++--
gcc/c-family/c-common.cc| 4 +--
gcc/common.opt | 3 +-
gcc/diagnostic-spec.cc | 1 -
gcc/gimple-array-bounds.cc | 38 -
gcc/gimple-ssa-warn-restrict.cc | 2 +-
gcc/testsuite/gcc.dg/Warray-bounds-34.c | 2 +-
gcc/testsuite/gcc.dg/Warray-bounds-43.c | 6 ++--
gcc/testsuite/gcc.dg/pr107787.c | 13 +
9 files changed, 43 insertions(+), 32 deletions(-)
create mode 100644 gcc/testsuite/gcc.dg/pr107787.c
diff --git a/gcc/builtins.cc b/gcc/builtins.cc
index 4dc1ca672b2..02c4fefa86f 100644
--- a/gcc/builtins.cc
+++ b/gcc/builtins.cc
@@ -696,14 +696,14 @@ c_strlen (tree arg, int only_value, c_strlen_data *data,
unsigned eltsize)
{
/* Suppress multiple warnings for propagated constant strings. */
if (only_value != 2
- && !warning_suppressed_p (arg, OPT_Warray_bounds)
- && warning_at (loc, OPT_Warray_bounds,
+ && !warning_suppressed_p (arg, OPT_Warray_bounds_)
+ && warning_at (loc, OPT_Warray_bounds_,
"offset %qwi outside bounds of constant string",
eltoff))
{
if (decl)
inform (DECL_SOURCE_LOCATION (decl), "%qE declared here", decl);
- suppress_warning (arg, OPT_Warray_bounds);
+ suppress_warning (arg, OPT_Warray_bounds_);
}
return NULL_TREE;
}
diff --git a
Re: [PATCH] Make Warray-bounds alias to Warray-bounds= [PR107787]
Am 2022-11-23 um 21:11 schrieb Richard Biener via Gcc-patches:
On Wed, Nov 23, 2022 at 3:08 PM Iskander Shakirzyanov via Gcc-patches
wrote:
Hi!
Sorry for the initially missing description.
The following patch changes the definition of -Warray-bounds to an Alias to
-Warray-bounds=1. This is necessary for the correct use of
-Werror=array-bounds=X, for more information see bug report 107787
(https://gcc.gnu.org/bugzilla/show_bug.cgi?id=107787)
As I understand, this happens because -Warray-bounds and -Warray-bounds= are
declared as 2 different options in common.opt, so when
diagnostic_classify_diagnostic() (opts-common.cc:1880) is called, DK_ERROR is
set for the -Warray-bounds= option, but in diagnostic_report_diagnostic()
(diagnostic.cc:1446) through warning_at() passes opt_index of -Warray-bounds,
so information about DK_ERROR is lost.
How did you test the patch? If you bootstrapped it and ran the
testsuite then it's OK.
Hi,
I'm pretty sure the testsuite will have regressions, as I have a very
similar patch lying around that needs these testsuite changes. I also
added some modified tests that check that -Werror=array-bounds=X works
as expected (which it didn't before). This also shows nicely why I don't
like warnings with levels, what if I want -Werror=array-bounds=2 +
-Warray-bounds=1?
The reason (besides lack of time) I didn't submit that patch yet, is
that I wanted to check if the tool to process common.opt can be changed
to detect warnings with duplicated warning variables. Because I think at
least -Wuse-after-free= and Wattributes= have the same problem.
BTW, is the duplicated warning description "Warn if an array is accessed
out of bounds." needed or not with Alias()? There are examples either
way in common.opt.
I've attached my patch, feel free to integrate the testsuite changes.
Franz
From 9bfefe2082f55f2ad2cd19beedbfeaf9bd20fb4a Mon Sep 17 00:00:00 2001
From: Franz Sirl
Date: Thu, 8 Jul 2021 10:25:00 +0200
Subject: [PATCH 08/11] Unify -Warray-bounds/-Warray-bounds= warning variables.
---
gcc/builtins.cc | 6 +-
gcc/c-family/c-common.cc| 6 +-
gcc/common.opt | 3 +-
gcc/diagnostic-spec.cc | 1 -
gcc/gimple-array-bounds.cc | 38 +++---
gcc/gimple-ssa-warn-restrict.cc | 2 +-
gcc/testsuite/gcc.dg/Warray-bounds-34.c | 2 +-
gcc/testsuite/gcc.dg/Warray-bounds-43.c | 6 +-
gcc/testsuite/gcc.dg/Warray-bounds-93.c | 103
gcc/testsuite/gcc.dg/Warray-bounds-94.c | 149
10 files changed, 283 insertions(+), 33 deletions(-)
create mode 100644 gcc/testsuite/gcc.dg/Warray-bounds-93.c
create mode 100644 gcc/testsuite/gcc.dg/Warray-bounds-94.c
diff --git a/gcc/builtins.cc b/gcc/builtins.cc
index 4dc1ca672b2..02c4fefa86f 100644
--- a/gcc/builtins.cc
+++ b/gcc/builtins.cc
@@ -696,14 +696,14 @@ c_strlen (tree arg, int only_value, c_strlen_data *data,
unsigned eltsize)
{
/* Suppress multiple warnings for propagated constant strings. */
if (only_value != 2
- && !warning_suppressed_p (arg, OPT_Warray_bounds)
- && warning_at (loc, OPT_Warray_bounds,
+ && !warning_suppressed_p (arg, OPT_Warray_bounds_)
+ && warning_at (loc, OPT_Warray_bounds_,
"offset %qwi outside bounds of constant string",
eltoff))
{
if (decl)
inform (DECL_SOURCE_LOCATION (decl), "%qE declared here", decl);
- suppress_warning (arg, OPT_Warray_bounds);
+ suppress_warning (arg, OPT_Warray_bounds_);
}
return NULL_TREE;
}
diff --git a/gcc/c-family/c-common.cc b/gcc/c-family/c-common.cc
index 71507d4cb0a..cf423d384f6 100644
--- a/gcc/c-family/c-common.cc
+++ b/gcc/c-family/c-common.cc
@@ -6811,7 +6811,7 @@ fold_offsetof (tree expr, tree type, enum tree_code ctx)
definition thereof. */
if (TREE_CODE (v) == ARRAY_REF
|| TREE_CODE (v) == COMPONENT_REF)
- warning (OPT_Warray_bounds,
+ warning (OPT_Warray_bounds_,
"index %E denotes an offset "
"greater than size of %qT",
t, TREE_TYPE (TREE_OPERAND (expr, 0)));
@@ -8530,9 +8530,9 @@ convert_vector_to_array_for_subscript (location_t loc,
index = fold_for_warn (index);
if (TREE_CODE (index) == INTEGER_CST)
-if (!tree_fits_uhwi_p (index)
+ if (!tree_fits_uhwi_p (index)
|| maybe_ge (tree_to_uhwi (index), TYPE_VECTOR_SUBPARTS (type)))
- warning_at (loc, OPT_Warray_bounds, "index value is out of bound");
+ warning_at (loc, OPT_Warray_bounds_, "index value is out of bound");
/* We are building an ARRAY_REF so mark the vector as addressable
to not run into the gimplifiers premature setting of
Re: [PATCH] Make Warray-bounds alias to Warray-bounds= [PR107787]
On Wed, Nov 23, 2022 at 3:08 PM Iskander Shakirzyanov via Gcc-patches
wrote:
>
> Hi!
> Sorry for the initially missing description.
> The following patch changes the definition of -Warray-bounds to an Alias to
> -Warray-bounds=1. This is necessary for the correct use of
> -Werror=array-bounds=X, for more information see bug report 107787
> (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=107787)
> As I understand, this happens because -Warray-bounds and -Warray-bounds= are
> declared as 2 different options in common.opt, so when
> diagnostic_classify_diagnostic() (opts-common.cc:1880) is called, DK_ERROR is
> set for the -Warray-bounds= option, but in diagnostic_report_diagnostic()
> (diagnostic.cc:1446) through warning_at() passes opt_index of -Warray-bounds,
> so information about DK_ERROR is lost.
How did you test the patch? If you bootstrapped it and ran the
testsuite then it's OK.
Thanks,
Richard.
>
> From 51559e862d191a1f51cc9af11f0d9be5fbc0b43c Mon Sep 17 00:00:00 2001
> From: Iskander Shakirzyanov
> Date: Wed, 23 Nov 2022 12:26:47 +0000
> Subject: [PATCH] Make Warray-bounds alias to Warray-bounds= [PR107787]
>
> PR driver/107787
>
> gcc/ChangeLog:
>
> * common.opt (Warray-bounds): Turn into alias to
> -Warray-bounds=1.
> * builtins.cc (warn_array_bounds): Use OPT_Warray_bounds_
> instead of OPT_Warray_bounds.
> * diagnostic-spec.cc: Likewise.
> * gimple-array-bounds.cc: Likewise.
> * gimple-ssa-warn-restrict.cc: Likewise.
>
> gcc/testsuite/ChangeLog:
>
> * pr107787.c: New test.
>
> gcc/c-family/ChangeLog:
>
> * c-common.cc (warn_array_bounds): Use OPT_Warray_bounds_
> instead of OPT_Warray_bounds.
> ---
> gcc/builtins.cc | 6 +++---
> gcc/c-family/c-common.cc| 4 ++--
> gcc/common.opt | 2 +-
> gcc/diagnostic-spec.cc | 1 -
> gcc/gimple-array-bounds.cc | 38 -
> gcc/gimple-ssa-warn-restrict.cc | 2 +-
> gcc/testsuite/gcc.dg/pr107787.c | 13 +++
> 7 files changed, 39 insertions(+), 27 deletions(-)
> create mode 100644 gcc/testsuite/gcc.dg/pr107787.c
>
> diff --git a/gcc/builtins.cc b/gcc/builtins.cc
> index 4dc1ca672b2..02c4fefa86f 100644
> --- a/gcc/builtins.cc
> +++ b/gcc/builtins.cc
> @@ -696,14 +696,14 @@ c_strlen (tree arg, int only_value, c_strlen_data
> *data, unsigned eltsize)
> {
>/* Suppress multiple warnings for propagated constant strings. */
>if (only_value != 2
> - && !warning_suppressed_p (arg, OPT_Warray_bounds)
> - && warning_at (loc, OPT_Warray_bounds,
> + && !warning_suppressed_p (arg, OPT_Warray_bounds_)
> + && warning_at (loc, OPT_Warray_bounds_,
> "offset %qwi outside bounds of constant string",
> eltoff))
> {
> if (decl)
> inform (DECL_SOURCE_LOCATION (decl), "%qE declared here", decl);
> - suppress_warning (arg, OPT_Warray_bounds);
> + suppress_warning (arg, OPT_Warray_bounds_);
> }
>return NULL_TREE;
> }
> diff --git a/gcc/c-family/c-common.cc b/gcc/c-family/c-common.cc
> index 6f1f21bc4c1..b0da6886ccf 100644
> --- a/gcc/c-family/c-common.cc
> +++ b/gcc/c-family/c-common.cc
> @@ -6811,7 +6811,7 @@ fold_offsetof (tree expr, tree type, enum tree_code ctx)
> definition thereof. */
> if (TREE_CODE (v) == ARRAY_REF
> || TREE_CODE (v) == COMPONENT_REF)
> - warning (OPT_Warray_bounds,
> + warning (OPT_Warray_bounds_,
> "index %E denotes an offset "
> "greater than size of %qT",
> t, TREE_TYPE (TREE_OPERAND (expr, 0)));
> @@ -8534,7 +8534,7 @@ convert_vector_to_array_for_subscript (location_t loc,
>if (TREE_CODE (index) == INTEGER_CST)
> if (!tree_fits_uhwi_p (index)
> || maybe_ge (tree_to_uhwi (index), TYPE_VECTOR_SUBPARTS (type)))
> - warning_at (loc, OPT_Warray_bounds, "index value is out of bound");
> + warning_at (loc, OPT_Warray_bounds_, "index value is out of
> bound");
>
>/* We are building an ARRAY_REF so mark the vector as addressable
> to not run into the gimplifiers premature setting of
> DECL_GIMPLE_REG_P
> diff --git a/gcc/common.opt b/gcc/common.opt
> index 26e9d1cc4e7..e475d6e56eb 100644
> --- a/gcc/common.opt
> +++ b/gcc/common.opt
> @@ -539,7 +539,7 @@ Common V
Re: [PATCH] Make Warray-bounds alias to Warray-bounds= [PR107787]
Hi!
Sorry for the initially missing description.
The following patch changes the definition of -Warray-bounds to an Alias to
-Warray-bounds=1. This is necessary for the correct use of
-Werror=array-bounds=X, for more information see bug report 107787
(https://gcc.gnu.org/bugzilla/show_bug.cgi?id=107787)
As I understand, this happens because -Warray-bounds and -Warray-bounds= are
declared as 2 different options in common.opt, so when
diagnostic_classify_diagnostic() (opts-common.cc:1880) is called, DK_ERROR is
set for the -Warray-bounds= option, but in diagnostic_report_diagnostic()
(diagnostic.cc:1446) through warning_at() passes opt_index of -Warray-bounds,
so information about DK_ERROR is lost.
From 51559e862d191a1f51cc9af11f0d9be5fbc0b43c Mon Sep 17 00:00:00 2001
From: Iskander Shakirzyanov
Date: Wed, 23 Nov 2022 12:26:47 +
Subject: [PATCH] Make Warray-bounds alias to Warray-bounds= [PR107787]
PR driver/107787
gcc/ChangeLog:
* common.opt (Warray-bounds): Turn into alias to
-Warray-bounds=1.
* builtins.cc (warn_array_bounds): Use OPT_Warray_bounds_
instead of OPT_Warray_bounds.
* diagnostic-spec.cc: Likewise.
* gimple-array-bounds.cc: Likewise.
* gimple-ssa-warn-restrict.cc: Likewise.
gcc/testsuite/ChangeLog:
* pr107787.c: New test.
gcc/c-family/ChangeLog:
* c-common.cc (warn_array_bounds): Use OPT_Warray_bounds_
instead of OPT_Warray_bounds.
---
gcc/builtins.cc | 6 +++---
gcc/c-family/c-common.cc| 4 ++--
gcc/common.opt | 2 +-
gcc/diagnostic-spec.cc | 1 -
gcc/gimple-array-bounds.cc | 38 -
gcc/gimple-ssa-warn-restrict.cc | 2 +-
gcc/testsuite/gcc.dg/pr107787.c | 13 +++
7 files changed, 39 insertions(+), 27 deletions(-)
create mode 100644 gcc/testsuite/gcc.dg/pr107787.c
diff --git a/gcc/builtins.cc b/gcc/builtins.cc
index 4dc1ca672b2..02c4fefa86f 100644
--- a/gcc/builtins.cc
+++ b/gcc/builtins.cc
@@ -696,14 +696,14 @@ c_strlen (tree arg, int only_value, c_strlen_data *data,
unsigned eltsize)
{
/* Suppress multiple warnings for propagated constant strings. */
if (only_value != 2
- && !warning_suppressed_p (arg, OPT_Warray_bounds)
- && warning_at (loc, OPT_Warray_bounds,
+ && !warning_suppressed_p (arg, OPT_Warray_bounds_)
+ && warning_at (loc, OPT_Warray_bounds_,
"offset %qwi outside bounds of constant string",
eltoff))
{
if (decl)
inform (DECL_SOURCE_LOCATION (decl), "%qE declared here", decl);
- suppress_warning (arg, OPT_Warray_bounds);
+ suppress_warning (arg, OPT_Warray_bounds_);
}
return NULL_TREE;
}
diff --git a/gcc/c-family/c-common.cc b/gcc/c-family/c-common.cc
index 6f1f21bc4c1..b0da6886ccf 100644
--- a/gcc/c-family/c-common.cc
+++ b/gcc/c-family/c-common.cc
@@ -6811,7 +6811,7 @@ fold_offsetof (tree expr, tree type, enum tree_code ctx)
definition thereof. */
if (TREE_CODE (v) == ARRAY_REF
|| TREE_CODE (v) == COMPONENT_REF)
- warning (OPT_Warray_bounds,
+ warning (OPT_Warray_bounds_,
"index %E denotes an offset "
"greater than size of %qT",
t, TREE_TYPE (TREE_OPERAND (expr, 0)));
@@ -8534,7 +8534,7 @@ convert_vector_to_array_for_subscript (location_t loc,
if (TREE_CODE (index) == INTEGER_CST)
if (!tree_fits_uhwi_p (index)
|| maybe_ge (tree_to_uhwi (index), TYPE_VECTOR_SUBPARTS (type)))
- warning_at (loc, OPT_Warray_bounds, "index value is out of bound");
+ warning_at (loc, OPT_Warray_bounds_, "index value is out of bound");
/* We are building an ARRAY_REF so mark the vector as addressable
to not run into the gimplifiers premature setting of DECL_GIMPLE_REG_P
diff --git a/gcc/common.opt b/gcc/common.opt
index 26e9d1cc4e7..e475d6e56eb 100644
--- a/gcc/common.opt
+++ b/gcc/common.opt
@@ -539,7 +539,7 @@ Common Var(warn_aggressive_loop_optimizations) Init(1)
Warning
Warn if a loop with constant number of iterations triggers undefined behavior.
Warray-bounds
-Common Var(warn_array_bounds) Warning
+Common Alias(Warray-bounds=, 1, 0) Warning
Warn if an array is accessed out of bounds.
Warray-bounds=
diff --git a/gcc/diagnostic-spec.cc b/gcc/diagnostic-spec.cc
index aece89619e7..7a03fc493e6 100644
--- a/gcc/diagnostic-spec.cc
+++ b/gcc/diagnostic-spec.cc
@@ -79,7 +79,6 @@ nowarn_spec_t::nowarn_spec_t (opt_code opt)
break;
/* Access warning group. */
-case OPT_Warray_bounds:
case OPT_Warray_bounds_:
case OPT_Wformat_overflow_:
case OPT_Wfo
[PATCH] Make Warray-bounds alias to Warray-bounds= [PR107787]
From 51559e862d191a1f51cc9af11f0d9be5fbc0b43c Mon Sep 17 00:00:00 2001
From: Iskander Shakirzyanov
Date: Wed, 23 Nov 2022 12:26:47 +
Subject: [PATCH] Make Warray-bounds alias to Warray-bounds= [PR107787]
PR driver/107787
gcc/ChangeLog:
* common.opt (Warray-bounds): Turn into alias to
-Warray-bounds=1.
* builtins.cc (warn_array_bounds): Use OPT_Warray_bounds_
instead of OPT_Warray_bounds.
* diagnostic-spec.cc: Likewise.
* gimple-array-bounds.cc: Likewise.
* gimple-ssa-warn-restrict.cc: Likewise.
gcc/testsuite/ChangeLog:
* pr107787.c: New test.
gcc/c-family/ChangeLog:
* c-common.cc (warn_array_bounds): Use OPT_Warray_bounds_
instead of OPT_Warray_bounds.
---
gcc/builtins.cc | 6 +++---
gcc/c-family/c-common.cc| 4 ++--
gcc/common.opt | 2 +-
gcc/diagnostic-spec.cc | 1 -
gcc/gimple-array-bounds.cc | 38 -
gcc/gimple-ssa-warn-restrict.cc | 2 +-
gcc/testsuite/gcc.dg/pr107787.c | 13 +++
7 files changed, 39 insertions(+), 27 deletions(-)
create mode 100644 gcc/testsuite/gcc.dg/pr107787.c
diff --git a/gcc/builtins.cc b/gcc/builtins.cc
index 4dc1ca672b2..02c4fefa86f 100644
--- a/gcc/builtins.cc
+++ b/gcc/builtins.cc
@@ -696,14 +696,14 @@ c_strlen (tree arg, int only_value, c_strlen_data *data,
unsigned eltsize)
{
/* Suppress multiple warnings for propagated constant strings. */
if (only_value != 2
- && !warning_suppressed_p (arg, OPT_Warray_bounds)
- && warning_at (loc, OPT_Warray_bounds,
+ && !warning_suppressed_p (arg, OPT_Warray_bounds_)
+ && warning_at (loc, OPT_Warray_bounds_,
"offset %qwi outside bounds of constant string",
eltoff))
{
if (decl)
inform (DECL_SOURCE_LOCATION (decl), "%qE declared here", decl);
- suppress_warning (arg, OPT_Warray_bounds);
+ suppress_warning (arg, OPT_Warray_bounds_);
}
return NULL_TREE;
}
diff --git a/gcc/c-family/c-common.cc b/gcc/c-family/c-common.cc
index 6f1f21bc4c1..b0da6886ccf 100644
--- a/gcc/c-family/c-common.cc
+++ b/gcc/c-family/c-common.cc
@@ -6811,7 +6811,7 @@ fold_offsetof (tree expr, tree type, enum tree_code ctx)
definition thereof. */
if (TREE_CODE (v) == ARRAY_REF
|| TREE_CODE (v) == COMPONENT_REF)
- warning (OPT_Warray_bounds,
+ warning (OPT_Warray_bounds_,
"index %E denotes an offset "
"greater than size of %qT",
t, TREE_TYPE (TREE_OPERAND (expr, 0)));
@@ -8534,7 +8534,7 @@ convert_vector_to_array_for_subscript (location_t loc,
if (TREE_CODE (index) == INTEGER_CST)
if (!tree_fits_uhwi_p (index)
|| maybe_ge (tree_to_uhwi (index), TYPE_VECTOR_SUBPARTS (type)))
- warning_at (loc, OPT_Warray_bounds, "index value is out of bound");
+ warning_at (loc, OPT_Warray_bounds_, "index value is out of bound");
/* We are building an ARRAY_REF so mark the vector as addressable
to not run into the gimplifiers premature setting of DECL_GIMPLE_REG_P
diff --git a/gcc/common.opt b/gcc/common.opt
index 26e9d1cc4e7..e475d6e56eb 100644
--- a/gcc/common.opt
+++ b/gcc/common.opt
@@ -539,7 +539,7 @@ Common Var(warn_aggressive_loop_optimizations) Init(1)
Warning
Warn if a loop with constant number of iterations triggers undefined behavior.
Warray-bounds
-Common Var(warn_array_bounds) Warning
+Common Alias(Warray-bounds=, 1, 0) Warning
Warn if an array is accessed out of bounds.
Warray-bounds=
diff --git a/gcc/diagnostic-spec.cc b/gcc/diagnostic-spec.cc
index aece89619e7..7a03fc493e6 100644
--- a/gcc/diagnostic-spec.cc
+++ b/gcc/diagnostic-spec.cc
@@ -79,7 +79,6 @@ nowarn_spec_t::nowarn_spec_t (opt_code opt)
break;
/* Access warning group. */
-case OPT_Warray_bounds:
case OPT_Warray_bounds_:
case OPT_Wformat_overflow_:
case OPT_Wformat_truncation_:
diff --git a/gcc/gimple-array-bounds.cc b/gcc/gimple-array-bounds.cc
index fbf448e045d..7af85b86f75 100644
--- a/gcc/gimple-array-bounds.cc
+++ b/gcc/gimple-array-bounds.cc
@@ -182,7 +182,7 @@ bool
array_bounds_checker::check_array_ref (location_t location, tree ref,
gimple *stmt, bool ignore_off_by_one)
{
- if (warning_suppressed_p (ref, OPT_Warray_bounds))
+ if (warning_suppressed_p (ref, OPT_Warray_bounds_))
/* Return true to have the caller prevent warnings for enclosing
refs. */
return true;
@@ -287,7 +287,7 @@ array_bounds_checker::check_array_ref (location_t location,
tree ref,
/* Empty array. */
if (up_bound &&
