Remove CE cache from non-interned file cache strings

Author: arnaud-lb

ext/opcache/zend_file_cache.c

@@ -134,18 +134,23 @@ static int zend_file_cache_flock(int fd, int type)
 			(ptr) = (void*)((char*)buf + (size_t)(ptr)); \
 		} \
 	} while (0)
+
 #define SERIALIZE_STR(ptr) do { \
 		if (ptr) { \
 			if (IS_ACCEL_INTERNED(ptr)) { \
 				(ptr) = zend_file_cache_serialize_interned((zend_string*)(ptr), info); \
 			} else { \
 				ZEND_ASSERT(IS_UNSERIALIZED(ptr)); \
+				(ptr) = (void*)((char*)(ptr) - (char*)script->mem); \
+				zend_string *__new_str = (zend_string*)((char*)buf + (uintptr_t)(ptr)); \
 				/* script->corrupted shows if the script in SHM or not */ \
 				if (EXPECTED(script->corrupted)) { \
-					GC_ADD_FLAGS(ptr, IS_STR_INTERNED); \
-					GC_DEL_FLAGS(ptr, IS_STR_PERMANENT); \
+					GC_ADD_FLAGS(__new_str, IS_STR_INTERNED); \
+					GC_DEL_FLAGS(__new_str, IS_STR_PERMANENT); \
+				} else { \
+					GC_ADD_FLAGS(__new_str, IS_STR_INTERNED | IS_STR_PERMANENT); \
 				} \
-				(ptr) = (void*)((char*)(ptr) - (char*)script->mem); \
+				GC_DEL_FLAGS(__new_str, IS_STR_CLASS_NAME_MAP_PTR); \
 			} \
 		} \
 	} while (0)
@@ -156,13 +161,6 @@ static int zend_file_cache_flock(int fd, int type)
 			} else { \
 				ZEND_ASSERT(IS_SERIALIZED(ptr)); \
 				(ptr) = (void*)((char*)buf + (size_t)(ptr)); \
-				/* script->corrupted shows if the script in SHM or not */ \
-				if (EXPECTED(!script->corrupted)) { \
-					GC_ADD_FLAGS(ptr, IS_STR_INTERNED | IS_STR_PERMANENT); \
-				} else { \
-					GC_ADD_FLAGS(ptr, IS_STR_INTERNED); \
-					GC_DEL_FLAGS(ptr, IS_STR_PERMANENT); \
-				} \
 			} \
 		} \
 	} while (0)