From: Thomas Koenig <tkoenig@gcc.gnu.org>
Date: Tue, 1 Nov 2016 21:16:46 +0000 (+0000)
Subject: re PR fortran/78178 (ICE in WHERE statement with diagnostic)
X-Git-Tag: basepoints/gcc-8~3452
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5b7c051940e69046151e3094b56f1b13e873840e;p=thirdparty%2Fgcc.git

re PR fortran/78178 (ICE in WHERE statement with diagnostic)

2016-11-01  Thomas Koenig  <tkoenig@gcc.gnu.org>

	PR fortran/78178
	* match.c (match_simple_where):  Fill in locus for assigment
	in simple WHERE statement.

2016-11-01  Thomas Koenig  <tkoenig@gcc.gnu.org>

	PR fortran/69544
	* gfortran.dg/where_6.f90:  New test.

From-SVN: r241756
---

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index b3a0d50dc604..fd51989e402a 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2016-11-01  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+	PR fortran/78178
+	* match.c (match_simple_where):  Fill in locus for assigment
+	in simple WHERE statement.
+
 2016-11-01  Thomas Koenig  <tkoenig@gcc.gnu.org>
 
 	PR fortran/69544
diff --git a/gcc/fortran/match.c b/gcc/fortran/match.c
index 5ec6e8954519..40566f64a284 100644
--- a/gcc/fortran/match.c
+++ b/gcc/fortran/match.c
@@ -6219,6 +6219,7 @@ match_simple_where (void)
 
   c->next = XCNEW (gfc_code);
   *c->next = new_st;
+  c->next->loc = gfc_current_locus;
   gfc_clear_new_st ();
 
   new_st.op = EXEC_WHERE;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 7572f864606a..57bf83db2a09 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2016-11-01  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+	PR fortran/69544
+	* gfortran.dg/where_6.f90:  New test.
+
 2016-11-01  Jakub Jelinek  <jakub@redhat.com>
 
 	* g++.dg/debug/dwarf2/inline-var-1.C: New test.
diff --git a/gcc/testsuite/gfortran.dg/where_6.f90 b/gcc/testsuite/gfortran.dg/where_6.f90
new file mode 100644
index 000000000000..c7c43db84237
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/where_6.f90
@@ -0,0 +1,15 @@
+! { dg-do compile }
+! { dg-options "-Wcharacter-truncation" }
+subroutine where_ice (i,j)
+     
+  implicit none
+
+  character(8)  :: y(10,10,2)
+
+  integer       :: i
+  integer       :: j
+
+  character(12) :: txt(5)
+  if (.true.) where (txt(1:3) /= ''   )  y(1:3,i,j) = txt(1:3) ! { dg-warning "CHARACTER expression will be truncated" }
+
+end subroutine where_ice