From efc3527addeabd8efa2c3f174e3128db32a38129 Mon Sep 17 00:00:00 2001 From: Ben Elliston Date: Thu, 14 May 2009 06:52:00 +1000 Subject: [PATCH] re PR middle-end/40035 (ICE when cross-compiling with -Os) PR middle-end/40035 * dse.c (check_mem_read_rtx): Guard against width == -1. testsuite/ * gcc.c-torture/compile/pr40035.c: New test. From-SVN: r147498 --- gcc/ChangeLog | 6 ++++++ gcc/dse.c | 1 + gcc/testsuite/ChangeLog | 6 +++++- gcc/testsuite/gcc.c-torture/compile/pr40035.c | 20 +++++++++++++++++++ 4 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gcc.c-torture/compile/pr40035.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 1a3b594ee42..9e2e4b92609 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2009-05-13 Jakub Jelinek + Ben Elliston + + PR middle-end/40035 + * dse.c (check_mem_read_rtx): Guard against width == -1. + 2009-05-13 Michael Matz PR middle-end/39976 diff --git a/gcc/dse.c b/gcc/dse.c index 5ac898ca84a..534324d0f5b 100644 --- a/gcc/dse.c +++ b/gcc/dse.c @@ -2245,6 +2245,7 @@ check_mem_read_rtx (rtx *loc, void *data) if (store_info->rhs && store_info->group_id == -1 && store_info->cse_base == base + && width != -1 && offset >= store_info->begin && offset + width <= store_info->end && all_positions_needed_p (store_info, diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index acf6ca7ebf4..928c7f63a82 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2009-05-14 Ben Elliston + + PR middle-end/40035 + * gcc.c-torture/compile/pr40035.c: New test. + 2009-05-13 Kaveh R. Ghazi * gcc.target/i386/pr39543-2.c: Skip if ilp32 && pic. @@ -9,7 +14,6 @@ * gfortran.dg/c_kind_tests_2.f03: Ditto. * gfortran.dg/interop_params.f03: Ditto. - 2009-05-12 Jan Hubicka * gcc.dg/tree-ssa/loop-36.c: Reduce amount of iterations to 2 so unrolling diff --git a/gcc/testsuite/gcc.c-torture/compile/pr40035.c b/gcc/testsuite/gcc.c-torture/compile/pr40035.c new file mode 100644 index 00000000000..1bf1a7c4c41 --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/compile/pr40035.c @@ -0,0 +1,20 @@ +typedef __SIZE_TYPE__ size_t; +void *memmove (void *dest, const void *src, size_t count); +size_t strlen (const char *s); + +int +foo (char *param, char *val) +{ + if (val) + { + if (val == param + strlen (param) + 1) + val[-1] = '='; + else if (val == param + strlen (param) + 2) + { + val[-2] = '='; + memmove (val - 1, val, strlen (val) + 1); + val--; + } + } + return 0; +}