diff options
| author | kargl <kargl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2018-01-20 20:45:50 +0000 |
|---|---|---|
| committer | kargl <kargl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2018-01-20 20:45:50 +0000 |
| commit | b7ac7190c2d19c52bdba10f50d6bfa1058500517 (patch) | |
| tree | 290151bd50a11d1d10af617eef937049570aec7e | |
| parent | aa499fa0254298c0f2a83fabe05fba5cd4f38098 (diff) | |
2018-01-20 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/83900
* simplify.c (gfc_simplify_matmul): Set return type correctly.
2018-01-20 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/83900
* gfortran.dg/matmul_18.f90: New test.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-7-branch@256920 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/fortran/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/fortran/simplify.c | 20 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/matmul_18.f90 | 8 |
4 files changed, 35 insertions, 3 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 08295d71b6b3..4ff41b6fb6d4 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,8 @@ +2018-01-20 Steven G. Kargl <kargl@gcc.gnu.org> + + PR fortran/83900 + * simplify.c (gfc_simplify_matmul): Set return type correctly. + 2018-01019 Steven G. Kargl <kargl@gcc.gnu.org> PR fortran/83900 diff --git a/gcc/fortran/simplify.c b/gcc/fortran/simplify.c index 22953059f3d7..d12ae5f4aaba 100644 --- a/gcc/fortran/simplify.c +++ b/gcc/fortran/simplify.c @@ -4202,9 +4202,23 @@ gfc_simplify_matmul (gfc_expr *matrix_a, gfc_expr *matrix_b) || !is_constant_array_expr (matrix_b)) return NULL; - result = gfc_get_array_expr (matrix_a->ts.type, - matrix_a->ts.kind, - &matrix_a->where); + /* MATMUL should do mixed-mode arithmetic. Set the result type. */ + if (matrix_a->ts.type != matrix_b->ts.type) + { + gfc_expr e; + e.expr_type = EXPR_OP; + gfc_clear_ts (&e.ts); + e.value.op.op = INTRINSIC_NONE; + e.value.op.op1 = matrix_a; + e.value.op.op2 = matrix_b; + gfc_type_convert_binary (&e, 1); + result = gfc_get_array_expr (e.ts.type, e.ts.kind, &matrix_a->where); + } + else + { + result = gfc_get_array_expr (matrix_a->ts.type, matrix_a->ts.kind, + &matrix_a->where); + } if (matrix_a->rank == 1 && matrix_b->rank == 2) { diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index f2e78d8595a3..dfd02631306a 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2018-01-20 Steven G. Kargl <kargl@gcc.gnu.org> + + PR fortran/83900 + * gfortran.dg/matmul_18.f90: New test. + 2018-01-19 Steven G. Kargl <kargl@gcc.gnu.org> PR fortran/83900 diff --git a/gcc/testsuite/gfortran.dg/matmul_18.f90 b/gcc/testsuite/gfortran.dg/matmul_18.f90 new file mode 100644 index 000000000000..acfd3c304cac --- /dev/null +++ b/gcc/testsuite/gfortran.dg/matmul_18.f90 @@ -0,0 +1,8 @@ +! { dg-do run } +program p + integer, parameter :: a(3,2) = 1 + real, parameter :: b(2,3) = 2 + real d(3,3) + d = 4 + if (any(d /= matmul(a,b))) call abort +end |