]> granicus.if.org Git - php/commitdiff
Disable ifunc resolvers under thread sanitizer as well
authorNikita Popov <nikita.ppv@gmail.com>
Thu, 7 Nov 2019 12:08:03 +0000 (13:08 +0100)
committerNikita Popov <nikita.ppv@gmail.com>
Thu, 7 Nov 2019 12:08:03 +0000 (13:08 +0100)
Zend/zend_portability.h

index 1e549d300be84e68636b516b0fff5f704702a7d6..dd518aebbb345e168acc06b10bc0dfd68cb4ad7e 100644 (file)
@@ -523,7 +523,7 @@ static zend_always_inline double _zend_get_nan(void) /* {{{ */
 
 /* Memory sanitizer is incompatible with ifunc resolvers. Even if the resolver
  * is marked as no_sanitize("memory") it will still be instrumented and crash. */
-#if __has_feature(memory_sanitizer)
+#if __has_feature(memory_sanitizer) || __has_feature(thread_sanitizer)
 # undef HAVE_FUNC_ATTRIBUTE_IFUNC
 #endif