diff options
author | abel <abel@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-03-31 14:16:18 +0000 |
---|---|---|
committer | abel <abel@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-03-31 14:16:18 +0000 |
commit | 562fc5137afbf494a8f99cc560f8c66450f315dd (patch) | |
tree | 1213367851290cd21dfdc99869264ab3a471ef87 | |
parent | 6c01cdade7b46e04edf08d47c48c1e0427ca959a (diff) |
Backport from mainline
2016-03-21 Andrey Belevantsev <abel@ispras.ru>
gcc/
PR rtl-optimization/69102
* sched-deps.c (sched_analyze_insn): Do not set last_args_size field
when we have a readonly dependency context.
testsuite/
PR rtl-optimization/69102
* gcc.c-torture/compile/pr69102.c: New test.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-5-branch@234625 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r-- | gcc/ChangeLog | 9 | ||||
-rw-r--r-- | gcc/sched-deps.c | 3 | ||||
-rw-r--r-- | gcc/testsuite/ChangeLog | 8 | ||||
-rw-r--r-- | gcc/testsuite/gcc.c-torture/compile/pr69102.c | 21 |
4 files changed, 40 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index e43085d13c3..3242b5ba1fd 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,6 +1,15 @@ 2016-03-31 Andrey Belevantsev <abel@ispras.ru> Backport from mainline + 2016-03-21 Andrey Belevantsev <abel@ispras.ru> + + PR rtl-optimization/69102 + * sched-deps.c (sched_analyze_insn): Do not set last_args_size field + when we have a readonly dependency context. + +2016-03-31 Andrey Belevantsev <abel@ispras.ru> + + Backport from mainline 2016-03-15 Andrey Belevantsev <abel@ispras.ru> PR rtl-optimization/69032 diff --git a/gcc/sched-deps.c b/gcc/sched-deps.c index baf193fe6c3..3256cb615bc 100644 --- a/gcc/sched-deps.c +++ b/gcc/sched-deps.c @@ -3529,7 +3529,8 @@ sched_analyze_insn (struct deps_desc *deps, rtx x, rtx_insn *insn) { if (deps->last_args_size) add_dependence (insn, deps->last_args_size, REG_DEP_OUTPUT); - deps->last_args_size = insn; + if (!deps->readonly) + deps->last_args_size = insn; } } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index b994ccc37d7..c99275eba62 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,6 +1,14 @@ 2016-03-31 Andrey Belevantsev <abel@ispras.ru> Backport from mainline + 2016-03-21 Andrey Belevantsev <abel@ispras.ru> + + PR rtl-optimization/69102 + * gcc.c-torture/compile/pr69102.c: New test. + +2016-03-31 Andrey Belevantsev <abel@ispras.ru> + + Backport from mainline 2016-03-15 Andrey Belevantsev <abel@ispras.ru> PR rtl-optimization/69032 diff --git a/gcc/testsuite/gcc.c-torture/compile/pr69102.c b/gcc/testsuite/gcc.c-torture/compile/pr69102.c new file mode 100644 index 00000000000..b1328cad974 --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/compile/pr69102.c @@ -0,0 +1,21 @@ +/* { dg-options "-Og -fPIC -fschedule-insns2 -fselective-scheduling2 -fno-tree-fre --param=max-sched-extend-regions-iters=10" } */ +void bar (unsigned int); + +void +foo (void) +{ + char buf[1] = { 3 }; + const char *p = buf; + const char **q = &p; + unsigned int ch; + switch (**q) + { + case 1: ch = 5; break; + case 2: ch = 4; break; + case 3: ch = 3; break; + case 4: ch = 2; break; + case 5: ch = 1; break; + default: ch = 0; break; + } + bar (ch); +} |