diff options
| author | Thomas Koenig <tkoenig@gcc.gnu.org> | 2018-01-30 20:49:49 +0000 |
|---|---|---|
| committer | Thomas Koenig <tkoenig@gcc.gnu.org> | 2018-01-30 20:49:49 +0000 |
| commit | dca9e8be87dafdc558e3554c1c21f599918509a5 (patch) | |
| tree | 0c807d129d15c5f0eff26e8cbeba570e4971187f /gcc/fortran | |
| parent | 881f7c9735c14d6cd4d98f3fbd68cc3e2d906ecd (diff) | |
| download | gcc-dca9e8be87dafdc558e3554c1c21f599918509a5.zip gcc-dca9e8be87dafdc558e3554c1c21f599918509a5.tar.gz gcc-dca9e8be87dafdc558e3554c1c21f599918509a5.tar.bz2 | |
re PR fortran/84133 (ICE in gimplify_var_or_parm_decl, at gimplify.c:2706)
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.
From-SVN: r257206
Diffstat (limited to 'gcc/fortran')
| -rw-r--r-- | gcc/fortran/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/fortran/frontend-passes.c | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 96e6fb2..292abc1 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,10 @@ +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. + 2017-01-29 Thomas Koenig <tkoenig@gcc.gnu.org> PR fortran/84073 diff --git a/gcc/fortran/frontend-passes.c b/gcc/fortran/frontend-passes.c index bfa50be..11a5b9b 100644 --- a/gcc/fortran/frontend-passes.c +++ b/gcc/fortran/frontend-passes.c @@ -2763,7 +2763,7 @@ matmul_to_var_expr (gfc_expr **ep, int *walk_subtrees ATTRIBUTE_UNUSED, 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_subtrees, 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 |