diff options
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/omp-low.c | 4 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/gomp/pr48591.c | 22 | ||||
| -rw-r--r-- | libgomp/ChangeLog | 5 | ||||
| -rw-r--r-- | libgomp/testsuite/libgomp.c/pr48591.c | 22 |
6 files changed, 63 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 48bccd7a48b..a1f7b2fd232 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2011-04-13 Jakub Jelinek <jakub@redhat.com> + + PR middle-end/48591 + * omp-low.c (expand_omp_atomic_fetch_op): Return false if decl is + NULL. + (expand_omp_atomic_pipeline): Return false if cmpxchg is NULL. + 2011-04-13 Ramana Radhakrishnan <ramana.radhakrishnan@linaro.org> Backport from mainline: diff --git a/gcc/omp-low.c b/gcc/omp-low.c index c3f217818bc..5b0fdff17b7 100644 --- a/gcc/omp-low.c +++ b/gcc/omp-low.c @@ -5005,6 +5005,8 @@ expand_omp_atomic_fetch_op (basic_block load_bb, return false; decl = built_in_decls[base + index + 1]; + if (decl == NULL_TREE) + return false; itype = TREE_TYPE (TREE_TYPE (decl)); if (direct_optab_handler (optab, TYPE_MODE (itype)) == CODE_FOR_nothing) @@ -5056,6 +5058,8 @@ expand_omp_atomic_pipeline (basic_block load_bb, basic_block store_bb, edge e; cmpxchg = built_in_decls[BUILT_IN_VAL_COMPARE_AND_SWAP_N + index + 1]; + if (cmpxchg == NULL_TREE) + return false; type = TYPE_MAIN_VARIANT (TREE_TYPE (TREE_TYPE (addr))); itype = TREE_TYPE (TREE_TYPE (cmpxchg)); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 5d51df81851..258ffeafd00 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,8 @@ 2011-04-13 Jakub Jelinek <jakub@redhat.com> + PR middle-end/48591 + * gcc.dg/gomp/pr48591.c: New test. + PR c++/48570 * g++.dg/cpp0x/constexpr-wstring1.C: New test. * g++.dg/cpp0x/constexpr-wstring2.C: New test. diff --git a/gcc/testsuite/gcc.dg/gomp/pr48591.c b/gcc/testsuite/gcc.dg/gomp/pr48591.c new file mode 100644 index 00000000000..e6cb106d845 --- /dev/null +++ b/gcc/testsuite/gcc.dg/gomp/pr48591.c @@ -0,0 +1,22 @@ +/* PR middle-end/48591 */ +/* { dg-do compile { target i?86-*-* x86_64-*-* ia64-*-* } } */ +/* { dg-options "-fopenmp" } */ + +extern void abort (void); + +int +main () +{ + __float128 f = 0.0; + int i; + #pragma omp parallel for reduction(+:f) + for (i = 0; i < 128; i++) + f += 0.5Q; + if (f != 64.0Q) + abort (); + #pragma omp atomic + f += 8.5Q; + if (f != 72.5Q) + abort (); + return 0; +} diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index 3c64315572b..63b011a438a 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,8 @@ +2011-04-13 Jakub Jelinek <jakub@redhat.com> + + PR middle-end/48591 + * testsuite/libgomp.c/pr48591.c: New test. + 2011-03-28 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> Backport from mainline: diff --git a/libgomp/testsuite/libgomp.c/pr48591.c b/libgomp/testsuite/libgomp.c/pr48591.c new file mode 100644 index 00000000000..18dfd7f47be --- /dev/null +++ b/libgomp/testsuite/libgomp.c/pr48591.c @@ -0,0 +1,22 @@ +/* PR middle-end/48591 */ +/* { dg-do run { target i?86-*-linux* x86_64-*-linux* ia64-*-linux* } } */ +/* { dg-options "-fopenmp" } */ + +extern void abort (void); + +int +main () +{ + __float128 f = 0.0; + int i; + #pragma omp parallel for reduction(+:f) + for (i = 0; i < 128; i++) + f += 0.5Q; + if (f != 64.0Q) + abort (); + #pragma omp atomic + f += 8.5Q; + if (f != 72.5Q) + abort (); + return 0; +} |