diff options
| author | Thomas Koenig <tkoenig@gcc.gnu.org> | 2014-08-09 22:38:46 +0000 |
|---|---|---|
| committer | Thomas Koenig <tkoenig@gcc.gnu.org> | 2014-08-09 22:38:46 +0000 |
| commit | 4d0513401049a350978e89428070f74cc0cfdc0e (patch) | |
| tree | 2bd995fd5969ee34d779a626b328099b61025b8e | |
| parent | 726540aa29ba5d46a4028852d937ab889be941d8 (diff) | |
| download | gcc-4d0513401049a350978e89428070f74cc0cfdc0e.zip gcc-4d0513401049a350978e89428070f74cc0cfdc0e.tar.gz gcc-4d0513401049a350978e89428070f74cc0cfdc0e.tar.bz2 | |
re PR fortran/61999 (`gfc_simplify_dot_product` causes ICE for constant arguments)
2014-08-10 Thomas Koenig <tkoenig@gcc.gnu.org>
PR fortran/61999
* simplify.c (gfc_simplify_dot_product): Convert types of
vectors before calculating the result.
2014-08-10 Thomas Koenig <tkoenig@gcc.gnu.org>
PR fortran/61999
* gfortran.dg/dot_product_3.f90: New test case.
From-SVN: r213782
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/simplify.c | 11 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/dot_product_3.f90 | 15 |
4 files changed, 36 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index baf8d53..4abb16e 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2014-08-10 Thomas Koenig <tkoenig@gcc.gnu.org> + + PR fortran/61999 + * simplify.c (gfc_simplify_dot_product): Convert types of + vectors before calculating the result. + 2014-08-02 Trevor Saunders <tsaunders@mozilla.com> * openmp.c, trans-decl.c: Use hash_set instead of pointer_set. diff --git a/gcc/fortran/simplify.c b/gcc/fortran/simplify.c index d4a67ad..cc8a52a 100644 --- a/gcc/fortran/simplify.c +++ b/gcc/fortran/simplify.c @@ -1882,13 +1882,22 @@ gfc_simplify_dim (gfc_expr *x, gfc_expr *y) gfc_expr* gfc_simplify_dot_product (gfc_expr *vector_a, gfc_expr *vector_b) { + + gfc_expr temp; + if (!is_constant_array_expr (vector_a) || !is_constant_array_expr (vector_b)) return NULL; gcc_assert (vector_a->rank == 1); gcc_assert (vector_b->rank == 1); - gcc_assert (gfc_compare_types (&vector_a->ts, &vector_b->ts)); + + temp.expr_type = EXPR_OP; + gfc_clear_ts (&temp.ts); + temp.value.op.op = INTRINSIC_NONE; + temp.value.op.op1 = vector_a; + temp.value.op.op2 = vector_b; + gfc_type_convert_binary (&temp, 1); return compute_dot_product (vector_a, 1, 0, vector_b, 1, 0, true); } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 9fe5714..f0a9757 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2014-08-10 Thomas Koenig <tkoenig@gcc.gnu.org> + + PR fortran/61999 + * gfortran.dg/dot_product_3.f90: New test case. + 2014-08-09 Jan Hubicka <hubicka@ucw.cz> * g++.dg/ipa/devirt-35.C: Fix template. diff --git a/gcc/testsuite/gfortran.dg/dot_product_3.f90 b/gcc/testsuite/gfortran.dg/dot_product_3.f90 new file mode 100644 index 0000000..6e11556e --- /dev/null +++ b/gcc/testsuite/gfortran.dg/dot_product_3.f90 @@ -0,0 +1,15 @@ +! { dg-do compile } +! { dg-options "-fdump-tree-original" } +! PR 61999 - this used to ICE. +! Original test case by A. Kasahara +program main + use, intrinsic:: iso_fortran_env, only: output_unit + + implicit none + + write(output_unit, *) dot_product([1, 2], [2.0, 3.0]) + + stop +end program main +! { dg-final { scan-tree-dump-times "8\\.0e\\+0" 1 "original" } } +! { dg-final { cleanup-tree-dump "original" } } |