diff options
author | Mikael Morin <mikael@gcc.gnu.org> | 2011-11-04 00:00:23 +0000 |
---|---|---|
committer | Mikael Morin <mikael@gcc.gnu.org> | 2011-11-04 00:00:23 +0000 |
commit | 121c82c9ac5c8af04d480de4b2449fbdb5e2beae (patch) | |
tree | 9c555e59113feaf25333c0c251aad66d51eef9eb /gcc | |
parent | 9645e798ba137f3edab0c560f679a433b2a460b6 (diff) | |
download | gcc-121c82c9ac5c8af04d480de4b2449fbdb5e2beae.zip gcc-121c82c9ac5c8af04d480de4b2449fbdb5e2beae.tar.gz gcc-121c82c9ac5c8af04d480de4b2449fbdb5e2beae.tar.bz2 |
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
Diffstat (limited to 'gcc')
-rw-r--r-- | gcc/fortran/ChangeLog | 8 | ||||
-rw-r--r-- | gcc/fortran/trans-array.c | 21 | ||||
-rw-r--r-- | gcc/fortran/trans-array.h | 4 |
3 files changed, 19 insertions, 14 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index a1faa78..9a8fee0 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,11 @@ +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> * trans.h (gfc_inline_intrinsic_function_p): Move prototype... diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c index 3c0c110..acd9aec 100644 --- a/gcc/fortran/trans-array.c +++ b/gcc/fortran/trans-array.c @@ -466,8 +466,6 @@ gfc_mark_ss_chain_used (gfc_ss * ss, unsigned flags) ss->info->useflags = flags; } -static void gfc_free_ss (gfc_ss *); - /* Free a gfc_ss chain. */ @@ -500,7 +498,7 @@ free_ss_info (gfc_ss_info *ss_info) /* Free a SS. */ -static void +void gfc_free_ss (gfc_ss * ss) { gfc_ss_info *ss_info; @@ -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 corresponding specloop, so that delta calculation is not skipped - later in set_delta. */ + later in gfc_set_delta. */ loop->specloop[n] = NULL; /* We are constructing the temporary's descriptor based on the 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 the range of the loop variables. Creates a temporary if required. Also generates code for scalar expressions which have been @@ -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 translations. */ - if (loop->array_parameter) - return; - - set_delta (loop); + if (!loop->array_parameter) + gfc_set_delta (loop); } @@ -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 loop bounds and array reference bounds, for each array info. */ -static void -set_delta (gfc_loopinfo *loop) +void +gfc_set_delta (gfc_loopinfo *loop) { gfc_ss *ss, **loopspec; gfc_array_info *info; @@ -4482,7 +4475,7 @@ set_delta (gfc_loopinfo *loop) } for (loop = loop->nested; loop; loop = loop->next) - set_delta (loop); + gfc_set_delta (loop); } diff --git a/gcc/fortran/trans-array.h b/gcc/fortran/trans-array.h index aad8c47..bd593bd 100644 --- a/gcc/fortran/trans-array.h +++ b/gcc/fortran/trans-array.h @@ -88,6 +88,8 @@ void gfc_add_ss_to_loop (gfc_loopinfo *, gfc_ss *); void gfc_mark_ss_chain_used (gfc_ss *, unsigned); /* Free a gfc_ss chain. */ 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. */ gfc_ss *gfc_get_array_ss (gfc_ss *, gfc_expr *, int, gfc_ss_type); /* Allocate a new temporary type ss. */ @@ -111,6 +113,8 @@ void gfc_trans_scalarizing_loops (gfc_loopinfo *, stmtblock_t *); void gfc_trans_scalarized_loop_boundary (gfc_loopinfo *, stmtblock_t *); /* Initialize the scalarization loop parameters. */ void gfc_conv_loop_setup (gfc_loopinfo *, locus *); +/* Set each array's delta. */ +void gfc_set_delta (gfc_loopinfo *); /* Resolve array assignment dependencies. */ void gfc_conv_resolve_dependencies (gfc_loopinfo *, gfc_ss *, gfc_ss *); /* Build a null array descriptor constructor. */ |