From 2df0e3c9cfdac71e2e8a06975aa8e7837ae6f58f Mon Sep 17 00:00:00 2001 From: Tobias Burnus Date: Tue, 1 Oct 2013 23:00:17 +0200 Subject: [PATCH] re PR fortran/58579 (Memory allocation fails when calling character-valued function) 2013-10-01 Tobias Burnus PR fortran/58579 * trans-expr.c (gfc_conv_string_tmp): Correctly obtain the byte size of a single character. From-SVN: r203088 --- gcc/fortran/ChangeLog | 6 ++++++ gcc/fortran/trans-expr.c | 13 ++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index ecdccab1c7c..71b1ffa8bf1 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2013-10-01 Tobias Burnus + + PR fortran/58579 + * trans-expr.c (gfc_conv_string_tmp): Correctly obtain + the byte size of a single character. + 2013-09-27 Janne Blomqvist * intrinsic.texi (DATE_AND_TIME): Fix example. diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c index 0ecfdfce469..67c8045decf 100644 --- a/gcc/fortran/trans-expr.c +++ b/gcc/fortran/trans-expr.c @@ -2355,11 +2355,14 @@ gfc_conv_string_tmp (gfc_se * se, tree type, tree len) { /* Allocate a temporary to hold the result. */ var = gfc_create_var (type, "pstr"); - tmp = gfc_call_malloc (&se->pre, type, - fold_build2_loc (input_location, MULT_EXPR, - TREE_TYPE (len), len, - fold_convert (TREE_TYPE (len), - TYPE_SIZE (type)))); + gcc_assert (POINTER_TYPE_P (type)); + tmp = TREE_TYPE (type); + gcc_assert (TREE_CODE (tmp) == ARRAY_TYPE); + tmp = TYPE_SIZE_UNIT (TREE_TYPE (tmp)); + tmp = fold_build2_loc (input_location, MULT_EXPR, size_type_node, + fold_convert (size_type_node, len), + fold_convert (size_type_node, tmp)); + tmp = gfc_call_malloc (&se->pre, type, tmp); gfc_add_modify (&se->pre, var, tmp); /* Free the temporary afterwards. */ -- 2.30.2