aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorAndre Vehreschild <vehre@gcc.gnu.org>2016-11-30 16:59:07 +0100
committerAndre Vehreschild <vehre@gcc.gnu.org>2016-11-30 16:59:07 +0100
commit8fb75185a2179c98b35eb1db773acfaa6c42d90b (patch)
treeebe00badd50927fac4232ca1a5b4e3fbd32a1865 /gcc
parentbdc5f9370cf1ee5b83cacc29fc737e458d173f70 (diff)
downloadgcc-8fb75185a2179c98b35eb1db773acfaa6c42d90b.zip
gcc-8fb75185a2179c98b35eb1db773acfaa6c42d90b.tar.gz
gcc-8fb75185a2179c98b35eb1db773acfaa6c42d90b.tar.bz2
single.c (_gfortran_caf_get_by_ref): Prevent compile time warning.
libgfortran/ChangeLog: 2016-11-30 Andre Vehreschild <vehre@gcc.gnu.org> * caf/single.c (_gfortran_caf_get_by_ref): Prevent compile time warning. (_gfortran_caf_send_by_ref): Same. (_gfortran_caf_is_present): Prevent fallthrough warnings. gcc/testsuite/ChangeLog: 2016-11-30 Andre Vehreschild <vehre@gcc.gnu.org> * ChangeLog: Removed wrongly placed entry. * gfortran.dg/coarray_lib_alloc_4.f90: New test. From-SVN: r243034
Diffstat (limited to 'gcc')
-rw-r--r--gcc/testsuite/ChangeLog10
-rw-r--r--gcc/testsuite/gfortran.dg/coarray_lib_alloc_4.f9046
2 files changed, 51 insertions, 5 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e9c37c9..c1ab201 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2016-11-30 Andre Vehreschild <vehre@gcc.gnu.org>
+
+ Now really add the file.
+ * gfortran.dg/coarray_lib_alloc_4.f90: New test.
+
2016-11-30 David Edelsohn <dje.gcc@gmail.com>
* g++.dg/eh/new1.C: XFAIL on AIX.
@@ -35,11 +40,6 @@
2016-11-30 Andre Vehreschild <vehre@gcc.gnu.org>
- * caf/single.c (_gfortran_caf_is_present): Prevent fallthrough
- warnings.
-
-2016-11-30 Andre Vehreschild <vehre@gcc.gnu.org>
-
* gfortran.dg/coarray/alloc_comp_1.f90: Fix tree-dump scans to adhere
to the changed interfaces.
* gfortran.dg/coarray_alloc_comp_1.f08: Likewise.
diff --git a/gcc/testsuite/gfortran.dg/coarray_lib_alloc_4.f90 b/gcc/testsuite/gfortran.dg/coarray_lib_alloc_4.f90
new file mode 100644
index 0000000..aea9fbf
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/coarray_lib_alloc_4.f90
@@ -0,0 +1,46 @@
+! { dg-do run }
+! { dg-options "-fcoarray=lib -lcaf_single -fdump-tree-original" }
+!
+! Allocate/deallocate with libcaf.
+!
+
+program test_caf_alloc
+
+ type t
+ integer, allocatable :: i
+ real, allocatable :: r(:)
+ end type t
+
+ type(t), allocatable :: xx[:]
+
+ allocate (xx[*])
+
+ if (allocated(xx%i)) call abort()
+ if (allocated(xx[1]%i)) call abort()
+ if (allocated(xx[1]%r)) call abort()
+ allocate(xx%i)
+ if (.not. allocated(xx[1]%i)) call abort()
+ if (allocated(xx[1]%r)) call abort()
+
+ allocate(xx%r(5))
+ if (.not. allocated(xx[1]%i)) call abort()
+ if (.not. allocated(xx[1]%r)) call abort()
+
+ deallocate(xx%i)
+ if (allocated(xx[1]%i)) call abort()
+ if (.not. allocated(xx[1]%r)) call abort()
+
+ deallocate(xx%r)
+ if (allocated(xx[1]%i)) call abort()
+ if (allocated(xx[1]%r)) call abort()
+
+ deallocate(xx)
+end
+
+! { dg-final { scan-tree-dump-times "_gfortran_caf_is_present \\(xx\\.token, 2 - \\(integer\\(kind=4\\)\\) xx\\.dim\\\[0\\\]\\.lbound, &caf_ref\\.\[0-9\]+\\)|_gfortran_caf_is_present \\(xx\\.token, 2 - xx\\.dim\\\[0\\\]\\.lbound, &caf_ref\\.\[0-9\]+\\)" 10 "original" } }
+! { dg-final { scan-tree-dump-times "_gfortran_caf_register \\(72, 1, &xx\\.token, \\(void \\*\\) &xx, 0B, 0B, 0\\)" 1 "original" } }
+! { dg-final { scan-tree-dump-times "_gfortran_caf_register \\(\[0-9\]+, 7" 2 "original" } }
+! { dg-final { scan-tree-dump-times "_gfortran_caf_register \\(\[0-9\]+, 8" 2 "original" } }
+! { dg-final { scan-tree-dump-times "_gfortran_caf_deregister \\(&xx\\.token, 0, 0B, 0B, 0\\)" 1 "original" } }
+! { dg-final { scan-tree-dump-times "_gfortran_caf_deregister \\(&\\(\\(struct t \\* restrict\\) xx\\.data\\)->r\\.token, 1, 0B, 0B, 0\\)" 1 "original" } }
+! { dg-final { scan-tree-dump-times "_gfortran_caf_deregister \\(&\\(\\(struct t \\* restrict\\) xx\\.data\\)->_caf_i, 1, 0B, 0B, 0\\)" 1 "original" } }