Commit 121c82c9 by Mikael Morin

trans-array.h (gfc_free_ss, [...]): New prototypes.

	* trans-array.h (gfc_free_ss, gfc_set_delta): New prototypes.
	* trans-array.c (gfc_free_ss): Remove forward declaration.
	Make non-static.
	(set_delta, gfc_set_delta): Remove forward declaration.
	Make non-static and rename the former to the later. Update uses.

From-SVN: r180905
parent 9645e798
2011-11-04 Mikael Morin <mikael@gcc.gnu.org>
* trans-array.h (gfc_free_ss, gfc_set_delta): New prototypes.
* trans-array.c (gfc_free_ss): Remove forward declaration.
Make non-static.
(set_delta, gfc_set_delta): Remove forward declaration.
Make non-static and rename the former to the later. Update uses.
2011-11-03 Mikael Morin <mikael@gcc.gnu.org> 2011-11-03 Mikael Morin <mikael@gcc.gnu.org>
* trans.h (gfc_inline_intrinsic_function_p): Move prototype... * trans.h (gfc_inline_intrinsic_function_p): Move prototype...
......
...@@ -466,8 +466,6 @@ gfc_mark_ss_chain_used (gfc_ss * ss, unsigned flags) ...@@ -466,8 +466,6 @@ gfc_mark_ss_chain_used (gfc_ss * ss, unsigned flags)
ss->info->useflags = flags; ss->info->useflags = flags;
} }
static void gfc_free_ss (gfc_ss *);
/* Free a gfc_ss chain. */ /* Free a gfc_ss chain. */
...@@ -500,7 +498,7 @@ free_ss_info (gfc_ss_info *ss_info) ...@@ -500,7 +498,7 @@ free_ss_info (gfc_ss_info *ss_info)
/* Free a SS. */ /* Free a SS. */
static void void
gfc_free_ss (gfc_ss * ss) gfc_free_ss (gfc_ss * ss)
{ {
gfc_ss_info *ss_info; gfc_ss_info *ss_info;
...@@ -1027,7 +1025,7 @@ gfc_trans_create_temp_array (stmtblock_t * pre, stmtblock_t * post, gfc_ss * ss, ...@@ -1027,7 +1025,7 @@ gfc_trans_create_temp_array (stmtblock_t * pre, stmtblock_t * post, gfc_ss * ss,
/* We have just changed the loop bounds, we must clear the /* We have just changed the loop bounds, we must clear the
corresponding specloop, so that delta calculation is not skipped corresponding specloop, so that delta calculation is not skipped
later in set_delta. */ later in gfc_set_delta. */
loop->specloop[n] = NULL; loop->specloop[n] = NULL;
/* We are constructing the temporary's descriptor based on the loop /* We are constructing the temporary's descriptor based on the loop
...@@ -4372,9 +4370,6 @@ set_loop_bounds (gfc_loopinfo *loop) ...@@ -4372,9 +4370,6 @@ set_loop_bounds (gfc_loopinfo *loop)
} }
static void set_delta (gfc_loopinfo *loop);
/* Initialize the scalarization loop. Creates the loop variables. Determines /* Initialize the scalarization loop. Creates the loop variables. Determines
the range of the loop variables. Creates a temporary if required. the range of the loop variables. Creates a temporary if required.
Also generates code for scalar expressions which have been Also generates code for scalar expressions which have been
...@@ -4422,10 +4417,8 @@ gfc_conv_loop_setup (gfc_loopinfo * loop, locus * where) ...@@ -4422,10 +4417,8 @@ gfc_conv_loop_setup (gfc_loopinfo * loop, locus * 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
translations. */ translations. */
if (loop->array_parameter) if (!loop->array_parameter)
return; gfc_set_delta (loop);
set_delta (loop);
} }
...@@ -4433,8 +4426,8 @@ gfc_conv_loop_setup (gfc_loopinfo * loop, locus * where) ...@@ -4433,8 +4426,8 @@ gfc_conv_loop_setup (gfc_loopinfo * loop, locus * where)
array: once loop bounds are chosen, sets the difference (DELTA field) between array: once loop bounds are chosen, sets the difference (DELTA field) between
loop bounds and array reference bounds, for each array info. */ loop bounds and array reference bounds, for each array info. */
static void void
set_delta (gfc_loopinfo *loop) gfc_set_delta (gfc_loopinfo *loop)
{ {
gfc_ss *ss, **loopspec; gfc_ss *ss, **loopspec;
gfc_array_info *info; gfc_array_info *info;
...@@ -4482,7 +4475,7 @@ set_delta (gfc_loopinfo *loop) ...@@ -4482,7 +4475,7 @@ set_delta (gfc_loopinfo *loop)
} }
for (loop = loop->nested; loop; loop = loop->next) for (loop = loop->nested; loop; loop = loop->next)
set_delta (loop); gfc_set_delta (loop);
} }
......
...@@ -88,6 +88,8 @@ void gfc_add_ss_to_loop (gfc_loopinfo *, gfc_ss *); ...@@ -88,6 +88,8 @@ void gfc_add_ss_to_loop (gfc_loopinfo *, gfc_ss *);
void gfc_mark_ss_chain_used (gfc_ss *, unsigned); void gfc_mark_ss_chain_used (gfc_ss *, unsigned);
/* Free a gfc_ss chain. */ /* Free a gfc_ss chain. */
void gfc_free_ss_chain (gfc_ss *); void gfc_free_ss_chain (gfc_ss *);
/* Free a single gfc_ss element. */
void gfc_free_ss (gfc_ss *);
/* Allocate a new array type ss. */ /* Allocate a new array type ss. */
gfc_ss *gfc_get_array_ss (gfc_ss *, gfc_expr *, int, gfc_ss_type); gfc_ss *gfc_get_array_ss (gfc_ss *, gfc_expr *, int, gfc_ss_type);
/* Allocate a new temporary type ss. */ /* Allocate a new temporary type ss. */
...@@ -111,6 +113,8 @@ void gfc_trans_scalarizing_loops (gfc_loopinfo *, stmtblock_t *); ...@@ -111,6 +113,8 @@ void gfc_trans_scalarizing_loops (gfc_loopinfo *, stmtblock_t *);
void gfc_trans_scalarized_loop_boundary (gfc_loopinfo *, stmtblock_t *); void gfc_trans_scalarized_loop_boundary (gfc_loopinfo *, stmtblock_t *);
/* Initialize the scalarization loop parameters. */ /* Initialize the scalarization loop parameters. */
void gfc_conv_loop_setup (gfc_loopinfo *, locus *); void gfc_conv_loop_setup (gfc_loopinfo *, locus *);
/* Set each array's delta. */
void gfc_set_delta (gfc_loopinfo *);
/* Resolve array assignment dependencies. */ /* Resolve array assignment dependencies. */
void gfc_conv_resolve_dependencies (gfc_loopinfo *, gfc_ss *, gfc_ss *); void gfc_conv_resolve_dependencies (gfc_loopinfo *, gfc_ss *, gfc_ss *);
/* Build a null array descriptor constructor. */ /* Build a null array descriptor constructor. */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment