diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2010-12-02 15:37:20 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2010-12-02 15:37:20 +0100 |
| commit | edaadf74d4cd2bc4f0ef72456a4a6df8a4502470 (patch) | |
| tree | 236b730968c457a7cee43f76f47f16b4b5f2cc97 | |
| parent | 4c698cf891a7d946b64d95ba89d6a0d255f40712 (diff) | |
| download | gcc-edaadf74d4cd2bc4f0ef72456a4a6df8a4502470.zip gcc-edaadf74d4cd2bc4f0ef72456a4a6df8a4502470.tar.gz gcc-edaadf74d4cd2bc4f0ef72456a4a6df8a4502470.tar.bz2 | |
re PR fortran/46753 (ICE: OpenMP - in extract_omp_for_data, at omp-low.c:335)
PR fortran/46753
* trans-openmp.c (gfc_trans_omp_do): Use build2_loc instead of
fold_build2_loc for OMP_FOR conditions.
* libgomp.fortran/pr46753.f90: New test.
From-SVN: r167372
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/trans-openmp.c | 15 | ||||
| -rw-r--r-- | libgomp/ChangeLog | 3 | ||||
| -rw-r--r-- | libgomp/testsuite/libgomp.fortran/pr46753.f90 | 17 |
4 files changed, 34 insertions, 7 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 8b761ec..8e6319b 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2010-12-02 Jakub Jelinek <jakub@redhat.com> + + PR fortran/46753 + * trans-openmp.c (gfc_trans_omp_do): Use build2_loc instead of + fold_build2_loc for OMP_FOR conditions. + 2010-11-30 Janne Blomqvist <jb@gcc.gnu.org> PR fortran/28105 diff --git a/gcc/fortran/trans-openmp.c b/gcc/fortran/trans-openmp.c index 6fe362b..a8c861e 100644 --- a/gcc/fortran/trans-openmp.c +++ b/gcc/fortran/trans-openmp.c @@ -1262,10 +1262,10 @@ gfc_trans_omp_do (gfc_code *code, stmtblock_t *pblock, if (simple) { TREE_VEC_ELT (init, i) = build2_v (MODIFY_EXPR, dovar, from); - TREE_VEC_ELT (cond, i) = fold_build2_loc (input_location, simple > 0 - ? LE_EXPR : GE_EXPR, - boolean_type_node, dovar, - to); + /* The condition should not be folded. */ + TREE_VEC_ELT (cond, i) = build2_loc (input_location, simple > 0 + ? LE_EXPR : GE_EXPR, + boolean_type_node, dovar, to); TREE_VEC_ELT (incr, i) = fold_build2_loc (input_location, PLUS_EXPR, type, dovar, step); TREE_VEC_ELT (incr, i) = fold_build2_loc (input_location, @@ -1290,9 +1290,10 @@ gfc_trans_omp_do (gfc_code *code, stmtblock_t *pblock, count = gfc_create_var (type, "count"); TREE_VEC_ELT (init, i) = build2_v (MODIFY_EXPR, count, build_int_cst (type, 0)); - TREE_VEC_ELT (cond, i) = fold_build2_loc (input_location, LT_EXPR, - boolean_type_node, - count, tmp); + /* The condition should not be folded. */ + TREE_VEC_ELT (cond, i) = build2_loc (input_location, LT_EXPR, + boolean_type_node, + count, tmp); TREE_VEC_ELT (incr, i) = fold_build2_loc (input_location, PLUS_EXPR, type, count, build_int_cst (type, 1)); diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index 4317202..f594717 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,5 +1,8 @@ 2010-12-02 Jakub Jelinek <jakub@redhat.com> + PR fortran/46753 + * libgomp.fortran/pr46753.f90: New test. + PR libgomp/43706 * env.c (initialize_env): Default to spin count 300000 instead of 20000000 if neither OMP_WAIT_POLICY nor GOMP_SPINCOUNT diff --git a/libgomp/testsuite/libgomp.fortran/pr46753.f90 b/libgomp/testsuite/libgomp.fortran/pr46753.f90 new file mode 100644 index 0000000..f4833ab --- /dev/null +++ b/libgomp/testsuite/libgomp.fortran/pr46753.f90 @@ -0,0 +1,17 @@ +! PR fortran/46753 +! { dg-do run } + + integer :: i, j + j = 0 +!$omp parallel do reduction(+:j) + do i = 2147483636, 2147483646 + j = j + 1 + end do + if (j.ne.11) call abort + j = 0 +!$omp parallel do reduction(+:j) + do i = -2147483637, -2147483647, -1 + j = j + 1 + end do + if (j.ne.11) call abort +end |