OpenACC: Fix struct-component-kind-1.c test

Message ID 20221001075659.63410-1-julian@codesourcery.com
State Accepted, archived
Headers
Series OpenACC: Fix struct-component-kind-1.c test |

Checks

Context Check Description
snail/gcc-patch-check success Github commit url

Commit Message

Julian Brown Oct. 1, 2022, 7:56 a.m. UTC
  This patch is a minimal fix for the recently-added
struct-component-kind-1.c test (which is currently failing to emit one
of the errors it expects in scan output). This fragment was erroneously omitted from the second version of the patch posted previously:

  https://gcc.gnu.org/pipermail/gcc-patches/2022-September/602504.html

Re-tested with offloading to NVPTX. OK?

Thanks,

Julian

2022-10-01  Julian Brown  <julian@codesourcery.com>

gcc/
	* gimplify.cc (omp_group_base): Fix IF_PRESENT (no_create)
	handling.
---
 gcc/gimplify.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
  

Comments

Jakub Jelinek Oct. 1, 2022, 8:35 a.m. UTC | #1
On Sat, Oct 01, 2022 at 12:56:59AM -0700, Julian Brown wrote:
> This patch is a minimal fix for the recently-added
> struct-component-kind-1.c test (which is currently failing to emit one
> of the errors it expects in scan output). This fragment was erroneously omitted from the second version of the patch posted previously:
> 
>   https://gcc.gnu.org/pipermail/gcc-patches/2022-September/602504.html
> 
> Re-tested with offloading to NVPTX. OK?
> 
> Thanks,
> 
> Julian
> 
> 2022-10-01  Julian Brown  <julian@codesourcery.com>
> 
> gcc/
> 	* gimplify.cc (omp_group_base): Fix IF_PRESENT (no_create)
> 	handling.

Ok.

> ---
>  gcc/gimplify.cc | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/gcc/gimplify.cc b/gcc/gimplify.cc
> index 90606088128..9e0e3429958 100644
> --- a/gcc/gimplify.cc
> +++ b/gcc/gimplify.cc
> @@ -9245,6 +9245,7 @@ omp_group_base (omp_mapping_group *grp, unsigned int *chained,
>      case GOMP_MAP_RELEASE:
>      case GOMP_MAP_DELETE:
>      case GOMP_MAP_FORCE_ALLOC:
> +    case GOMP_MAP_IF_PRESENT:
>        if (node == grp->grp_end)
>  	return node;
>  
> @@ -9323,7 +9324,6 @@ omp_group_base (omp_mapping_group *grp, unsigned int *chained,
>      case GOMP_MAP_FORCE_DEVICEPTR:
>      case GOMP_MAP_DEVICE_RESIDENT:
>      case GOMP_MAP_LINK:
> -    case GOMP_MAP_IF_PRESENT:
>      case GOMP_MAP_FIRSTPRIVATE:
>      case GOMP_MAP_FIRSTPRIVATE_INT:
>      case GOMP_MAP_USE_DEVICE_PTR:
> -- 
> 2.29.2

	Jakub
  

Patch

diff --git a/gcc/gimplify.cc b/gcc/gimplify.cc
index 90606088128..9e0e3429958 100644
--- a/gcc/gimplify.cc
+++ b/gcc/gimplify.cc
@@ -9245,6 +9245,7 @@  omp_group_base (omp_mapping_group *grp, unsigned int *chained,
     case GOMP_MAP_RELEASE:
     case GOMP_MAP_DELETE:
     case GOMP_MAP_FORCE_ALLOC:
+    case GOMP_MAP_IF_PRESENT:
       if (node == grp->grp_end)
 	return node;
 
@@ -9323,7 +9324,6 @@  omp_group_base (omp_mapping_group *grp, unsigned int *chained,
     case GOMP_MAP_FORCE_DEVICEPTR:
     case GOMP_MAP_DEVICE_RESIDENT:
     case GOMP_MAP_LINK:
-    case GOMP_MAP_IF_PRESENT:
     case GOMP_MAP_FIRSTPRIVATE:
     case GOMP_MAP_FIRSTPRIVATE_INT:
     case GOMP_MAP_USE_DEVICE_PTR: