Dear Janne, dear Paul,
thanks for the review - and for the f95-lang.c patch. I have updated the
patch to use calloc, build & regtested it, and committed it as Rev. 183247.
Tobias
2012-01-17 Tobias Burnus <bur...@net-b.de>
Janne Blomqvist <j...@gcc.gnu.org>
PR fortran/51869
* trans-expr.c (alloc_scalar_allocatable_for_assignment): Nullify
LHS after allocation, if it has allocatable components.
* f95-lang.c (gfc_init_builtin_functions): Add BUILT_IN_CALLOC.
2012-01-17 Tobias Burnus <bur...@net-b.de>
PR fortran/51869
* gfortran.dg/realloc_on_assign_9.f90: New.
diff --git a/gcc/fortran/f95-lang.c b/gcc/fortran/f95-lang.c
index 57c0114..a68d2fc 100644
--- a/gcc/fortran/f95-lang.c
+++ b/gcc/fortran/f95-lang.c
@@ -1007,6 +1007,12 @@ gfc_init_builtin_functions (void)
"malloc", ATTR_NOTHROW_LEAF_LIST);
DECL_IS_MALLOC (builtin_decl_explicit (BUILT_IN_MALLOC)) = 1;
+ ftype = build_function_type_list (pvoid_type_node, size_type_node,
+ size_type_node, NULL_TREE);
+ gfc_define_builtin ("__builtin_calloc", ftype, BUILT_IN_CALLOC,
+ "calloc", ATTR_NOTHROW_LEAF_LIST);
+ DECL_IS_MALLOC (builtin_decl_explicit (BUILT_IN_CALLOC)) = 1;
+
ftype = build_function_type_list (pvoid_type_node,
size_type_node, pvoid_type_node,
NULL_TREE);
diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c
index 14411e0..07b9c6d 100644
--- a/gcc/fortran/trans-expr.c
+++ b/gcc/fortran/trans-expr.c
@@ -6585,11 +6592,24 @@ alloc_scalar_allocatable_for_assignment (stmtblock_t *block,
size_in_bytes = size;
}
- tmp = build_call_expr_loc (input_location,
- builtin_decl_explicit (BUILT_IN_MALLOC),
- 1, size_in_bytes);
- tmp = fold_convert (TREE_TYPE (lse.expr), tmp);
- gfc_add_modify (block, lse.expr, tmp);
+ if (expr1->ts.type == BT_DERIVED && expr1->ts.u.derived->attr.alloc_comp)
+ {
+ tmp = build_call_expr_loc (input_location,
+ builtin_decl_explicit (BUILT_IN_CALLOC),
+ 2, build_one_cst (size_type_node),
+ size_in_bytes);
+ tmp = fold_convert (TREE_TYPE (lse.expr), tmp);
+ gfc_add_modify (block, lse.expr, tmp);
+ }
+ else
+ {
+ tmp = build_call_expr_loc (input_location,
+ builtin_decl_explicit (BUILT_IN_MALLOC),
+ 1, size_in_bytes);
+ tmp = fold_convert (TREE_TYPE (lse.expr), tmp);
+ gfc_add_modify (block, lse.expr, tmp);
+ }
+
if (expr1->ts.type == BT_CHARACTER && expr1->ts.deferred)
{
/* Deferred characters need checking for lhs and rhs string
--- /dev/null 2012-01-17 08:41:28.951768065 +0100
+++ gcc/gcc/testsuite/gfortran.dg/realloc_on_assign_9.f90 2012-01-17 11:41:41.000000000 +0100
@@ -0,0 +1,34 @@
+! { dg-do run }
+!
+! PR fortran/51869
+!
+module soop_stars_class
+ implicit none
+ type soop_stars
+ real ,dimension(:,:) ,allocatable :: position
+ end type
+ type show
+ type(soop_stars) :: rocket
+ end type
+contains
+ function new_show(boom)
+ type(soop_stars) ,intent(in) :: boom
+ type(show) :: new_show
+ new_show%rocket = boom
+ end function
+end module
+
+program main
+ use soop_stars_class
+ implicit none
+
+ type(soop_stars) :: fireworks
+ type(show), allocatable :: july4
+
+ allocate (fireworks%position(2,2))
+ fireworks%position = 33.0
+
+ july4 = new_show(boom=fireworks)
+end program
+
+! { dg-final { cleanup-modules "soop_stars_class" } }
