From: Nikita Popov Date: Mon, 1 Jul 2019 08:44:44 +0000 (+0200) Subject: Don't use fast_memcpy under msan X-Git-Tag: php-7.4.0alpha3~102 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c8af6a7fa70c0722e1a87d48d69e236f4ed7b0e5;p=php Don't use fast_memcpy under msan --- diff --git a/ext/opcache/zend_accelerator_util_funcs.c b/ext/opcache/zend_accelerator_util_funcs.c index 9692b4023c..be927f6447 100644 --- a/ext/opcache/zend_accelerator_util_funcs.c +++ b/ext/opcache/zend_accelerator_util_funcs.c @@ -572,7 +572,9 @@ static void zend_accel_class_hash_copy_from_shm(HashTable *target, HashTable *so return; } -#if defined(__AVX__) +#if __has_feature(memory_sanitizer) +# define fast_memcpy memcpy +#elif defined(__AVX__) # include # if defined(__GNUC__) && defined(__i386__) static zend_always_inline void fast_memcpy(void *dest, const void *src, size_t size)