From: Aldy Hernandez <aldyh@redhat.com>
To: GCC patches <gcc-patches@gcc.gnu.org>,
Andrew MacLeod <amacleod@redhat.com>
Cc: Jeff Law <jeffreyalaw@gmail.com>, Martin Sebor <msebor@redhat.com>
Subject: Re: [PATCH 2/5] Convert Walloca pass to RANGE_QUERY(cfun).
Date: Tue, 25 May 2021 18:17:23 +0200 [thread overview]
Message-ID: <21132288-5510-3d08-79fa-3031158b5865@redhat.com> (raw)
In-Reply-To: <20210521113954.1148075-2-aldyh@redhat.com>
[-- Attachment #1: Type: text/plain, Size: 53 bytes --]
Adjustments per discussion.
OK pending tests?
Aldy
[-- Attachment #2: 0003-Convert-Walloca-pass-to-get_range_query.patch --]
[-- Type: text/x-patch, Size: 4724 bytes --]
From 97bedf7dc0a7860802461b5fd3e72b687076ae30 Mon Sep 17 00:00:00 2001
From: Aldy Hernandez <aldyh@redhat.com>
Date: Wed, 19 May 2021 18:27:47 +0200
Subject: [PATCH 3/5] Convert Walloca pass to get_range_query.
This patch converts the Walloca pass to use an on-demand ranger
accesible with get_range_query instead of having to create a ranger and pass
it around.
gcc/ChangeLog:
* gimple-ssa-warn-alloca.c (alloca_call_type): Use
get_range_query instead of query argument.
(pass_walloca::execute): Enable and disable global ranger.
---
gcc/gimple-ssa-warn-alloca.c | 10 ++++++----
gcc/testsuite/gcc.dg/Wstringop-overflow-55.c | 8 ++++----
gcc/testsuite/gcc.dg/pr80776-1.c | 4 +---
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/gcc/gimple-ssa-warn-alloca.c b/gcc/gimple-ssa-warn-alloca.c
index e9a24d4d1d0..72480f1d8cb 100644
--- a/gcc/gimple-ssa-warn-alloca.c
+++ b/gcc/gimple-ssa-warn-alloca.c
@@ -165,7 +165,7 @@ adjusted_warn_limit (bool idx)
// call was created by the gimplifier for a VLA.
static class alloca_type_and_limit
-alloca_call_type (range_query &query, gimple *stmt, bool is_vla)
+alloca_call_type (gimple *stmt, bool is_vla)
{
gcc_assert (gimple_alloca_call_p (stmt));
tree len = gimple_call_arg (stmt, 0);
@@ -217,7 +217,7 @@ alloca_call_type (range_query &query, gimple *stmt, bool is_vla)
int_range_max r;
if (warn_limit_specified_p (is_vla)
&& TREE_CODE (len) == SSA_NAME
- && query.range_of_expr (r, len, stmt)
+ && get_range_query (cfun)->range_of_expr (r, len, stmt)
&& !r.varying_p ())
{
// The invalid bits are anything outside of [0, MAX_SIZE].
@@ -256,7 +256,7 @@ in_loop_p (gimple *stmt)
unsigned int
pass_walloca::execute (function *fun)
{
- gimple_ranger ranger;
+ gimple_ranger *ranger = enable_ranger (fun);
basic_block bb;
FOR_EACH_BB_FN (bb, fun)
{
@@ -290,7 +290,7 @@ pass_walloca::execute (function *fun)
continue;
class alloca_type_and_limit t
- = alloca_call_type (ranger, stmt, is_vla);
+ = alloca_call_type (stmt, is_vla);
unsigned HOST_WIDE_INT adjusted_alloca_limit
= adjusted_warn_limit (false);
@@ -383,6 +383,8 @@ pass_walloca::execute (function *fun)
}
}
}
+ ranger->export_global_ranges ();
+ disable_ranger (fun);
return 0;
}
diff --git a/gcc/testsuite/gcc.dg/Wstringop-overflow-55.c b/gcc/testsuite/gcc.dg/Wstringop-overflow-55.c
index 25f5b82d9be..8df5cb629ae 100644
--- a/gcc/testsuite/gcc.dg/Wstringop-overflow-55.c
+++ b/gcc/testsuite/gcc.dg/Wstringop-overflow-55.c
@@ -66,7 +66,7 @@ void warn_ptrdiff_anti_range_add (ptrdiff_t i)
{
i |= 1;
- char ca5[5]; // { dg-message "at offset \\\[1, 5]" "pr?????" { xfail *-*-* } }
+ char ca5[5]; // { dg-message "at offset \\\[1, 5]" "pr?????" }
char *p0 = ca5; // offset
char *p1 = p0 + i; // 1-5
char *p2 = p1 + i; // 2-5
@@ -74,7 +74,7 @@ void warn_ptrdiff_anti_range_add (ptrdiff_t i)
char *p4 = p3 + i; // 4-5
char *p5 = p4 + i; // 5
- memset (p5, 0, 5); // { dg-warning "writing 5 bytes into a region of size 0" "pr?????" { xfail *-*-* } }
+ memset (p5, 0, 5); // { dg-warning "writing 5 bytes into a region of size" "pr?????" }
sink (p0, p1, p2, p3, p4, p5);
}
@@ -83,7 +83,7 @@ void warn_int_anti_range (int i)
{
i |= 1;
- char ca5[5]; // { dg-message "at offset \\\[1, 5]" "pr?????" { xfail *-*-* } }
+ char ca5[5]; // { dg-message "at offset \\\[1, 5]" "pr?????" }
char *p0 = ca5; // offset
char *p1 = p0 + i; // 1-5
char *p2 = p1 + i; // 2-5
@@ -91,7 +91,7 @@ void warn_int_anti_range (int i)
char *p4 = p3 + i; // 4-5
char *p5 = p4 + i; // 5
- memset (p5, 0, 5); // { dg-warning "writing 5 bytes into a region of size 0" "pr?????" { xfail *-*-* } }
+ memset (p5, 0, 5); // { dg-warning "writing 5 bytes into a region of size" "pr?????" }
sink (p0, p1, p2, p3, p4, p5);
}
diff --git a/gcc/testsuite/gcc.dg/pr80776-1.c b/gcc/testsuite/gcc.dg/pr80776-1.c
index af41c0c2ffa..f3a120b6744 100644
--- a/gcc/testsuite/gcc.dg/pr80776-1.c
+++ b/gcc/testsuite/gcc.dg/pr80776-1.c
@@ -17,7 +17,5 @@ Foo (void)
__builtin_unreachable ();
if (! (0 <= i && i <= 999999))
__builtin_unreachable ();
- /* The correctness bits for [E]VRP cannot handle chained conditionals
- when deciding to ignore a unreachable branch for setting SSA range info. */
- sprintf (number, "%d", i); /* { dg-bogus "writing" "" { xfail *-*-* } } */
+ sprintf (number, "%d", i); /* { dg-bogus "writing" "" } */
}
--
2.31.1
next prev parent reply other threads:[~2021-05-25 16:17 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-21 11:39 [PATCH 1/5] Common API for accessing global and on-demand ranges Aldy Hernandez
2021-05-21 11:39 ` [PATCH 2/5] Convert Walloca pass to RANGE_QUERY(cfun) Aldy Hernandez
2021-05-25 8:43 ` Richard Biener
2021-05-25 16:17 ` Aldy Hernandez [this message]
2021-05-25 16:28 ` Jeff Law
2021-05-25 17:28 ` Martin Sebor
2021-05-27 7:38 ` Christophe Lyon
2021-05-27 8:34 ` Aldy Hernandez
2021-05-21 11:39 ` [PATCH 3/5] Convert evrp " Aldy Hernandez
2021-05-25 16:18 ` Aldy Hernandez
2021-05-27 2:34 ` H.J. Lu
2021-05-21 11:39 ` [PATCH 4/5] Convert remaining passes to RANGE_QUERY Aldy Hernandez
2021-05-24 19:34 ` Martin Sebor
2021-05-25 8:47 ` Richard Biener
2021-05-25 9:15 ` Aldy Hernandez
2021-05-25 11:26 ` Aldy Hernandez
2021-05-25 8:48 ` Aldy Hernandez
2021-05-25 16:19 ` Aldy Hernandez
2021-05-21 11:39 ` [PATCH 5/5] Cleanup get_range_info Aldy Hernandez
2021-05-25 16:20 ` Aldy Hernandez
2021-05-24 16:09 ` [PATCH 1/5] Common API for accessing global and on-demand ranges Aldy Hernandez
2021-05-25 8:57 ` Richard Biener
2021-05-25 9:36 ` Aldy Hernandez
2021-05-25 9:46 ` Richard Biener
2021-05-25 10:53 ` Aldy Hernandez
2021-05-25 11:06 ` Richard Biener
2021-05-25 16:16 ` Aldy Hernandez
2021-05-26 13:40 ` Andrew MacLeod
2021-05-29 4:35 ` Jeff Law
2021-05-24 19:13 ` Martin Sebor
2021-05-25 7:06 ` Aldy Hernandez
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=21132288-5510-3d08-79fa-3031158b5865@redhat.com \
--to=aldyh@redhat.com \
--cc=amacleod@redhat.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=jeffreyalaw@gmail.com \
--cc=msebor@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).