summaryrefslogtreecommitdiff
path: root/Zend/zend_portability.h
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2019-11-07 13:08:03 +0100
committerNikita Popov <nikita.ppv@gmail.com>2019-11-07 13:08:03 +0100
commitdacadf5aa36cc8e90accc05eb5d8a8d9fe231db2 (patch)
tree348475dda926e4d8937819a6a41759426059733b /Zend/zend_portability.h
parentd3d85cbcc189f3e2322f656534d093e263b80e2e (diff)
downloadphp-git-dacadf5aa36cc8e90accc05eb5d8a8d9fe231db2.tar.gz
Disable ifunc resolvers under thread sanitizer as well
Diffstat (limited to 'Zend/zend_portability.h')
-rw-r--r--Zend/zend_portability.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_portability.h b/Zend/zend_portability.h
index 1e549d300b..dd518aebbb 100644
--- a/Zend/zend_portability.h
+++ b/Zend/zend_portability.h
@@ -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