diff options
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/gimple.c | 11 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/torture/pr67133.c | 34 |
4 files changed, 52 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index afade5d..9d12244 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2015-08-14 Marek Polacek <polacek@redhat.com> + + PR middle-end/67133 + * gimple.c (infer_nonnull_range_by_attribute): Check that the + nonnull argument position is not outside function arguments. + 2015-08-14 Matthew Wahab <matthew.wahab@arm.com> PR target/67143 diff --git a/gcc/gimple.c b/gcc/gimple.c index cca328a..1bfa8c7 100644 --- a/gcc/gimple.c +++ b/gcc/gimple.c @@ -2694,10 +2694,13 @@ infer_nonnull_range_by_attribute (gimple stmt, tree op) /* Now see if op appears in the nonnull list. */ for (tree t = TREE_VALUE (attrs); t; t = TREE_CHAIN (t)) { - int idx = TREE_INT_CST_LOW (TREE_VALUE (t)) - 1; - tree arg = gimple_call_arg (stmt, idx); - if (operand_equal_p (op, arg, 0)) - return true; + unsigned int idx = TREE_INT_CST_LOW (TREE_VALUE (t)) - 1; + if (idx < gimple_call_num_args (stmt)) + { + tree arg = gimple_call_arg (stmt, idx); + if (operand_equal_p (op, arg, 0)) + return true; + } } } } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 9a4cd14..383fb34 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2015-08-14 Marek Polacek <polacek@redhat.com> + + PR middle-end/67133 + * gcc.dg/torture/pr67133.c: New test. + 2015-08-14 Matthew Wahab <matthew.wahab@arm.com> Matthias Klose <doko@debian.org> diff --git a/gcc/testsuite/gcc.dg/torture/pr67133.c b/gcc/testsuite/gcc.dg/torture/pr67133.c new file mode 100644 index 0000000..4eb552e --- /dev/null +++ b/gcc/testsuite/gcc.dg/torture/pr67133.c @@ -0,0 +1,34 @@ +/* { dg-do compile } */ +/* { dg-additional-options "-fisolate-erroneous-paths-attribute" } */ + +int printf (const char *, ...); +int foo (int); + +int a, *b, c; + +static int +fn1 () +{ + if (a) + return (a = 0); + for (; a; ) + a = 0; + return 0; +} + +static int +fn2 (int p) +{ + fn1 (); + c = 0; + if (p) + printf ("%d", 0); + foo (b != &p); + return 0; +} + +void +fn3 () +{ + fn2 (0); +} |