This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[patch, fortran] PR34661- ICE on user defined assignment in WHERE statement


The ICE was triggered by gcc_assert making sure that only ELEMENTAL 
subroutines are used for user-defined assignment. All one needs to do, is to 
find the appropriate place for a similar check and report an error.

Q: Is there a way to access the position of the assignment operator? For now, 
I placed the error indicator next to the first actual argument, i.e. the left 
hand side of the assignment?!


gcc/fortran:
2008-24-01  Daniel Franke  <franke.daniel@gmail.com>

	PR fortran/34661
	* resolve.c (resolve_where): Added check if user-defined assignment 
	operator is an elemental subroutine.
	(gfc_resolve_where_code_in_forall): Likewise.

gcc/testsuite:
2008-24-01  Daniel Franke  <franke.daniel@gmail.com>

	PR fortran/34661
	* gfortran.dg/where_operator_assign_4.f90: New test.


Regression tested on i686-pc-linux-gnu. Ok for trunk?

Regards
	Daniel
Index: fortran/resolve.c
===================================================================
--- fortran/resolve.c	(revision 131761)
+++ fortran/resolve.c	(working copy)
@@ -5656,6 +5656,9 @@ resolve_where (gfc_code *code, gfc_expr 
   
 	    case EXEC_ASSIGN_CALL:
 	      resolve_call (cnext);
+	      if (!cnext->resolved_sym->attr.elemental)
+		gfc_error("Non-ELEMETAL user-defined assignment in WHERE at %L",
+			  &cnext->ext.actual->expr->where);
 	      break;
 
 	    /* WHERE or WHERE construct is part of a where-body-construct */
@@ -5738,6 +5741,9 @@ gfc_resolve_where_code_in_forall (gfc_co
 	    /* WHERE operator assignment statement */
 	    case EXEC_ASSIGN_CALL:
 	      resolve_call (cnext);
+	      if (!cnext->resolved_sym->attr.elemental)
+		gfc_error("Non-ELEMETAL user-defined assignment in WHERE at %L",
+			  &cnext->ext.actual->expr->where);
 	      break;
 
 	    /* WHERE or WHERE construct is part of a where-body-construct */
Index: testsuite/gfortran.dg/where_operator_assign_4.f90
===================================================================
--- testsuite/gfortran.dg/where_operator_assign_4.f90	(revision 0)
+++ testsuite/gfortran.dg/where_operator_assign_4.f90	(revision 0)
@@ -0,0 +1,30 @@
+! { dg-do compile }
+! PR fortran/34661 ICE on user-defined assignments in where statements
+! Testcase contributed by Joost VandeVondele
+
+MODULE M1
+ IMPLICIT NONE
+ TYPE T1
+   INTEGER :: I
+ END TYPE T1
+ INTERFACE ASSIGNMENT(=)
+  MODULE PROCEDURE S1
+ END INTERFACE
+CONTAINS
+ SUBROUTINE S1(I,J)
+   TYPE(T1), INTENT(OUT)  :: I(2)
+   TYPE(T1), INTENT(IN)  :: J(2)
+   I%I=-J%I
+ END SUBROUTINE S1
+END MODULE M1
+
+USE M1
+TYPE(T1) :: I(2),J(2)
+I(:)%I=1
+WHERE (I(:)%I>0)
+ J=I                       ! { dg-error "Non-ELEMETAL user-defined assignment in WHERE" }
+END WHERE
+
+WHERE (I(:)%I>0) J=I       ! { dg-error "Non-ELEMETAL user-defined assignment in WHERE" }
+
+END

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]