Re: [gomp4] openacc default handling

[Thomas Schwinge]

Hi!

On Wed, 29 Jul 2015 19:13:01 -0400, Nathan Sidwell <nat...@acm.org> wrote:
>       gcc/
>       * gimplify.c (oacc_default_clause): Outer scope searching moved to
>       omp_notice_variable.
>       (omp_notice_variable): For OpenACC search enclosing scopes before
>       applying default.

Committed to gomp-4_0-branch in r226495:

commit 9446d5a23e74653407f079188e8be4bc9343e15e
Author: tschwinge <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4>
Date:   Mon Aug 3 11:06:38 2015 +0000

    Resolve bootstrap failure in oacc_default_clause
    
        [...]/source-gcc/gcc/gimplify.c: In function 'unsigned int 
oacc_default_clause(gimplify_omp_ctx*, tree, bool, unsigned int)':
        [...]/source-gcc/gcc/gimplify.c:5913:13: error: unused parameter 
'in_code' [-Werror=unused-parameter]
                bool in_code, unsigned flags)
                     ^
    
    Fixup for r226373.
    
        gcc/
        * gimplify.c (oacc_default_clause): Remove in_code formal
        parameter.  Adjust all users.
    
    git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gomp-4_0-branch@226495 
138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/ChangeLog.gomp |    5 +++++
 gcc/gimplify.c     |    5 ++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git gcc/ChangeLog.gomp gcc/ChangeLog.gomp
index 3b907ea..a30f6a3 100644
--- gcc/ChangeLog.gomp
+++ gcc/ChangeLog.gomp
@@ -1,3 +1,8 @@
+2015-08-03  Thomas Schwinge  <tho...@codesourcery.com>
+
+       * gimplify.c (oacc_default_clause): Remove in_code formal
+       parameter.  Adjust all users.
+
 2015-08-02  Nathan Sidwell  <nat...@codesourcery.com>
 
        * omp-low.c (oacc_xform_on_device): New function.
diff --git gcc/gimplify.c gcc/gimplify.c
index 0f8011d..f74f842 100644
--- gcc/gimplify.c
+++ gcc/gimplify.c
@@ -5909,8 +5909,7 @@ device_resident_p (tree decl)
    but not declared in an enclosing clause.  */
 
 static unsigned
-oacc_default_clause (struct gimplify_omp_ctx *ctx, tree decl,
-                    bool in_code, unsigned flags)
+oacc_default_clause (struct gimplify_omp_ctx *ctx, tree decl, unsigned flags)
 {
   switch (ctx->default_kind)
     {
@@ -6036,7 +6035,7 @@ omp_notice_variable (struct gimplify_omp_ctx *ctx, tree 
decl, bool in_code)
            }
 
          if (is_oacc)
-           flags = oacc_default_clause (ctx, decl, in_code, flags);
+           flags = oacc_default_clause (ctx, decl, flags);
          else
            flags |= GOVD_MAP;
 


Grüße,
 Thomas

signature.asc
Description: PGP signature