From 4c2708c580c18c704c0178b87f106828b0e13ae7 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Fri, 20 Jan 2012 20:39:48 +0100 Subject: [PATCH] re PR target/51915 (ICE in output_move_double) PR target/51915 * config/arm/arm.c (arm_count_output_move_double_insns): Call output_move_double on a copy of operands array. * gcc.target/arm/pr51915.c: New test. From-SVN: r183349 --- gcc/ChangeLog | 6 ++++++ gcc/config/arm/arm.c | 7 ++++++- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.target/arm/pr51915.c | 13 +++++++++++++ 4 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gcc.target/arm/pr51915.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 9b05b3bf91e4..7a15ad09e591 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2012-01-20 Jakub Jelinek + + PR target/51915 + * config/arm/arm.c (arm_count_output_move_double_insns): Call + output_move_double on a copy of operands array. + 2012-01-20 Cary Coutant Dodji Seketeli diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c index f6b3412521d4..8f1412a8a3cd 100644 --- a/gcc/config/arm/arm.c +++ b/gcc/config/arm/arm.c @@ -24664,7 +24664,12 @@ int arm_count_output_move_double_insns (rtx *operands) { int count; - output_move_double (operands, false, &count); + rtx ops[2]; + /* output_move_double may modify the operands array, so call it + here on a copy of the array. */ + ops[0] = operands[0]; + ops[1] = operands[1]; + output_move_double (ops, false, &count); return count; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 860f7a89b81f..61eb186ba72d 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2012-01-20 Jakub Jelinek + + PR target/51915 + * gcc.target/arm/pr51915.c: New test. + 2012-01-20 Cary Coutant Dodji Seketeli diff --git a/gcc/testsuite/gcc.target/arm/pr51915.c b/gcc/testsuite/gcc.target/arm/pr51915.c new file mode 100644 index 000000000000..81bc4ebd15d4 --- /dev/null +++ b/gcc/testsuite/gcc.target/arm/pr51915.c @@ -0,0 +1,13 @@ +/* PR target/51915 */ +/* { dg-do compile } */ +/* { dg-options "-march=armv7-a -mfloat-abi=hard -O2" } */ + +struct S { int s1; void *s2; }; +struct T { struct S t1; unsigned long long t2; }; +struct S *foo (unsigned long long); + +struct S * +bar (struct S *x) +{ + return foo (((struct T *) x)->t2); +} -- 2.47.3