diff mbox

[fortran] pr66100 bound simplification refactoring fallout

Message ID 55509FCF.60401@sfr.fr
State New
Headers show

Commit Message

Mikael Morin May 11, 2015, 12:25 p.m. UTC 
Hello,

This fixes a regression introduced by my bound simplification refactoring at
https://gcc.gnu.org/ml/gcc-patches/2015-05/msg00843.html
The assert was introduced in the change above and checks that the
refactoring didn't lose anything regarding the condition used in the
existing code.
The condition was assuming full object arrays, and fails with subobject
arrays.
The fix (attached) is obvious enough.
The testcase is Thomas' reduced one, which is independent on matmul
simplification.

I plan to commit this patch tonight.

Mikael
2015-05-11  Mikael Morin  <mikael@gcc.gnu.org>

	* simplify.c (simplify_bound): Fix assert to accept subobject
	arrays.
diff mbox

Patch

Index: simplify.c
===================================================================
--- simplify.c	(révision 222979)
+++ simplify.c	(copie de travail)
@@ -3463,8 +3463,8 @@  simplify_bound (gfc_expr *array, gfc_expr *dim, gf
   gcc_assert (!as
 	      || (as->type != AS_DEFERRED
 		  && array->expr_type == EXPR_VARIABLE
-		  && !array->symtree->n.sym->attr.allocatable
-		  && !array->symtree->n.sym->attr.pointer));
+		  && !gfc_expr_attr (array).allocatable
+		  && !gfc_expr_attr (array).pointer));
 
   if (dim == NULL)
     {