[Fortran,4/7] Fortran: make some trans-array functions static

Message ID 20211024223023.1410274-5-rep.dot.nop@gmail.com
State Committed
Commit a470bfccf1432454c6922014716f3e797d480026
Headers
Series delete some unused decls, make static |

Commit Message

Bernhard Reutner-Fischer Oct. 24, 2021, 10:30 p.m. UTC
  From: Bernhard Reutner-Fischer <aldot@gcc.gnu.org>

gcc/fortran/ChangeLog:

	* trans-array.c (gfc_trans_scalarized_loop_end): Make static.
	* trans-array.h (gfc_trans_scalarized_loop_end,
	gfc_conv_tmp_ref, gfc_conv_array_transpose): Delete declaration.
---
 gcc/fortran/trans-array.c | 2 +-
 gcc/fortran/trans-array.h | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)
  

Comments

Tobias Burnus Oct. 26, 2021, 9:39 a.m. UTC | #1
On 25.10.21 00:30, Bernhard Reutner-Fischer via Fortran wrote:
> From: Bernhard Reutner-Fischer <aldot@gcc.gnu.org>
>
> gcc/fortran/ChangeLog:
>
>       * trans-array.c (gfc_trans_scalarized_loop_end): Make static.
>       * trans-array.h (gfc_trans_scalarized_loop_end,
>       gfc_conv_tmp_ref, gfc_conv_array_transpose): Delete declaration.

(the later are declared but no longer exist)

OK. Thanks for the cleanup!

Tobias

> ---
>   gcc/fortran/trans-array.c | 2 +-
>   gcc/fortran/trans-array.h | 6 ------
>   2 files changed, 1 insertion(+), 7 deletions(-)
>
> diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c
> index bceb8b24ba4..5ceb261b698 100644
> --- a/gcc/fortran/trans-array.c
> +++ b/gcc/fortran/trans-array.c
> @@ -4161,7 +4161,7 @@ gfc_start_scalarized_body (gfc_loopinfo * loop, stmtblock_t * pbody)
>
>   /* Generates the actual loop code for a scalarization loop.  */
>
> -void
> +static void
>   gfc_trans_scalarized_loop_end (gfc_loopinfo * loop, int n,
>                              stmtblock_t * pbody)
>   {
> diff --git a/gcc/fortran/trans-array.h b/gcc/fortran/trans-array.h
> index 1d3dc4819eb..12068c742a5 100644
> --- a/gcc/fortran/trans-array.h
> +++ b/gcc/fortran/trans-array.h
> @@ -118,8 +118,6 @@ void gfc_copy_loopinfo_to_se (gfc_se *, gfc_loopinfo *);
>
>   /* Marks the start of a scalarized expression, and declares loop variables.  */
>   void gfc_start_scalarized_body (gfc_loopinfo *, stmtblock_t *);
> -/* Generates one actual loop for a scalarized expression.  */
> -void  gfc_trans_scalarized_loop_end (gfc_loopinfo *, int, stmtblock_t *);
>   /* Generates the actual loops for a scalarized expression.  */
>   void gfc_trans_scalarizing_loops (gfc_loopinfo *, stmtblock_t *);
>   /* Mark the end of the main loop body and the start of the copying loop.  */
> @@ -137,8 +135,6 @@ tree gfc_build_null_descriptor (tree);
>   void gfc_conv_array_ref (gfc_se *, gfc_array_ref *, gfc_expr *, locus *);
>   /* Translate a reference to a temporary array.  */
>   void gfc_conv_tmp_array_ref (gfc_se * se);
> -/* Translate a reference to an array temporary.  */
> -void gfc_conv_tmp_ref (gfc_se *);
>
>   /* Calculate the overall offset, including subreferences.  */
>   void gfc_get_dataptr_offset (stmtblock_t*, tree, tree, tree, bool, gfc_expr*);
> @@ -149,8 +145,6 @@ void gfc_conv_expr_descriptor (gfc_se *, gfc_expr *);
>   /* Convert an array for passing as an actual function parameter.  */
>   void gfc_conv_array_parameter (gfc_se *, gfc_expr *, bool,
>                              const gfc_symbol *, const char *, tree *);
> -/* Evaluate and transpose a matrix expression.  */
> -void gfc_conv_array_transpose (gfc_se *, gfc_expr *);
>
>   /* These work with both descriptors and descriptorless arrays.  */
>   tree gfc_conv_array_data (tree);
-----------------
Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstraße 201, 80634 München; Gesellschaft mit beschränkter Haftung; Geschäftsführer: Thomas Heurung, Frank Thürauf; Sitz der Gesellschaft: München; Registergericht München, HRB 106955
  

Patch

diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c
index bceb8b24ba4..5ceb261b698 100644
--- a/gcc/fortran/trans-array.c
+++ b/gcc/fortran/trans-array.c
@@ -4161,7 +4161,7 @@  gfc_start_scalarized_body (gfc_loopinfo * loop, stmtblock_t * pbody)
 
 /* Generates the actual loop code for a scalarization loop.  */
 
-void
+static void
 gfc_trans_scalarized_loop_end (gfc_loopinfo * loop, int n,
 			       stmtblock_t * pbody)
 {
diff --git a/gcc/fortran/trans-array.h b/gcc/fortran/trans-array.h
index 1d3dc4819eb..12068c742a5 100644
--- a/gcc/fortran/trans-array.h
+++ b/gcc/fortran/trans-array.h
@@ -118,8 +118,6 @@  void gfc_copy_loopinfo_to_se (gfc_se *, gfc_loopinfo *);
 
 /* Marks the start of a scalarized expression, and declares loop variables.  */
 void gfc_start_scalarized_body (gfc_loopinfo *, stmtblock_t *);
-/* Generates one actual loop for a scalarized expression.  */
-void  gfc_trans_scalarized_loop_end (gfc_loopinfo *, int, stmtblock_t *);
 /* Generates the actual loops for a scalarized expression.  */
 void gfc_trans_scalarizing_loops (gfc_loopinfo *, stmtblock_t *);
 /* Mark the end of the main loop body and the start of the copying loop.  */
@@ -137,8 +135,6 @@  tree gfc_build_null_descriptor (tree);
 void gfc_conv_array_ref (gfc_se *, gfc_array_ref *, gfc_expr *, locus *);
 /* Translate a reference to a temporary array.  */
 void gfc_conv_tmp_array_ref (gfc_se * se);
-/* Translate a reference to an array temporary.  */
-void gfc_conv_tmp_ref (gfc_se *);
 
 /* Calculate the overall offset, including subreferences.  */
 void gfc_get_dataptr_offset (stmtblock_t*, tree, tree, tree, bool, gfc_expr*);
@@ -149,8 +145,6 @@  void gfc_conv_expr_descriptor (gfc_se *, gfc_expr *);
 /* Convert an array for passing as an actual function parameter.  */
 void gfc_conv_array_parameter (gfc_se *, gfc_expr *, bool,
 			       const gfc_symbol *, const char *, tree *);
-/* Evaluate and transpose a matrix expression.  */
-void gfc_conv_array_transpose (gfc_se *, gfc_expr *);
 
 /* These work with both descriptors and descriptorless arrays.  */
 tree gfc_conv_array_data (tree);