diff options
| author | Tobias Burnus <burnus@net-b.de> | 2013-07-08 15:48:19 +0200 |
|---|---|---|
| committer | Tobias Burnus <burnus@gcc.gnu.org> | 2013-07-08 15:48:19 +0200 |
| commit | eebb98a55b8a102555c0e9823ed5597f8dc7cefb (patch) | |
| tree | 3f6d6786dfac40f27ff5bcdded308b2f403c82cb /gcc/fortran | |
| parent | c8877f40377038ad919467e472ca09625559b1c7 (diff) | |
| download | gcc-eebb98a55b8a102555c0e9823ed5597f8dc7cefb.zip gcc-eebb98a55b8a102555c0e9823ed5597f8dc7cefb.tar.gz gcc-eebb98a55b8a102555c0e9823ed5597f8dc7cefb.tar.bz2 | |
re PR fortran/57785 (DOT_PRODUCT error with constant complex array)
2013-07-08 Tobias Burnus <burnus@net-b.de>
PR fortran/57785
* simplify.c (compute_dot_product): Complex conjugate for
dot_product.
(gfc_simplify_dot_product, gfc_simplify_matmul): Update call.
2013-07-08 Tobias Burnus <burnus@net-b.de>
PR fortran/57785
* gfortran.dg/dot_product_2.f90: New.
From-SVN: r200786
Diffstat (limited to 'gcc/fortran')
| -rw-r--r-- | gcc/fortran/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/fortran/simplify.c | 20 |
2 files changed, 19 insertions, 8 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 487d929..f6bc080 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,5 +1,12 @@ 2013-07-08 Tobias Burnus <burnus@net-b.de> + PR fortran/57785 + * simplify.c (compute_dot_product): Complex conjugate for + dot_product. + (gfc_simplify_dot_product, gfc_simplify_matmul): Update call. + +2013-07-08 Tobias Burnus <burnus@net-b.de> + PR fortran/57469 * trans-decl.c (generate_local_decl): Don't warn that a dummy is unused, when it is in a namelist. diff --git a/gcc/fortran/simplify.c b/gcc/fortran/simplify.c index 41e1dfb..32b8332 100644 --- a/gcc/fortran/simplify.c +++ b/gcc/fortran/simplify.c @@ -333,13 +333,15 @@ init_result_expr (gfc_expr *e, int init, gfc_expr *array) } -/* Helper function for gfc_simplify_dot_product() and gfc_simplify_matmul. */ +/* Helper function for gfc_simplify_dot_product() and gfc_simplify_matmul; + if conj_a is true, the matrix_a is complex conjugated. */ static gfc_expr * compute_dot_product (gfc_expr *matrix_a, int stride_a, int offset_a, - gfc_expr *matrix_b, int stride_b, int offset_b) + gfc_expr *matrix_b, int stride_b, int offset_b, + bool conj_a) { - gfc_expr *result, *a, *b; + gfc_expr *result, *a, *b, *c; result = gfc_get_constant_expr (matrix_a->ts.type, matrix_a->ts.kind, &matrix_a->where); @@ -362,9 +364,11 @@ compute_dot_product (gfc_expr *matrix_a, int stride_a, int offset_a, case BT_INTEGER: case BT_REAL: case BT_COMPLEX: - result = gfc_add (result, - gfc_multiply (gfc_copy_expr (a), - gfc_copy_expr (b))); + if (conj_a && a->ts.type == BT_COMPLEX) + c = gfc_simplify_conjg (a); + else + c = gfc_copy_expr (a); + result = gfc_add (result, gfc_multiply (c, gfc_copy_expr (b))); break; default: @@ -1882,7 +1886,7 @@ gfc_simplify_dot_product (gfc_expr *vector_a, gfc_expr *vector_b) gcc_assert (vector_b->rank == 1); gcc_assert (gfc_compare_types (&vector_a->ts, &vector_b->ts)); - return compute_dot_product (vector_a, 1, 0, vector_b, 1, 0); + return compute_dot_product (vector_a, 1, 0, vector_b, 1, 0, true); } @@ -3910,7 +3914,7 @@ gfc_simplify_matmul (gfc_expr *matrix_a, gfc_expr *matrix_b) for (row = 0; row < result_rows; ++row) { gfc_expr *e = compute_dot_product (matrix_a, stride_a, offset_a, - matrix_b, 1, offset_b); + matrix_b, 1, offset_b, false); gfc_constructor_append_expr (&result->value.constructor, e, NULL); |