From patchwork Wed Nov 23 13:29:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iskander Shakirzyanov X-Patchwork-Id: 61029 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C7AFB3853D7D for ; Wed, 23 Nov 2022 13:30:29 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C7AFB3853D7D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1669210229; bh=hQ8T4Rifcru8g/kpP+TqWJThCJQg2e/B9aGwGeS0CCw=; h=Subject:Date:To:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=hsb2oWNkJsrh4yozAwMGvkBeLmPyk8KdpnlWXFveLL9DvzcGVgnMEE6NbVW6gnOJv UCs+NEzyxilIjd+Iz01HfKii1rYsYXkdwolgbVxdsaUelzInWe4qARd09WKVg7wZTP WQ6y+Mv3/NKFGhTY3vy5wT7lsHnTJCgF4X1y8lcE= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail.ispras.ru (mail.ispras.ru [83.149.199.84]) by sourceware.org (Postfix) with ESMTPS id A409D3854574 for ; Wed, 23 Nov 2022 13:29:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org A409D3854574 Received: from smtpclient.apple (unknown [83.149.199.65]) by mail.ispras.ru (Postfix) with ESMTPSA id BAC04419E9F5 for ; Wed, 23 Nov 2022 13:29:46 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 mail.ispras.ru BAC04419E9F5 Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3696.120.41.1.1\)) Subject: [PATCH] Make Warray-bounds alias to Warray-bounds= [PR107787] Message-Id: <9795E6AA-E646-4134-AABE-23F530F5219E@ispras.ru> Date: Wed, 23 Nov 2022 16:29:46 +0300 To: gcc-patches@gcc.gnu.org X-Mailer: Apple Mail (2.3696.120.41.1.1) X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00, BODY_8BITS, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: =?utf-8?b?0JjRgdC60LDQvdC00LXRgCDQqNCw0LrQuNGA0LfRj9C90L7QsiB2aWEgR2Nj?= =?utf-8?b?LXBhdGNoZXM=?= Reply-To: =?utf-8?b?0JjRgdC60LDQvdC00LXRgCDQqNCw0LrQuNGA0LfRj9C90L7Qsg==?= Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" 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 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 && tree_int_cst_equal (low_bound, up_bound_p1)) - warned = warning_at (location, OPT_Warray_bounds, + warned = warning_at (location, OPT_Warray_bounds_, "array subscript %E is outside array bounds of %qT", low_sub, artype); @@ -313,7 +313,7 @@ array_bounds_checker::check_array_ref (location_t location, tree ref, : tree_int_cst_le (up_bound, up_sub)) && TREE_CODE (low_sub) == INTEGER_CST && tree_int_cst_le (low_sub, low_bound)) - warned = warning_at (location, OPT_Warray_bounds, + warned = warning_at (location, OPT_Warray_bounds_, "array subscript [%E, %E] is outside " "array bounds of %qT", low_sub, up_sub, artype); @@ -323,12 +323,12 @@ array_bounds_checker::check_array_ref (location_t location, tree ref, && (ignore_off_by_one ? !tree_int_cst_le (up_sub, up_bound_p1) : !tree_int_cst_le (up_sub, up_bound))) - warned = warning_at (location, OPT_Warray_bounds, + warned = warning_at (location, OPT_Warray_bounds_, "array subscript %E is above array bounds of %qT", up_sub, artype); else if (TREE_CODE (low_sub) == INTEGER_CST && tree_int_cst_lt (low_sub, low_bound)) - warned = warning_at (location, OPT_Warray_bounds, + warned = warning_at (location, OPT_Warray_bounds_, "array subscript %E is below array bounds of %qT", low_sub, artype); @@ -353,7 +353,7 @@ array_bounds_checker::check_array_ref (location_t location, tree ref, /* Avoid more warnings when checking more significant subscripts of the same expression. */ ref = TREE_OPERAND (ref, 0); - suppress_warning (ref, OPT_Warray_bounds); + suppress_warning (ref, OPT_Warray_bounds_); if (decl) ref = decl; @@ -393,7 +393,7 @@ bool array_bounds_checker::check_mem_ref (location_t location, tree ref, bool ignore_off_by_one) { - if (warning_suppressed_p (ref, OPT_Warray_bounds)) + if (warning_suppressed_p (ref, OPT_Warray_bounds_)) return false; /* The statement used to allocate the array or null. */ @@ -493,12 +493,12 @@ array_bounds_checker::check_mem_ref (location_t location, tree ref, if (lboob) { if (offrange[0] == offrange[1]) - warned = warning_at (location, OPT_Warray_bounds, + warned = warning_at (location, OPT_Warray_bounds_, "array subscript %wi is outside array bounds " "of %qT", offrange[0].to_shwi (), reftype); else - warned = warning_at (location, OPT_Warray_bounds, + warned = warning_at (location, OPT_Warray_bounds_, "array subscript [%wi, %wi] is outside " "array bounds of %qT", offrange[0].to_shwi (), @@ -513,7 +513,7 @@ array_bounds_checker::check_mem_ref (location_t location, tree ref, backtype = build_array_type_nelts (unsigned_char_type_node, aref.sizrng[1].to_uhwi ()); - warned = warning_at (location, OPT_Warray_bounds, + warned = warning_at (location, OPT_Warray_bounds_, "array subscript %<%T[%wi]%> is partly " "outside array bounds of %qT", axstype, offrange[0].to_shwi (), backtype); @@ -523,7 +523,7 @@ array_bounds_checker::check_mem_ref (location_t location, tree ref, { /* TODO: Determine the access from the statement and use it. */ aref.inform_access (access_none); - suppress_warning (ref, OPT_Warray_bounds); + suppress_warning (ref, OPT_Warray_bounds_); return true; } @@ -536,11 +536,11 @@ array_bounds_checker::check_mem_ref (location_t location, tree ref, { HOST_WIDE_INT tmpidx = (aref.offmax[i] / eltsize).to_shwi (); - if (warning_at (location, OPT_Warray_bounds, + if (warning_at (location, OPT_Warray_bounds_, "intermediate array offset %wi is outside array bounds " "of %qT", tmpidx, reftype)) { - suppress_warning (ref, OPT_Warray_bounds); + suppress_warning (ref, OPT_Warray_bounds_); return true; } } @@ -572,7 +572,7 @@ array_bounds_checker::check_addr_expr (location_t location, tree t, warned = check_mem_ref (location, t, ignore_off_by_one); if (warned) - suppress_warning (t, OPT_Warray_bounds); + suppress_warning (t, OPT_Warray_bounds_); t = TREE_OPERAND (t, 0); } @@ -580,7 +580,7 @@ array_bounds_checker::check_addr_expr (location_t location, tree t, if (TREE_CODE (t) != MEM_REF || TREE_CODE (TREE_OPERAND (t, 0)) != ADDR_EXPR - || warning_suppressed_p (t, OPT_Warray_bounds)) + || warning_suppressed_p (t, OPT_Warray_bounds_)) return; tree tem = TREE_OPERAND (TREE_OPERAND (t, 0), 0); @@ -615,7 +615,7 @@ array_bounds_checker::check_addr_expr (location_t location, tree t, dump_generic_expr (MSG_NOTE, TDF_SLIM, t); fprintf (dump_file, "\n"); } - warned = warning_at (location, OPT_Warray_bounds, + warned = warning_at (location, OPT_Warray_bounds_, "array subscript %wi is below " "array bounds of %qT", idx.to_shwi (), TREE_TYPE (tem)); @@ -629,7 +629,7 @@ array_bounds_checker::check_addr_expr (location_t location, tree t, dump_generic_expr (MSG_NOTE, TDF_SLIM, t); fprintf (dump_file, "\n"); } - warned = warning_at (location, OPT_Warray_bounds, + warned = warning_at (location, OPT_Warray_bounds_, "array subscript %wu is above " "array bounds of %qT", idx.to_uhwi (), TREE_TYPE (tem)); @@ -640,7 +640,7 @@ array_bounds_checker::check_addr_expr (location_t location, tree t, if (DECL_P (t)) inform (DECL_SOURCE_LOCATION (t), "while referencing %qD", t); - suppress_warning (t, OPT_Warray_bounds); + suppress_warning (t, OPT_Warray_bounds_); } } @@ -740,7 +740,7 @@ array_bounds_checker::check_array_bounds (tree *tp, int *walk_subtree, /* Propagate the no-warning bit to the outer statement to avoid also issuing -Wstringop-overflow/-overread for the out-of-bounds accesses. */ if (warned) - suppress_warning (wi->stmt, OPT_Warray_bounds); + suppress_warning (wi->stmt, OPT_Warray_bounds_); return NULL_TREE; } diff --git a/gcc/gimple-ssa-warn-restrict.cc b/gcc/gimple-ssa-warn-restrict.cc index 832456ba6fc..107ba278798 100644 --- a/gcc/gimple-ssa-warn-restrict.cc +++ b/gcc/gimple-ssa-warn-restrict.cc @@ -1734,7 +1734,7 @@ maybe_diag_access_bounds (gimple *call, tree func, int strict, if (!oobref) return no_warning; - const opt_code opt = OPT_Warray_bounds; + const opt_code opt = OPT_Warray_bounds_; /* Return true without issuing a warning. */ if (!do_warn) return opt; diff --git a/gcc/testsuite/gcc.dg/pr107787.c b/gcc/testsuite/gcc.dg/pr107787.c new file mode 100644 index 00000000000..79112691b63 --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr107787.c @@ -0,0 +1,13 @@ +/* PR driver/107787 */ +/* { dg-do compile } */ +/* { dg-options "-O2 -Werror=array-bounds=1" } */ +/* { dg-message "some warnings being treated as errors" "" {target "*-*-*"} 0 } */ + +int a[10]; /* { dg-note "while referencing" } */ + +int* f(void) { + + a[-1] = 0; /* { dg-error "is below array bounds" } */ + + return a; +}