diff mbox series

[fortran,committed] Fix PR 84133, regression with matmul

Message ID 0d8d79cd-8ea5-b680-7b43-1cc04316c9b8@netcologne.de
State New
Headers show
Series [fortran,committed] Fix PR 84133, regression with matmul | expand

Commit Message

Thomas Koenig Jan. 30, 2018, 8:51 p.m. UTC 
Hello world,

I have just committed the attached patch as obvious, after regtesting.

Regards

	Thomas

2018-01-30  Thomas Koenig  <tkoenig@gcc.gnu.org>

         PR fortran/84133
         * frontend-passes (matmul_to_var_expr): Return early if
         in association list.
         (inline_matmul_assign): Likewise.

2018-01-30  Thomas Koenig  <tkoenig@gcc.gnu.org>

         PR fortran/84133
         * gfortran.dg/inline_matmul_21.f90: New test case.
diff mbox series

Patch

Index: frontend-passes.c
===================================================================
--- frontend-passes.c	(Revision 257131)
+++ frontend-passes.c	(Arbeitskopie)
@@ -2763,7 +2763,7 @@  matmul_to_var_expr (gfc_expr **ep, int *walk_subtr
     return 0;
 
   if (forall_level > 0 || iterator_level > 0 || in_omp_workshare
-      || in_where)
+      || in_where || in_assoc_list)
     return 0;
 
   /* Check if this is already in the form c = matmul(a,b).  */
@@ -3728,7 +3728,7 @@  inline_matmul_assign (gfc_code **c, int *walk_subt
   if (co->op != EXEC_ASSIGN)
     return 0;
 
-  if (in_where)
+  if (in_where || in_assoc_list)
     return 0;
 
   /* The BLOCKS generated for the temporary variables and FORALL don't