diff options
| author | tkoenig <tkoenig@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-08-10 11:25:24 +0000 |
|---|---|---|
| committer | tkoenig <tkoenig@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-08-10 11:25:24 +0000 |
| commit | 85d1bcdebaa02e0dd8cfb81bf24b98325b272fb8 (patch) | |
| tree | 9408cef27301a6df58392150e202866d8cc0d99f | |
| parent | 337a50c07d86390719c41978b4dfdc36830a2f04 (diff) | |
| download | ppe42-gcc-85d1bcdebaa02e0dd8cfb81bf24b98325b272fb8.tar.gz ppe42-gcc-85d1bcdebaa02e0dd8cfb81bf24b98325b272fb8.zip | |
2014-08-10 Thomas Koenig <tkoenig@gcc.gnu.org>
Backport from trunk
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>
Backport from trunk
PR fortran/61999
* gfortran.dg/dot_product_3.f90: New test case.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_9-branch@213788 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/fortran/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/fortran/simplify.c | 11 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/dot_product_3.f90 | 15 |
4 files changed, 38 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index d2e070b78ff..b6a26513c58 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,10 @@ +2014-08-10 Thomas Koenig <tkoenig@gcc.gnu.org> + + Backport from trunk + PR fortran/61999 + * simplify.c (gfc_simplify_dot_product): Convert types of + vectors before calculating the result. + 2014-07-19 Paul Thomas <pault@gcc.gnu.org> Backport from mainline diff --git a/gcc/fortran/simplify.c b/gcc/fortran/simplify.c index 96d0f21f36c..d205523273f 100644 --- a/gcc/fortran/simplify.c +++ b/gcc/fortran/simplify.c @@ -1878,13 +1878,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 36f6a54f8bc..7a351f2032c 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2014-08-10 Thomas Koenig <tkoenig@gcc.gnu.org> + + Backport from trunk + PR fortran/61999 + * gfortran.dg/dot_product_3.f90: New test case. + 2014-08-07 John David Anglin <danglin@gcc.gnu.org> PR tree-optimization/60707 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 00000000000..6e11556ee86 --- /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" } } |
