Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix iov_base pointer type for illumos

diff --cc ext/opcache/zend_file_cache.c
index b46edcb0650eb84c32cd0e8a3b2c460e97ceefee,8b6ebd9fe71de579d5048284572ad3de0ce9ef92..8edd70a256eb80c816788324e2b3343ce71360b3
--- 1/ext/opcache/zend_file_cache.c
--- 2/ext/opcache/zend_file_cache.c
+++ b/ext/opcache/zend_file_cache.c
@@@ -934,16 -869,8 +934,16 @@@ int zend_file_cache_script_store(zend_p
        info.checksum = zend_adler32(ADLER32_INIT, buf, script->size);
        info.checksum = zend_adler32(info.checksum, (unsigned char*)ZSTR_VAL((zend_string*)ZCG(mem)), info.str_size);
  
 +#if __has_feature(memory_sanitizer)
 +      /* The buffer may contain uninitialized regions. However, the uninitialized parts will not be
 +       * used when reading the cache. We should probably still try to get things fully initialized
 +       * for reproducibility, but for now ignore this issue. */
 +      __msan_unpoison(&info, sizeof(info));
 +      __msan_unpoison(buf, script->size);
 +#endif
 +
  #ifdef HAVE_SYS_UIO_H
-       vec[0].iov_base = &info;
+       vec[0].iov_base = (void *)&info;
        vec[0].iov_len = sizeof(info);
        vec[1].iov_base = buf;
        vec[1].iov_len = script->size;