]> granicus.if.org Git - php/commitdiff
Mark ifunc resolver functions as unused
authorNikita Popov <nikita.ppv@gmail.com>
Fri, 28 Jun 2019 14:55:54 +0000 (16:55 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Fri, 28 Jun 2019 14:55:54 +0000 (16:55 +0200)
It looks like clang doesn't see that these are used through
__attribute__((ifunc)) and generates a warning.

ext/standard/base64.c
ext/standard/string.c

index 3286b7d30d9911321eed74b616d7526d11bb05f3..c181d8228b68b6afc30c44d8e0b548b33e307707 100644 (file)
@@ -217,6 +217,7 @@ PHPAPI zend_string *php_base64_encode(const unsigned char *str, size_t length) _
 PHPAPI zend_string *php_base64_decode_ex(const unsigned char *str, size_t length, zend_bool strict) __attribute__((ifunc("resolve_base64_decode")));
 
 ZEND_NO_SANITIZE_ADDRESS
+ZEND_ATTRIBUTE_UNUSED /* clang mistakenly warns about this */
 static void *resolve_base64_encode() {
 # if ZEND_INTRIN_AVX2_FUNC_PROTO
        if (zend_cpu_supports_avx2()) {
@@ -232,6 +233,7 @@ static void *resolve_base64_encode() {
 }
 
 ZEND_NO_SANITIZE_ADDRESS
+ZEND_ATTRIBUTE_UNUSED /* clang mistakenly warns about this */
 static void *resolve_base64_decode() {
 # if ZEND_INTRIN_AVX2_FUNC_PROTO
        if (zend_cpu_supports_avx2()) {
index f8b808d1adbfb6f20bbb43f33ad91179e5d5fc5c..d097be78b789d2be8373d8e6255241dc95b9eab4 100644 (file)
@@ -3881,6 +3881,7 @@ PHPAPI zend_string *php_addslashes(zend_string *str) __attribute__((ifunc("resol
 PHPAPI void php_stripslashes(zend_string *str) __attribute__((ifunc("resolve_stripslashes")));
 
 ZEND_NO_SANITIZE_ADDRESS
+ZEND_ATTRIBUTE_UNUSED /* clang mistakenly warns about this */
 static void *resolve_addslashes() {
        if (zend_cpu_supports_sse42()) {
                return php_addslashes_sse42;
@@ -3889,6 +3890,7 @@ static void *resolve_addslashes() {
 }
 
 ZEND_NO_SANITIZE_ADDRESS
+ZEND_ATTRIBUTE_UNUSED /* clang mistakenly warns about this */
 static void *resolve_stripslashes() {
        if (zend_cpu_supports_sse42()) {
                return php_stripslashes_sse42;