diff options
| author | Tobias Burnus <burnus@net-b.de> | 2014-07-15 07:36:35 +0200 |
|---|---|---|
| committer | Tobias Burnus <burnus@gcc.gnu.org> | 2014-07-15 07:36:35 +0200 |
| commit | 80def9087092a60b4f5f2ca952b3d0eb8e73cc8d (patch) | |
| tree | 10ecafe29d2747f1a80164b12738ca9bd6668da3 /gcc/fortran | |
| parent | 4228f9328c9a7bd0cb78e167cecb5a3fb774fb9c (diff) | |
| download | gcc-80def9087092a60b4f5f2ca952b3d0eb8e73cc8d.zip gcc-80def9087092a60b4f5f2ca952b3d0eb8e73cc8d.tar.gz gcc-80def9087092a60b4f5f2ca952b3d0eb8e73cc8d.tar.bz2 | |
symbol.c (check_conflict): Add codimension conflict with pointer; fix cray-pointee check.
2014-06-15 Tobias Burnus <burnus@net-b.de>
gcc/fortran/
* symbol.c (check_conflict): Add codimension conflict with
pointer; fix cray-pointee check.
gcc/testsuite/
* gfortran.dg/coarray_34.f90: New.
* gfortran.dg/coarray_6.f90: Update test case.
From-SVN: r212540
Diffstat (limited to 'gcc/fortran')
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/symbol.c | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 2c36291..c33936b 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2014-06-15 Tobias Burnus <burnus@net-b.de> + + * symbol.c (check_conflict): Add codimension conflict with + pointer; fix cray-pointee check. + + 2014-06-14 Tobias Burnus <burnus@net-b.de> * trans-intrinsic.c (conv_intrinsic_atomic_ref): Fix handling diff --git a/gcc/fortran/symbol.c b/gcc/fortran/symbol.c index aee7510..2e04598 100644 --- a/gcc/fortran/symbol.c +++ b/gcc/fortran/symbol.c @@ -458,6 +458,7 @@ check_conflict (symbol_attribute *attr, const char *name, locus *where) conf (pointer, target); conf (pointer, intrinsic); conf (pointer, elemental); + conf (pointer, codimension); conf (allocatable, elemental); conf (target, external); @@ -534,8 +535,8 @@ check_conflict (symbol_attribute *attr, const char *name, locus *where) conf (cray_pointer, entry); conf (cray_pointee, allocatable); - conf (cray_pointer, contiguous); - conf (cray_pointer, codimension); + conf (cray_pointee, contiguous); + conf (cray_pointee, codimension); conf (cray_pointee, intent); conf (cray_pointee, optional); conf (cray_pointee, dummy); |