OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

trans-array.h (gfc_trans_create_temp_array): Remove loop argument. 

* trans-array.h (gfc_trans_create_temp_array): Remove loop argument.
	* trans-array.c (gfc_trans_create_temp_array): Ditto.  Get loop from ss.
	Update reference to loop.  Remove loop argument.
	(gfc_trans_array_constructor, gfc_conv_loop_setup): Update calls to
	gfc_trans_create_temp_array.
	* trans-expr.c (gfc_conv_procedure_call): Ditto.
	* trans-intrinsic.c (gfc_conv_intrinsic_transfer): Ditto.
	* trans-stmt.c (gfc_conv_elemental_dependencies): Ditto.
	Set loop before calling gfc_trans_create_temp_array.

From-SVN: r180888
This commit is contained in:
Mikael Morin 2011-11-03 23:06:22 +00:00
parent d35335e315
commit 4164579308
6 changed files with 33 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gcc/fortran/ChangeLog
View File

@ -1,3 +1,15 @@
2011-11-03 Mikael Morin <mikael@gcc.gnu.org>
* trans-array.h (gfc_trans_create_temp_array): Remove loop argument.
* trans-array.c (gfc_trans_create_temp_array): Ditto. Get loop from ss.
Update reference to loop. Remove loop argument.
(gfc_trans_array_constructor, gfc_conv_loop_setup): Update calls to
gfc_trans_create_temp_array.
* trans-expr.c (gfc_conv_procedure_call): Ditto.
* trans-intrinsic.c (gfc_conv_intrinsic_transfer): Ditto.
* trans-stmt.c (gfc_conv_elemental_dependencies): Ditto.
Set loop before calling gfc_trans_create_temp_array.
2011-11-03 Mikael Morin <mikael@gcc.gnu.org> 2011-11-03 Mikael Morin <mikael@gcc.gnu.org>
* trans-array.c (gfc_trans_create_temp_array): New variable total_dim. * trans-array.c (gfc_trans_create_temp_array): New variable total_dim.

23
gcc/fortran/trans-array.c
View File

@ -888,15 +888,14 @@ get_array_ref_dim (gfc_ss *ss, int loop_dim)
callee allocated array. callee allocated array.
PRE, POST, INITIAL, DYNAMIC and DEALLOC are as for PRE, POST, INITIAL, DYNAMIC and DEALLOC are as for
gfc_trans_allocate_array_storage. gfc_trans_allocate_array_storage. */
*/
tree tree
gfc_trans_create_temp_array (stmtblock_t * pre, stmtblock_t * post, gfc_trans_create_temp_array (stmtblock_t * pre, stmtblock_t * post, gfc_ss * ss,
gfc_loopinfo * loop, gfc_ss * ss,
tree eltype, tree initial, bool dynamic, tree eltype, tree initial, bool dynamic,
bool dealloc, bool callee_alloc, locus * where) bool dealloc, bool callee_alloc, locus * where)
{ {
gfc_loopinfo *loop;
gfc_array_info *info; gfc_array_info *info;
tree from[GFC_MAX_DIMENSIONS], to[GFC_MAX_DIMENSIONS]; tree from[GFC_MAX_DIMENSIONS], to[GFC_MAX_DIMENSIONS];
tree type; tree type;
@ -915,11 +914,12 @@ gfc_trans_create_temp_array (stmtblock_t * pre, stmtblock_t * post,
info = &ss->info->data.array; info = &ss->info->data.array;
gcc_assert (ss->dimen > 0); gcc_assert (ss->dimen > 0);
gcc_assert (loop->dimen == ss->dimen); gcc_assert (ss->loop->dimen == ss->dimen);
if (gfc_option.warn_array_temp && where) if (gfc_option.warn_array_temp && where)
gfc_warning ("Creating array temporary at %L", where); gfc_warning ("Creating array temporary at %L", where);
loop = ss->loop;
total_dim = loop->dimen; total_dim = loop->dimen;
/* Set the lower bound to zero. */ /* Set the lower bound to zero. */
for (n = 0; n < loop->dimen; n++) for (n = 0; n < loop->dimen; n++)
@ -1065,8 +1065,8 @@ gfc_trans_create_temp_array (stmtblock_t * pre, stmtblock_t * post,
gfc_trans_allocate_array_storage (pre, post, info, size, nelem, initial, gfc_trans_allocate_array_storage (pre, post, info, size, nelem, initial,
dynamic, dealloc); dynamic, dealloc);
if (ss->dimen > loop->temp_dim) if (ss->dimen > ss->loop->temp_dim)
loop->temp_dim = ss->dimen; ss->loop->temp_dim = ss->dimen;
return size; return size;
} }
@ -2113,8 +2113,8 @@ trans_array_constructor (gfc_ss * ss, locus * where)
if (TREE_CODE (loop->to[0]) == VAR_DECL) if (TREE_CODE (loop->to[0]) == VAR_DECL)
dynamic = true; dynamic = true;
gfc_trans_create_temp_array (&loop->pre, &loop->post, loop, ss, gfc_trans_create_temp_array (&loop->pre, &loop->post, ss, type, NULL_TREE,
type, NULL_TREE, dynamic, true, false, where); dynamic, true, false, where);
desc = ss_info->data.array.descriptor; desc = ss_info->data.array.descriptor;
offset = gfc_index_zero_node; offset = gfc_index_zero_node;
@ -4211,9 +4211,8 @@ gfc_conv_loop_setup (gfc_loopinfo * loop, locus * where)
gcc_assert (tmp_ss->dimen != 0); gcc_assert (tmp_ss->dimen != 0);
gfc_trans_create_temp_array (&loop->pre, &loop->post, loop, gfc_trans_create_temp_array (&loop->pre, &loop->post, tmp_ss, tmp,
tmp_ss, tmp, NULL_TREE, NULL_TREE, false, true, false, where);
false, true, false, where);
} }
/* For array parameters we don't have loop variables, so don't calculate the /* For array parameters we don't have loop variables, so don't calculate the

5
gcc/fortran/trans-array.h
View File

@ -31,9 +31,8 @@ void gfc_set_loop_bounds_from_array_spec (gfc_interface_mapping *,
gfc_se *, gfc_array_spec *); gfc_se *, gfc_array_spec *);
/* Generate code to create a temporary array. */ /* Generate code to create a temporary array. */
tree gfc_trans_create_temp_array (stmtblock_t *, stmtblock_t *, gfc_loopinfo *, tree gfc_trans_create_temp_array (stmtblock_t *, stmtblock_t *, gfc_ss *,
gfc_ss *, tree, tree, bool, bool, bool, tree, tree, bool, bool, bool, locus *);
locus *);
/* Generate function entry code for allocation of compiler allocated array /* Generate function entry code for allocation of compiler allocated array
variables. */ variables. */

4
gcc/fortran/trans-expr.c
View File

@ -3606,7 +3606,7 @@ gfc_conv_procedure_call (gfc_se * se, gfc_symbol * sym,
returns a pointer, the temporary will be a shallow copy and returns a pointer, the temporary will be a shallow copy and
mustn't be deallocated. */ mustn't be deallocated. */
callee_alloc = comp->attr.allocatable || comp->attr.pointer; callee_alloc = comp->attr.allocatable || comp->attr.pointer;
gfc_trans_create_temp_array (&se->pre, &se->post, se->loop, se->ss, gfc_trans_create_temp_array (&se->pre, &se->post, se->ss,
tmp, NULL_TREE, false, tmp, NULL_TREE, false,
!comp->attr.pointer, callee_alloc, !comp->attr.pointer, callee_alloc,
&se->ss->info->expr->where); &se->ss->info->expr->where);
@ -3642,7 +3642,7 @@ gfc_conv_procedure_call (gfc_se * se, gfc_symbol * sym,
returns a pointer, the temporary will be a shallow copy and returns a pointer, the temporary will be a shallow copy and
mustn't be deallocated. */ mustn't be deallocated. */
callee_alloc = sym->attr.allocatable || sym->attr.pointer; callee_alloc = sym->attr.allocatable || sym->attr.pointer;
gfc_trans_create_temp_array (&se->pre, &se->post, se->loop, se->ss, gfc_trans_create_temp_array (&se->pre, &se->post, se->ss,
tmp, NULL_TREE, false, tmp, NULL_TREE, false,
!sym->attr.pointer, callee_alloc, !sym->attr.pointer, callee_alloc,
&se->ss->info->expr->where); &se->ss->info->expr->where);

5
gcc/fortran/trans-intrinsic.c
View File

@ -5501,9 +5501,8 @@ gfc_conv_intrinsic_transfer (gfc_se * se, gfc_expr * expr)
/* Build a destination descriptor, using the pointer, source, as the /* Build a destination descriptor, using the pointer, source, as the
data field. */ data field. */
gfc_trans_create_temp_array (&se->pre, &se->post, se->loop, gfc_trans_create_temp_array (&se->pre, &se->post, se->ss, mold_type,
se->ss, mold_type, NULL_TREE, false, true, false, NULL_TREE, false, true, false, &expr->where);
&expr->where);
/* Cast the pointer to the result. */ /* Cast the pointer to the result. */
tmp = gfc_conv_descriptor_data_get (info->descriptor); tmp = gfc_conv_descriptor_data_get (info->descriptor);

9
gcc/fortran/trans-stmt.c
View File

@ -309,11 +309,10 @@ gfc_conv_elemental_dependencies (gfc_se * se, gfc_se * loopse,
size = gfc_create_var (gfc_array_index_type, NULL); size = gfc_create_var (gfc_array_index_type, NULL);
data = gfc_create_var (pvoid_type_node, NULL); data = gfc_create_var (pvoid_type_node, NULL);
gfc_init_block (&temp_post); gfc_init_block (&temp_post);
tmp = gfc_trans_create_temp_array (&se->pre, &temp_post, ss->loop = &tmp_loop;
&tmp_loop, ss, temptype, tmp = gfc_trans_create_temp_array (&se->pre, &temp_post, ss,
initial, temptype, initial, false, true,
false, true, false, false, &arg->expr->where);
&arg->expr->where);
gfc_add_modify (&se->pre, size, tmp); gfc_add_modify (&se->pre, size, tmp);
tmp = fold_convert (pvoid_type_node, info->data); tmp = fold_convert (pvoid_type_node, info->data);
gfc_add_modify (&se->pre, data, tmp); gfc_add_modify (&se->pre, data, tmp);