diff options
| author | Alessandro Fanfarillo <fanfarillo.gcc@gmail.com> | 2014-09-20 08:14:08 -0600 |
|---|---|---|
| committer | Tobias Burnus <burnus@gcc.gnu.org> | 2014-09-20 16:14:08 +0200 |
| commit | b2c298ab89d61ab36a68c3d9b694dac248532257 (patch) | |
| tree | 453140ed17ea5f6b6caafee9d4c370f9127fa649 | |
| parent | 1cc0e19328554e88fd56ce2b0c181737a2d50ccf (diff) | |
| download | gcc-b2c298ab89d61ab36a68c3d9b694dac248532257.zip gcc-b2c298ab89d61ab36a68c3d9b694dac248532257.tar.gz gcc-b2c298ab89d61ab36a68c3d9b694dac248532257.tar.bz2 | |
trans-intrinsic.c (conv_intrinsic_atomic_op): Fix issue with generating temporary for value argument.
2014-09-20 Alessandro Fanfarillo <fanfarillo.gcc@gmail.com>
Tobias Burnus <burnus@net-b.de>
gcc/fortran
* trans-intrinsic.c (conv_intrinsic_atomic_op): Fix issue with
generating temporary for value argument.
gcc/testsuite/
* gfortran.dg/coarray_atomic_5.f90: New
Co-Authored-By: Tobias Burnus <burnus@net-b.de>
From-SVN: r215421
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/trans-intrinsic.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/coarray_atomic_5.f90 | 26 |
4 files changed, 38 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index a96cf42..389abf3 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2014-09-20 Alessandro Fanfarillo <fanfarillo.gcc@gmail.com> + Tobias Burnus <burnus@net-b.de> + + * trans-intrinsic.c (conv_intrinsic_atomic_op): Fix issue with + generating temporary for value argument. + 2014-09-20 Joost VandeVondele <vondele@gcc.gnu.org> * trans-expr.c (gfc_reset_vptr): Fix comment whitespace. diff --git a/gcc/fortran/trans-intrinsic.c b/gcc/fortran/trans-intrinsic.c index 0a83ad0..5507946 100644 --- a/gcc/fortran/trans-intrinsic.c +++ b/gcc/fortran/trans-intrinsic.c @@ -8396,7 +8396,7 @@ conv_intrinsic_atomic_op (gfc_code *code) else image_index = integer_zero_node; - if (TREE_TYPE (TREE_TYPE (atom)) != TREE_TYPE (TREE_TYPE (value))) + if (!POINTER_TYPE_P (TREE_TYPE (value))) { tmp = gfc_create_var (TREE_TYPE (TREE_TYPE (atom)), "value"); gfc_add_modify (&block, tmp, fold_convert (TREE_TYPE (tmp), value)); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 130c6a7..0ec7ad7 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2014-09-20 Alessandro Fanfarillo <fanfarillo.gcc@gmail.com> + Tobias Burnus <burnus@net-b.de> + + * gfortran.dg/coarray_atomic_5.f90: New + 2014-09-19 Jan Hubicka <hubicka@ucw.cz> PR c++/61825 diff --git a/gcc/testsuite/gfortran.dg/coarray_atomic_5.f90 b/gcc/testsuite/gfortran.dg/coarray_atomic_5.f90 new file mode 100644 index 0000000..11d52ba --- /dev/null +++ b/gcc/testsuite/gfortran.dg/coarray_atomic_5.f90 @@ -0,0 +1,26 @@ +! { dg-do compile } +! { dg-options "-fdump-tree-original -fcoarray=lib" } +! +! Argument passing was wrong +! + +program atomic + use iso_fortran_env + implicit none + + integer :: me + integer(atomic_int_kind) :: atom[*] + me = this_image() + call atomic_define(atom[1],0) + sync all + call ATOMIC_ADD (atom[1], me) + if(me == 1) call atomic_ref(me,atom[1]) + sync all + write(*,*) me +end program + +! { dg-final { scan-tree-dump-times "value.. = 0;" 1 "original" } } +! { dg-final { scan-tree-dump-times "_gfortran_caf_atomic_define \\(caf_token.0, 0, 1, &value.., 0B, 1, 4\\);" 1 "original" } } +! { dg-final { scan-tree-dump-times "_gfortran_caf_atomic_op \\(1, caf_token.0, 0, 1, &me, 0B, 0B, 1, 4\\);" 1 "original" } } +! { dg-final { scan-tree-dump-times "_gfortran_caf_atomic_ref \\(caf_token.0, 0, 1, &me, 0B, 1, 4\\);" 1 "original" } } +! { dg-final { cleanup-tree-dump "original" } } |