You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
51 lines
1.4 KiB
51 lines
1.4 KiB
2016-02-04 Jakub Jelinek <jakub@redhat.com> |
|
|
|
Backported from mainline |
|
2016-02-03 Jakub Jelinek <jakub@redhat.com> |
|
|
|
PR target/69644 |
|
* config/rs6000/rs6000.c (rs6000_expand_atomic_compare_and_swap): |
|
Force oldval into register if it does not satisfy reg_or_short_operand |
|
predicate. Fix up formatting. |
|
|
|
* gcc.dg/pr69644.c: New test. |
|
|
|
--- gcc/config/rs6000/rs6000.c |
|
+++ gcc/config/rs6000/rs6000.c |
|
@@ -20263,6 +20263,9 @@ rs6000_expand_atomic_compare_and_swap (rtx operands[]) |
|
else if (reg_overlap_mentioned_p (retval, oldval)) |
|
oldval = copy_to_reg (oldval); |
|
|
|
+ if (mode != TImode && !reg_or_short_operand (oldval, mode)) |
|
+ oldval = copy_to_mode_reg (mode, oldval); |
|
+ |
|
mem = rs6000_pre_atomic_barrier (mem, mod_s); |
|
|
|
label1 = NULL_RTX; |
|
@@ -20277,10 +20280,8 @@ rs6000_expand_atomic_compare_and_swap (rtx operands[]) |
|
|
|
x = retval; |
|
if (mask) |
|
- { |
|
- x = expand_simple_binop (SImode, AND, retval, mask, |
|
- NULL_RTX, 1, OPTAB_LIB_WIDEN); |
|
- } |
|
+ x = expand_simple_binop (SImode, AND, retval, mask, |
|
+ NULL_RTX, 1, OPTAB_LIB_WIDEN); |
|
|
|
cond = gen_reg_rtx (CCmode); |
|
/* If we have TImode, synthesize a comparison. */ |
|
--- /dev/null |
|
+++ gcc/testsuite/gcc.dg/pr69644.c |
|
@@ -0,0 +1,11 @@ |
|
+/* PR target/69644 */ |
|
+/* { dg-do compile } */ |
|
+ |
|
+int |
|
+main () |
|
+{ |
|
+ unsigned short x = 0x8000; |
|
+ if (!__sync_bool_compare_and_swap (&x, 0x8000, 0) || x) |
|
+ __builtin_abort (); |
|
+ return 0; |
|
+}
|
|
|