Remove unused "default_kind" member from gcc/omp-low.c's "struct omp_context"

Remove unused "default_kind" member from gcc/omp-low.c's "struct omp_context"

[Thomas Schwinge]

Hi!

It would appear that ever since the first version of gcc/omp-low.c got
committed to GCC trunk (more than ten years ago), it extraced OpenMP
default clause data that it doesn't actually use for anything.  OK to
commit the following cleanup to trunk in next stage 1?

commit cd157ff348694009f4043b84f47de8c62774931f
Author: Thomas Schwinge <thomas@codesourcery.com>
Date:   Fri Mar 31 15:26:55 2017 +0200

    Remove unused "default_kind" member from gcc/omp-low.c's "struct omp_context"
    
            gcc/
            * omp-low.c (struct omp_context): Remove "default_kind" member.
            Adjust all users.
---
 gcc/omp-low.c | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git gcc/omp-low.c gcc/omp-low.c
index 253dc85..d794e00 100644
--- gcc/omp-low.c
+++ gcc/omp-low.c
@@ -112,10 +112,6 @@ struct omp_context
      otherwise.  */
   gimple *simt_stmt;
 
-  /* What to do with variables with implicitly determined sharing
-     attributes.  */
-  enum omp_clause_default_kind default_kind;
-
   /* Nesting depth of this context.  Used to beautify error messages re
      invalid gotos.  The outermost ctx is depth 1, with depth 0 being
      reserved for the main body of the function.  */
@@ -1162,10 +1158,6 @@ scan_sharing_clauses (tree clauses, omp_context *ctx,
 	  install_var_field (decl, by_ref, 3, ctx);
 	  break;
 
-	case OMP_CLAUSE_DEFAULT:
-	  ctx->default_kind = OMP_CLAUSE_DEFAULT_KIND (c);
-	  break;
-
 	case OMP_CLAUSE_FINAL:
 	case OMP_CLAUSE_IF:
 	case OMP_CLAUSE_NUM_THREADS:
@@ -1332,6 +1324,7 @@ scan_sharing_clauses (tree clauses, omp_context *ctx,
 	case OMP_CLAUSE_SEQ:
 	case OMP_CLAUSE_TILE:
 	case OMP_CLAUSE__SIMT_:
+	case OMP_CLAUSE_DEFAULT:
 	  break;
 
 	case OMP_CLAUSE_ALIGNED:
@@ -1826,7 +1819,6 @@ scan_omp_parallel (gimple_stmt_iterator *gsi, omp_context *outer_ctx)
   if (taskreg_nesting_level > 1)
     ctx->is_nested = true;
   ctx->field_map = splay_tree_new (splay_tree_compare_pointers, 0, 0);
-  ctx->default_kind = OMP_CLAUSE_DEFAULT_SHARED;
   ctx->record_type = lang_hooks.types.make_type (RECORD_TYPE);
   name = create_tmp_var_name (".omp_data_s");
   name = build_decl (gimple_location (stmt),
@@ -1873,7 +1865,6 @@ scan_omp_task (gimple_stmt_iterator *gsi, omp_context *outer_ctx)
   if (taskreg_nesting_level > 1)
     ctx->is_nested = true;
   ctx->field_map = splay_tree_new (splay_tree_compare_pointers, 0, 0);
-  ctx->default_kind = OMP_CLAUSE_DEFAULT_SHARED;
   ctx->record_type = lang_hooks.types.make_type (RECORD_TYPE);
   name = create_tmp_var_name (".omp_data_s");
   name = build_decl (gimple_location (stmt),
@@ -2360,7 +2351,6 @@ scan_omp_target (gomp_target *stmt, omp_context *outer_ctx)
 
   ctx = new_omp_context (stmt, outer_ctx);
   ctx->field_map = splay_tree_new (splay_tree_compare_pointers, 0, 0);
-  ctx->default_kind = OMP_CLAUSE_DEFAULT_SHARED;
   ctx->record_type = lang_hooks.types.make_type (RECORD_TYPE);
   name = create_tmp_var_name (".omp_data_t");
   name = build_decl (gimple_location (stmt),


Grüße
 Thomas

Re: Remove unused "default_kind" member from gcc/omp-low.c's "struct omp_context"

[Thomas Schwinge]

Hi!

Ping.

On Fri, 31 Mar 2017 17:05:29 +0200, I wrote:
> It would appear that ever since the first version of gcc/omp-low.c got
> committed to GCC trunk (more than ten years ago), it extraced OpenMP
> default clause data that it doesn't actually use for anything.  OK to
> commit the following cleanup to trunk in next stage 1?
> 
> commit cd157ff348694009f4043b84f47de8c62774931f
> Author: Thomas Schwinge <thomas@codesourcery.com>
> Date:   Fri Mar 31 15:26:55 2017 +0200
> 
>     Remove unused "default_kind" member from gcc/omp-low.c's "struct omp_context"
>     
>             gcc/
>             * omp-low.c (struct omp_context): Remove "default_kind" member.
>             Adjust all users.
> ---
>  gcc/omp-low.c | 12 +-----------
>  1 file changed, 1 insertion(+), 11 deletions(-)
> 
> diff --git gcc/omp-low.c gcc/omp-low.c
> index 253dc85..d794e00 100644
> --- gcc/omp-low.c
> +++ gcc/omp-low.c
> @@ -112,10 +112,6 @@ struct omp_context
>       otherwise.  */
>    gimple *simt_stmt;
>  
> -  /* What to do with variables with implicitly determined sharing
> -     attributes.  */
> -  enum omp_clause_default_kind default_kind;
> -
>    /* Nesting depth of this context.  Used to beautify error messages re
>       invalid gotos.  The outermost ctx is depth 1, with depth 0 being
>       reserved for the main body of the function.  */
> @@ -1162,10 +1158,6 @@ scan_sharing_clauses (tree clauses, omp_context *ctx,
>  	  install_var_field (decl, by_ref, 3, ctx);
>  	  break;
>  
> -	case OMP_CLAUSE_DEFAULT:
> -	  ctx->default_kind = OMP_CLAUSE_DEFAULT_KIND (c);
> -	  break;
> -
>  	case OMP_CLAUSE_FINAL:
>  	case OMP_CLAUSE_IF:
>  	case OMP_CLAUSE_NUM_THREADS:
> @@ -1332,6 +1324,7 @@ scan_sharing_clauses (tree clauses, omp_context *ctx,
>  	case OMP_CLAUSE_SEQ:
>  	case OMP_CLAUSE_TILE:
>  	case OMP_CLAUSE__SIMT_:
> +	case OMP_CLAUSE_DEFAULT:
>  	  break;
>  
>  	case OMP_CLAUSE_ALIGNED:
> @@ -1826,7 +1819,6 @@ scan_omp_parallel (gimple_stmt_iterator *gsi, omp_context *outer_ctx)
>    if (taskreg_nesting_level > 1)
>      ctx->is_nested = true;
>    ctx->field_map = splay_tree_new (splay_tree_compare_pointers, 0, 0);
> -  ctx->default_kind = OMP_CLAUSE_DEFAULT_SHARED;
>    ctx->record_type = lang_hooks.types.make_type (RECORD_TYPE);
>    name = create_tmp_var_name (".omp_data_s");
>    name = build_decl (gimple_location (stmt),
> @@ -1873,7 +1865,6 @@ scan_omp_task (gimple_stmt_iterator *gsi, omp_context *outer_ctx)
>    if (taskreg_nesting_level > 1)
>      ctx->is_nested = true;
>    ctx->field_map = splay_tree_new (splay_tree_compare_pointers, 0, 0);
> -  ctx->default_kind = OMP_CLAUSE_DEFAULT_SHARED;
>    ctx->record_type = lang_hooks.types.make_type (RECORD_TYPE);
>    name = create_tmp_var_name (".omp_data_s");
>    name = build_decl (gimple_location (stmt),
> @@ -2360,7 +2351,6 @@ scan_omp_target (gomp_target *stmt, omp_context *outer_ctx)
>  
>    ctx = new_omp_context (stmt, outer_ctx);
>    ctx->field_map = splay_tree_new (splay_tree_compare_pointers, 0, 0);
> -  ctx->default_kind = OMP_CLAUSE_DEFAULT_SHARED;
>    ctx->record_type = lang_hooks.types.make_type (RECORD_TYPE);
>    name = create_tmp_var_name (".omp_data_t");
>    name = build_decl (gimple_location (stmt),


Grüße
 Thomas

Re: Remove unused "default_kind" member from gcc/omp-low.c's "struct omp_context"

[Jakub Jelinek]

On Fri, Mar 31, 2017 at 05:05:29PM +0200, Thomas Schwinge wrote:
> It would appear that ever since the first version of gcc/omp-low.c got
> committed to GCC trunk (more than ten years ago), it extraced OpenMP
> default clause data that it doesn't actually use for anything.  OK to

The last use of that field went away with
https://gcc.gnu.org/ml/gcc-patches/2005-10/msg01828.html

> commit the following cleanup to trunk in next stage 1?
> 
> commit cd157ff348694009f4043b84f47de8c62774931f
> Author: Thomas Schwinge <thomas@codesourcery.com>
> Date:   Fri Mar 31 15:26:55 2017 +0200
> 
>     Remove unused "default_kind" member from gcc/omp-low.c's "struct omp_context"
>     
>             gcc/
>             * omp-low.c (struct omp_context): Remove "default_kind" member.
>             Adjust all users.

Ok for trunk.

	Jakub

Re: Remove unused "default_kind" member from gcc/omp-low.c's "struct omp_context"

[Thomas Schwinge]

Hi!

On Tue, 23 May 2017 12:36:18 +0200, Jakub Jelinek <jakub@redhat.com> wrote:
> On Fri, Mar 31, 2017 at 05:05:29PM +0200, Thomas Schwinge wrote:
> >     Remove unused "default_kind" member from gcc/omp-low.c's "struct omp_context"

> Ok for trunk.

Thanks.  As posted, committed to trunk in r248372:

commit 093c94dd910ff55efb5e1bb38cc8020ee488c1e9
Author: tschwinge <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4>
Date:   Tue May 23 16:00:56 2017 +0000

    Remove unused "default_kind" member from gcc/omp-low.c's "struct omp_context"
    
            gcc/
            * omp-low.c (struct omp_context): Remove "default_kind" member.
            Adjust all users.
    
    git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@248372 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/ChangeLog |  3 +++
 gcc/omp-low.c | 12 +-----------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git gcc/ChangeLog gcc/ChangeLog
index b38a31d..b626515 100644
--- gcc/ChangeLog
+++ gcc/ChangeLog
@@ -1,5 +1,8 @@
 2017-05-23  Thomas Schwinge  <thomas@codesourcery.com>
 
+	* omp-low.c (struct omp_context): Remove "default_kind" member.
+	Adjust all users.
+
 	* omp-offload.c (execute_oacc_device_lower): Remove the
 	parallelism dimensions function attributes for unparallelized
 	OpenACC kernels constructs.
diff --git gcc/omp-low.c gcc/omp-low.c
index 968075c..9a16248 100644
--- gcc/omp-low.c
+++ gcc/omp-low.c
@@ -112,10 +112,6 @@ struct omp_context
      otherwise.  */
   gimple *simt_stmt;
 
-  /* What to do with variables with implicitly determined sharing
-     attributes.  */
-  enum omp_clause_default_kind default_kind;
-
   /* Nesting depth of this context.  Used to beautify error messages re
      invalid gotos.  The outermost ctx is depth 1, with depth 0 being
      reserved for the main body of the function.  */
@@ -1162,10 +1158,6 @@ scan_sharing_clauses (tree clauses, omp_context *ctx,
 	  install_var_field (decl, by_ref, 3, ctx);
 	  break;
 
-	case OMP_CLAUSE_DEFAULT:
-	  ctx->default_kind = OMP_CLAUSE_DEFAULT_KIND (c);
-	  break;
-
 	case OMP_CLAUSE_FINAL:
 	case OMP_CLAUSE_IF:
 	case OMP_CLAUSE_NUM_THREADS:
@@ -1332,6 +1324,7 @@ scan_sharing_clauses (tree clauses, omp_context *ctx,
 	case OMP_CLAUSE_SEQ:
 	case OMP_CLAUSE_TILE:
 	case OMP_CLAUSE__SIMT_:
+	case OMP_CLAUSE_DEFAULT:
 	  break;
 
 	case OMP_CLAUSE_ALIGNED:
@@ -1826,7 +1819,6 @@ scan_omp_parallel (gimple_stmt_iterator *gsi, omp_context *outer_ctx)
   if (taskreg_nesting_level > 1)
     ctx->is_nested = true;
   ctx->field_map = splay_tree_new (splay_tree_compare_pointers, 0, 0);
-  ctx->default_kind = OMP_CLAUSE_DEFAULT_SHARED;
   ctx->record_type = lang_hooks.types.make_type (RECORD_TYPE);
   name = create_tmp_var_name (".omp_data_s");
   name = build_decl (gimple_location (stmt),
@@ -1875,7 +1867,6 @@ scan_omp_task (gimple_stmt_iterator *gsi, omp_context *outer_ctx)
   if (taskreg_nesting_level > 1)
     ctx->is_nested = true;
   ctx->field_map = splay_tree_new (splay_tree_compare_pointers, 0, 0);
-  ctx->default_kind = OMP_CLAUSE_DEFAULT_SHARED;
   ctx->record_type = lang_hooks.types.make_type (RECORD_TYPE);
   name = create_tmp_var_name (".omp_data_s");
   name = build_decl (gimple_location (stmt),
@@ -2390,7 +2381,6 @@ scan_omp_target (gomp_target *stmt, omp_context *outer_ctx)
 
   ctx = new_omp_context (stmt, outer_ctx);
   ctx->field_map = splay_tree_new (splay_tree_compare_pointers, 0, 0);
-  ctx->default_kind = OMP_CLAUSE_DEFAULT_SHARED;
   ctx->record_type = lang_hooks.types.make_type (RECORD_TYPE);
   name = create_tmp_var_name (".omp_data_t");
   name = build_decl (gimple_location (stmt),


Grüße
 Thomas