diff options
| author | kargl <kargl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2018-01-19 23:37:29 +0000 |
|---|---|---|
| committer | kargl <kargl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2018-01-19 23:37:29 +0000 |
| commit | d6d169dee127b7879ade9261480fca4463fc6f67 (patch) | |
| tree | d86b76e3de764b005d2a40bfe5dca760c7ab7c9f | |
| parent | ebba51a4c952419f9fa016e2d7de53e32325f0eb (diff) | |
2018-01-19 Steven G. Kargl <kargl@gcc.gnu.org>
Backport of r250734 from mainline
PR fortran/80768
* check.c (gfc_check_num_images): Fix typo.
2018-01-19 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/80768
* gfortran.dg/num_images_1.f90: New test that tests fix in r250734.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-7-branch@256907 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/check.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/num_images_1.f90 | 10 |
4 files changed, 22 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 9da69f5d610c..48fb21240d73 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2018-01-19 Steven G. Kargl <kargl@gcc.gnu.org> + + Backport of r250734 from mainline + PR fortran/80768 + * check.c (gfc_check_num_images): Fix typo. + 2018-01-18 Harald Anlauf <anlauf@gmx.de> Backport from mainline diff --git a/gcc/fortran/check.c b/gcc/fortran/check.c index ea8cc6e072ce..6e62d409e7bc 100644 --- a/gcc/fortran/check.c +++ b/gcc/fortran/check.c @@ -5156,7 +5156,7 @@ gfc_check_num_images (gfc_expr *distance, gfc_expr *failed) return false; if (!gfc_notify_std (GFC_STD_F2008_TS, "FAILED= argument to " - "NUM_IMAGES at %L", &distance->where)) + "NUM_IMAGES at %L", &failed->where)) return false; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 521b06aa1282..b1e8ffddbff2 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2018-01-19 Steven G. Kargl <kargl@gcc.gnu.org> + + PR fortran/80768 + * gfortran.dg/num_images_1.f90: New test that tests fix in r250734. + 2018-01-18 Harald Anlauf <anlauf@gmx.de> Backport from mainline diff --git a/gcc/testsuite/gfortran.dg/num_images_1.f90 b/gcc/testsuite/gfortran.dg/num_images_1.f90 new file mode 100644 index 000000000000..b5547f60cad8 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/num_images_1.f90 @@ -0,0 +1,10 @@ +! { dg-do compile } +! { dg-options "-fcoarray=single -std=f2008" } +! PR Fortran/80768 +! +program foo + implicit none + integer k5 + k5 = num_images(failed=.false.) ! { dg-error "argument to NUM_IMAGES" } + print *, k5 +end program foo |