Fix ext/opcache

Author: marc-mabe

ext/opcache/zend_file_cache.c

@@ -271,7 +271,7 @@ static void *zend_file_cache_serialize_interned(zend_string              *str,
 	}
 
 	len = ZEND_MM_ALIGNED_SIZE(_ZSTR_STRUCT_SIZE(ZSTR_LEN(str)));
-	ret = (void*)(info->str_size | Z_UL(1));
+	ret = (void*)(info->str_size | 1);
 	zend_shared_alloc_register_xlat_entry(str, ret);
 
 	zend_string *s = (zend_string*)ZCG(mem);

ext/opcache/zend_shared_alloc.c

@@ -403,7 +403,7 @@ static zend_always_inline zend_ulong zend_rotr3(zend_ulong key)
 int zend_shared_memdup_size(void *source, size_t size)
 {
 	void *old_p;
-	zend_ulong key = (zend_ulong)source;
+	zend_ulong key = (zend_ulong)(uintptr_t)source;
 
 	key = zend_rotr3(key);
 	if ((old_p = zend_hash_index_find_ptr(&ZCG(xlat_table), key)) != NULL) {
@@ -420,7 +420,7 @@ static zend_always_inline void *_zend_shared_memdup(void *source, size_t size, b
 	zend_ulong key;
 
 	if (get_xlat) {
-		key = (zend_ulong)source;
+		key = (zend_ulong)(uintptr_t)source;
 		key = zend_rotr3(key);
 		if ((old_p = zend_hash_index_find_ptr(&ZCG(xlat_table), key)) != NULL) {
 			/* we already duplicated this pointer */
@@ -432,7 +432,7 @@ static zend_always_inline void *_zend_shared_memdup(void *source, size_t size, b
 	memcpy(retval, source, size);
 	if (set_xlat) {
 		if (!get_xlat) {
-			key = (zend_ulong)source;
+			key = (zend_ulong)(uintptr_t)source;
 			key = zend_rotr3(key);
 		}
 		zend_hash_index_add_new_ptr(&ZCG(xlat_table), key, retval);
@@ -575,7 +575,7 @@ void zend_shared_alloc_restore_xlat_table(uint32_t checkpoint)
 
 void zend_shared_alloc_register_xlat_entry(const void *key_pointer, const void *value)
 {
-	zend_ulong key = (zend_ulong)key_pointer;
+	zend_ulong key = (zend_ulong)(uintptr_t)key_pointer;
 
 	key = zend_rotr3(key);
 	zend_hash_index_add_new_ptr(&ZCG(xlat_table), key, (void*)value);
@@ -584,7 +584,7 @@ void zend_shared_alloc_register_xlat_entry(const void *key_pointer, const void *
 void *zend_shared_alloc_get_xlat_entry(const void *key_pointer)
 {
 	void *retval;
-	zend_ulong key = (zend_ulong)key_pointer;
+	zend_ulong key = (zend_ulong)(uintptr_t)key_pointer;
 
 	key = zend_rotr3(key);
 	if ((retval = zend_hash_index_find_ptr(&ZCG(xlat_table), key)) == NULL) {