Just enumerate all GF_OMP_FOR_KIND_* and GF_OMP_TARGET_KIND_*.

	gcc/
	* gimple.h (enum gf_mask): Rewrite "<< 0" shift expressions used
	for GF_OMP_FOR_KIND_MASK, GF_OMP_FOR_KIND_FOR,
	GF_OMP_FOR_KIND_DISTRIBUTE, GF_OMP_FOR_KIND_SIMD,
	GF_OMP_FOR_KIND_CILKSIMD, GF_OMP_TARGET_KIND_MASK,
	GF_OMP_TARGET_KIND_REGION, GF_OMP_TARGET_KIND_DATA,
	GF_OMP_TARGET_KIND_UPDATE.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@210854 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d351c0b..fa2f3c3 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,12 @@
 2014-05-23  Thomas Schwinge  <thomas@codesourcery.com>
 
+       * gimple.h (enum gf_mask): Rewrite "<< 0" shift expressions used
+       for GF_OMP_FOR_KIND_MASK, GF_OMP_FOR_KIND_FOR,
+       GF_OMP_FOR_KIND_DISTRIBUTE, GF_OMP_FOR_KIND_SIMD,
+       GF_OMP_FOR_KIND_CILKSIMD, GF_OMP_TARGET_KIND_MASK,
+       GF_OMP_TARGET_KIND_REGION, GF_OMP_TARGET_KIND_DATA,
+       GF_OMP_TARGET_KIND_UPDATE.
+
        * gimplify.c (omp_notice_variable) <case OMP_CLAUSE_DEFAULT_NONE>:
        Explicitly enumerate the expected region types.
 

diff --git a/gcc/gimple.h b/gcc/gimple.h
index 9df45de..b1970e5 100644 (file)
--- a/gcc/gimple.h
+++ b/gcc/gimple.h
@@ -91,17 +91,17 @@ enum gf_mask {
     GF_CALL_ALLOCA_FOR_VAR     = 1 << 5,
     GF_CALL_INTERNAL           = 1 << 6,
     GF_OMP_PARALLEL_COMBINED   = 1 << 0,
-    GF_OMP_FOR_KIND_MASK       = 3 << 0,
-    GF_OMP_FOR_KIND_FOR                = 0 << 0,
-    GF_OMP_FOR_KIND_DISTRIBUTE = 1 << 0,
-    GF_OMP_FOR_KIND_SIMD       = 2 << 0,
-    GF_OMP_FOR_KIND_CILKSIMD   = 3 << 0,
+    GF_OMP_FOR_KIND_MASK       = (1 << 2) - 1,
+    GF_OMP_FOR_KIND_FOR                = 0,
+    GF_OMP_FOR_KIND_DISTRIBUTE = 1,
+    GF_OMP_FOR_KIND_SIMD       = 2,
+    GF_OMP_FOR_KIND_CILKSIMD   = 3,
     GF_OMP_FOR_COMBINED                = 1 << 2,
     GF_OMP_FOR_COMBINED_INTO   = 1 << 3,
-    GF_OMP_TARGET_KIND_MASK    = 3 << 0,
-    GF_OMP_TARGET_KIND_REGION  = 0 << 0,
-    GF_OMP_TARGET_KIND_DATA    = 1 << 0,
-    GF_OMP_TARGET_KIND_UPDATE  = 2 << 0,
+    GF_OMP_TARGET_KIND_MASK    = (1 << 2) - 1,
+    GF_OMP_TARGET_KIND_REGION  = 0,
+    GF_OMP_TARGET_KIND_DATA    = 1,
+    GF_OMP_TARGET_KIND_UPDATE  = 2,
 
     /* True on an GIMPLE_OMP_RETURN statement if the return does not require
        a thread synchronization via some sort of barrier.  The exact barrier