From: Nikita Popov <nikita.ppv@gmail.com>
Date: Thu, 7 Nov 2019 12:08:03 +0000 (+0100)
Subject: Disable ifunc resolvers under thread sanitizer as well
X-Git-Tag: php-7.4.7RC1~517
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dacadf5aa36cc8e90accc05eb5d8a8d9fe231db2;p=php

Disable ifunc resolvers under thread sanitizer as well
---

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