From: Thomas Schwinge <thomas@codesourcery.com>
Date: Fri, 23 May 2014 12:06:48 +0000 (+0200)
Subject: Be a bit less explicit.
X-Git-Tag: releases/gcc-5.1.0~7331
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=09af4b4c423bf47d4b7dbcf1fc8ebd31a3a1769d;p=thirdparty%2Fgcc.git

Be a bit less explicit.

	gcc/
	* gimplify.c (omp_notice_variable) <case OMP_CLAUSE_DEFAULT_NONE>:
	Rewrite check for ORT_PARALLEL and ORT_COMBINED_PARALLEL.

From-SVN: r210860
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3d74b6f97c20..397893d9682d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,8 @@
 2014-05-23  Thomas Schwinge  <thomas@codesourcery.com>
 
+	* gimplify.c (omp_notice_variable) <case OMP_CLAUSE_DEFAULT_NONE>:
+	Rewrite check for ORT_PARALLEL and ORT_COMBINED_PARALLEL.
+
 	* omp-low.c (expand_omp_for_static_chunk): Rename variable si to
 	gsi, and variables v_* to v*.
 
diff --git a/gcc/gimplify.c b/gcc/gimplify.c
index 39b27507174e..654b05c09c97 100644
--- a/gcc/gimplify.c
+++ b/gcc/gimplify.c
@@ -5683,8 +5683,7 @@ omp_notice_variable (struct gimplify_omp_ctx *ctx, tree decl, bool in_code)
       switch (default_kind)
 	{
 	case OMP_CLAUSE_DEFAULT_NONE:
-	  if (ctx->region_type == ORT_PARALLEL
-	      || ctx->region_type == ORT_COMBINED_PARALLEL)
+	  if ((ctx->region_type & ORT_PARALLEL) != 0)
 	    {
 	      error ("%qE not specified in enclosing parallel",
 		     DECL_NAME (lang_hooks.decls.omp_report_decl (decl)));