diff options
| author | Jeff Law <law@redhat.com> | 2016-11-21 16:24:13 -0700 |
|---|---|---|
| committer | Jeff Law <law@gcc.gnu.org> | 2016-11-21 16:24:13 -0700 |
| commit | 3ca23cdbf89009deb2da798e1db5b7b1d62df1e2 (patch) | |
| tree | 2923d666e7f58a2e7174d0c947ce525fa254e71f /gcc | |
| parent | d8fc036893ff96464d5dd5767a97348a9a4f327c (diff) | |
| download | gcc-3ca23cdbf89009deb2da798e1db5b7b1d62df1e2.zip gcc-3ca23cdbf89009deb2da798e1db5b7b1d62df1e2.tar.gz gcc-3ca23cdbf89009deb2da798e1db5b7b1d62df1e2.tar.bz2 | |
re PR target/68538 (ICE in gen_reg_rtx, at emit-rtl.c:1027 when cross-compiling for cris-linux-gnu target)
PR target/68538
* config/cris/cris.md: Don't call copy_to_mode_reg unless
can_create_pseudo_p is true.
PR target/68538
* gcc.c-torture/compile/pr68538.c: New test.
From-SVN: r242682
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/config/cris/cris.md | 3 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.c-torture/compile/pr68538.c | 52 |
4 files changed, 65 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 41772a0..1f2f8ab 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2016-11-21 Jeff Law <law@redhat.com> + + PR target/68538 + * config/cris/cris.md: Don't call copy_to_mode_reg unless + can_create_pseudo_p is true. + 2016-11-21 Segher Boessenkool <segher@kernel.crashing.org> PR target/68803 diff --git a/gcc/config/cris/cris.md b/gcc/config/cris/cris.md index 59a3862..13279b5 100644 --- a/gcc/config/cris/cris.md +++ b/gcc/config/cris/cris.md @@ -499,7 +499,8 @@ { if (MEM_P (operands[0]) && operands[1] != const0_rtx - && (!TARGET_V32 || (!REG_P (operands[1]) && can_create_pseudo_p ()))) + && can_create_pseudo_p () + && (!TARGET_V32 || !REG_P (operands[1]))) operands[1] = copy_to_mode_reg (DImode, operands[1]); /* Some other ports (as of 2001-09-10 for example mcore and romp) also diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index cef6a27..e707841 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2016-11-21 Jeff Law <law@redhat.com> + + PR target/68538 + * gcc.c-torture/compile/pr68538.c: New test. + 2016-11-21 Michael Meissner <meissner@linux.vnet.ibm.com> * gcc.target/powerpc/ppc-round2.c: Allow XSCVDPSXWS and XSCVDPUXWS diff --git a/gcc/testsuite/gcc.c-torture/compile/pr68538.c b/gcc/testsuite/gcc.c-torture/compile/pr68538.c new file mode 100644 index 0000000..2822cdb --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/compile/pr68538.c @@ -0,0 +1,52 @@ +struct percpu_counter { + signed long long count; +}; +struct blkg_rwstat { + struct percpu_counter cpu_cnt[4]; +}; +struct cfq_group { + struct blkg_rwstat service_time; +}; +struct cfq_queue { + struct cfq_group *group; +}; +struct request { + struct cfq_queue *active_queue; + unsigned long long cmd_flags; + void *priv; +}; +static void blkg_rwstat_add(struct blkg_rwstat *rwstat, int rw, unsigned long long val) +{ + struct percpu_counter *cnt; + if (rw & 1) + cnt = &rwstat->cpu_cnt[1]; + else + cnt = &rwstat->cpu_cnt[0]; + cnt->count += val; + if (rw & 2) + cnt = &rwstat->cpu_cnt[2]; + else + cnt = &rwstat->cpu_cnt[3]; + cnt->count += val; +} +extern unsigned long long rq_start_time_ns(void); +extern unsigned long long rq_io_start_time_ns(void); +extern int rq_is_sync(void); +extern void cfq_arm_slice_timer(void); +void cfq_completed_request(struct request *rq) +{ + struct cfq_queue *queue = rq->priv; + int sync = rq_is_sync(); + struct cfq_group *group = queue->group; + long long start_time = rq_start_time_ns(); + long long io_start_time = rq_io_start_time_ns(); + int rw = rq->cmd_flags; + + if (io_start_time < 1) + blkg_rwstat_add(&group->service_time, rw, 1 - io_start_time); + blkg_rwstat_add(0, rw, io_start_time - start_time); + + if (rq->active_queue == queue && sync) + cfq_arm_slice_timer(); +} + |