From: Steven G. Kargl <kargl@gcc.gnu.org>
Date: Fri, 19 Jan 2018 23:51:18 +0000 (+0000)
Subject: backport: re PR fortran/80768 (NULL pointer dereferenced in gfc_check_num_images... 
X-Git-Tag: releases/gcc-6.5.0~575
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd35ec75640ec5be43d9b3c7e49c96230bcaa839;p=thirdparty%2Fgcc.git

backport: re PR fortran/80768 (NULL pointer dereferenced in gfc_check_num_images at fortran/check.c)

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.

From-SVN: r256908
---

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 13d55bddca2a..e90e38f9c1c2 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-17  Harald Anlauf  <anlauf@gmx.de>
 
 	Back from mainline
diff --git a/gcc/fortran/check.c b/gcc/fortran/check.c
index ee421d99cd9d..f7829db7a7d5 100644
--- a/gcc/fortran/check.c
+++ b/gcc/fortran/check.c
@@ -5028,7 +5028,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 6dc3c0bb3758..5373a3928f6b 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-17  Harald Anlauf  <anlauf@gmx.de>
 
 	Back 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