diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2014-12-06 00:00:09 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2014-12-06 00:00:09 +0100 |
| commit | 06dd2aceb1855a33008066e285db77e28bbffa16 (patch) | |
| tree | a6aec67162141abb0a0ec3158b81ddd7c15b82fe | |
| parent | 40da08e0dd91017678b20cb1db2cb529f64d33df (diff) | |
| download | gcc-06dd2aceb1855a33008066e285db77e28bbffa16.zip gcc-06dd2aceb1855a33008066e285db77e28bbffa16.tar.gz gcc-06dd2aceb1855a33008066e285db77e28bbffa16.tar.bz2 | |
re PR sanitizer/64170 (ICE compiling Linux Kernel drivers/media/rc/imon.c in imon_incoming_packet)
PR sanitizer/64170
* sanopt.c (maybe_optimize_asan_check_ifn): If base_checks is
non-NULL, call maybe_get_dominating_check on it even if g is
non-NULL.
* gcc.dg/asan/pr64170.c: New test.
From-SVN: r218440
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/sanopt.c | 7 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/asan/pr64170.c | 17 |
4 files changed, 33 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 0dcf649..f9fba3e 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2014-12-05 Jakub Jelinek <jakub@redhat.com> + + PR sanitizer/64170 + * sanopt.c (maybe_optimize_asan_check_ifn): If base_checks is + non-NULL, call maybe_get_dominating_check on it even if g is + non-NULL. + 2014-12-05 Jeff Law <law@redhat.com> * doc/md.texi: Note problems using function calls to determine diff --git a/gcc/sanopt.c b/gcc/sanopt.c index e0d3a85..ce9fbcf 100644 --- a/gcc/sanopt.c +++ b/gcc/sanopt.c @@ -408,12 +408,13 @@ maybe_optimize_asan_check_ifn (struct sanopt_ctx *ctx, gimple stmt) } gimple g = maybe_get_dominating_check (*ptr_checks); + gimple g2 = NULL; - if (!g && base_checks) + if (base_checks) /* Try with base address as well. */ - g = maybe_get_dominating_check (*base_checks); + g2 = maybe_get_dominating_check (*base_checks); - if (!g) + if (g == NULL && g2 == NULL) { /* For this PTR we don't have any ASAN_CHECK stmts recorded, so there's nothing to optimize yet. */ diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index dcef9d2..b52905e 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2014-12-05 Jakub Jelinek <jakub@redhat.com> + + PR sanitizer/64170 + * gcc.dg/asan/pr64170.c: New test. + 2014-12-05 Michael Meissner <meissner@linux.vnet.ibm.com> PR target/53199 diff --git a/gcc/testsuite/gcc.dg/asan/pr64170.c b/gcc/testsuite/gcc.dg/asan/pr64170.c new file mode 100644 index 0000000..c4edcaa --- /dev/null +++ b/gcc/testsuite/gcc.dg/asan/pr64170.c @@ -0,0 +1,17 @@ +/* PR sanitizer/64170 */ +/* { dg-do compile } */ +/* { dg-options "-fsanitize=address,null" } */ + +int a, *b, c; +void bar (int); + +void +foo (void) +{ + char *d = (char *) b; + if (d[0] && d[1]) + return; + if (c) + a = *(int *) d; + bar (*(int *) d); +} |