Use GC_FLAGS_SHIFT in a few more places

Rather than hardcoding 8.

diff --git a/Zend/zend_string.h b/Zend/zend_string.h
index 2bbcdb80a80e65af9c36e25453fefe893004ed38..fc6321d965c73715069504944769d5259fb9d2af 100644 (file)
--- a/Zend/zend_string.h
+++ b/Zend/zend_string.h
@@ -138,7 +138,7 @@ static zend_always_inline zend_string *zend_string_alloc(size_t len, int persist
        GC_SET_REFCOUNT(ret, 1);
 #if 1
        /* optimized single assignment */
-       GC_TYPE_INFO(ret) = IS_STRING | ((persistent ? IS_STR_PERSISTENT : 0) << 8);
+       GC_TYPE_INFO(ret) = IS_STRING | ((persistent ? IS_STR_PERSISTENT : 0) << GC_FLAGS_SHIFT);
 #else
        GC_TYPE(ret) = IS_STRING;
        GC_FLAGS(ret) = (persistent ? IS_STR_PERSISTENT : 0);
@@ -156,7 +156,7 @@ static zend_always_inline zend_string *zend_string_safe_alloc(size_t n, size_t m
        GC_SET_REFCOUNT(ret, 1);
 #if 1
        /* optimized single assignment */
-       GC_TYPE_INFO(ret) = IS_STRING | ((persistent ? IS_STR_PERSISTENT : 0) << 8);
+       GC_TYPE_INFO(ret) = IS_STRING | ((persistent ? IS_STR_PERSISTENT : 0) << GC_FLAGS_SHIFT);
 #else
        GC_TYPE(ret) = IS_STRING;
        GC_FLAGS(ret) = (persistent ? IS_STR_PERSISTENT : 0);

diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c
index a06bc00070f80f5a713b3eea60a433c8d474d1d5..b99927cbf273e211cd14cbc9c0087aa248f16812 100644 (file)
--- a/ext/opcache/ZendAccelerator.c
+++ b/ext/opcache/ZendAccelerator.c
@@ -482,7 +482,7 @@ zend_string *accel_new_interned_string(zend_string *str)
        GC_SET_REFCOUNT(s, 1);
 #if 1
        /* optimized single assignment */
-       GC_TYPE_INFO(s) = IS_STRING | ((IS_STR_INTERNED | IS_STR_PERMANENT) << 8);
+       GC_TYPE_INFO(s) = IS_STRING | ((IS_STR_INTERNED | IS_STR_PERMANENT) << GC_FLAGS_SHIFT);
 #else
        GC_TYPE(s) = IS_STRING;
        GC_FLAGS(s) = IS_STR_INTERNED | IS_STR_PERMANENT;

diff --git a/ext/opcache/zend_file_cache.c b/ext/opcache/zend_file_cache.c
index 0378351120d3b067b85581b6f9198a9d04225407..16f59b6eaa8b8bcbe68e14b9495a1d9a4c340873 100644 (file)
--- a/ext/opcache/zend_file_cache.c
+++ b/ext/opcache/zend_file_cache.c
@@ -237,7 +237,7 @@ static void *zend_file_cache_unserialize_interned(zend_string *str, int in_shm)
                        memcpy(ret, str, size);
                        /* String wasn't interned but we will use it as interned anyway */
                        GC_SET_REFCOUNT(ret, 1);
-                       GC_TYPE_INFO(ret) = IS_STRING | ((IS_STR_INTERNED | IS_STR_PERSISTENT | IS_STR_PERMANENT) << 8);
+                       GC_TYPE_INFO(ret) = IS_STRING | ((IS_STR_INTERNED | IS_STR_PERSISTENT | IS_STR_PERMANENT) << GC_FLAGS_SHIFT);
                }
        } else {
                ret = str;

diff --git a/ext/opcache/zend_persist.c b/ext/opcache/zend_persist.c
index a6792aa1ffeaaf5fa80a27f3fd07a6a30ac946f5..7e916b12c19d9ddf6e8b49ad20c9319b311cfd0c 100644 (file)
--- a/ext/opcache/zend_persist.c
+++ b/ext/opcache/zend_persist.c
@@ -371,7 +371,7 @@ static void zend_persist_op_array_ex(zend_op_array *op_array, zend_persistent_sc
                        zend_accel_store(op_array->static_variables, sizeof(HashTable));
                        /* make immutable array */
                        GC_SET_REFCOUNT(op_array->static_variables, 2);
-                       GC_TYPE_INFO(op_array->static_variables) = IS_ARRAY | (IS_ARRAY_IMMUTABLE << 8);
+                       GC_TYPE_INFO(op_array->static_variables) = IS_ARRAY | (IS_ARRAY_IMMUTABLE << GC_FLAGS_SHIFT);
                        op_array->static_variables->u.flags |= HASH_FLAG_STATIC_KEYS;
                }
        }