From 0e3372232c6079f517fd776799aed30ac88ddcef Mon Sep 17 00:00:00 2001 From: Tobias Burnus Date: Thu, 8 Dec 2011 21:54:57 +0100 Subject: [PATCH] re PR fortran/51448 (Compiler crash when assigning floating point values of different kinds) 2011-12-08 Tobias Burnus PR fortran/51448 * fortran/trans-array.c (get_std_lbound): Fix handling of conversion functions. 2011-12-08 Tobias Burnus PR fortran/51448 * gfortran.dg/realloc_on_assign_8.f90: New. From-SVN: r182137 --- gcc/fortran/ChangeLog | 6 ++++++ gcc/fortran/trans-array.c | 20 +++++++++---------- gcc/testsuite/ChangeLog | 5 +++++ .../gfortran.dg/realloc_on_assign_8.f90 | 17 ++++++++++++++++ 4 files changed, 38 insertions(+), 10 deletions(-) create mode 100644 gcc/testsuite/gfortran.dg/realloc_on_assign_8.f90 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 0309cbc12020..943f885cdab1 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2011-12-08 Tobias Burnus + + PR fortran/51448 + * fortran/trans-array.c (get_std_lbound): Fix handling of + conversion functions. + 2011-12-06 Tobias Burnus PR fortran/51435 diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c index 1eef35996226..a4be6e7b1652 100644 --- a/gcc/fortran/trans-array.c +++ b/gcc/fortran/trans-array.c @@ -6772,7 +6772,16 @@ get_std_lbound (gfc_expr *expr, tree desc, int dim, bool assumed_size) gfc_array_index_type, cond, lbound, gfc_index_one_node); } - else if (expr->expr_type == EXPR_VARIABLE) + + if (expr->expr_type == EXPR_FUNCTION) + { + /* A conversion function, so use the argument. */ + gcc_assert (expr->value.function.isym + && expr->value.function.isym->conversion); + expr = expr->value.function.actual->expr; + } + + if (expr->expr_type == EXPR_VARIABLE) { tmp = TREE_TYPE (expr->symtree->n.sym->backend_decl); for (ref = expr->ref; ref; ref = ref->next) @@ -6785,15 +6794,6 @@ get_std_lbound (gfc_expr *expr, tree desc, int dim, bool assumed_size) } return GFC_TYPE_ARRAY_LBOUND(tmp, dim); } - else if (expr->expr_type == EXPR_FUNCTION) - { - /* A conversion function, so use the argument. */ - expr = expr->value.function.actual->expr; - if (expr->expr_type != EXPR_VARIABLE) - return gfc_index_one_node; - desc = TREE_TYPE (expr->symtree->n.sym->backend_decl); - return get_std_lbound (expr, desc, dim, assumed_size); - } return gfc_index_one_node; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index d389970df6cd..1d94277b8340 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2011-12-08 Tobias Burnus + + PR fortran/51448 + * gfortran.dg/realloc_on_assign_8.f90: New. + 2011-12-08 Teresa Johnson * gcc.target/i386/movdi-rex64.c: Remove unnecessary diff --git a/gcc/testsuite/gfortran.dg/realloc_on_assign_8.f90 b/gcc/testsuite/gfortran.dg/realloc_on_assign_8.f90 new file mode 100644 index 000000000000..4f7d28895b5b --- /dev/null +++ b/gcc/testsuite/gfortran.dg/realloc_on_assign_8.f90 @@ -0,0 +1,17 @@ +! { dg-do compile } +! +! PR fortran/51448 +! +! Contribued by François Willot +! + PROGRAM MAIN + IMPLICIT NONE + TYPE mytype + REAL b(2) + END TYPE mytype + TYPE(mytype) a + DOUBLE PRECISION, ALLOCATABLE :: x(:) + ALLOCATE(x(2)) + a%b=0.0E0 + x=a%b + END -- 2.47.2