archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

More precise ifunc resolver return type

Browse source 
Fixes -Wattribute-alias warning.
This commit is contained in:
Nikita Popov 2020-04-15 10:41:19 +02:00
parent fb718ccc7e
commit 7643cf1996
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ext/standard/base64.c
View file

@ -383,9 +383,12 @@ zend_string *php_base64_decode_ex_default(const unsigned char *str, size_t lengt
PHPAPI zend_string *php_base64_encode(const unsigned char *str, size_t length) __attribute__((ifunc("resolve_base64_encode"))); PHPAPI zend_string *php_base64_encode(const unsigned char *str, size_t length) __attribute__((ifunc("resolve_base64_encode")));
PHPAPI zend_string *php_base64_decode_ex(const unsigned char *str, size_t length, zend_bool strict) __attribute__((ifunc("resolve_base64_decode"))); PHPAPI zend_string *php_base64_decode_ex(const unsigned char *str, size_t length, zend_bool strict) __attribute__((ifunc("resolve_base64_decode")));
typedef zend_string *(*base64_encode_func_t)(const unsigned char *, size_t);
typedef zend_string *(*base64_decode_func_t)(const unsigned char *, size_t, zend_bool);
ZEND_NO_SANITIZE_ADDRESS ZEND_NO_SANITIZE_ADDRESS
ZEND_ATTRIBUTE_UNUSED /* clang mistakenly warns about this */ ZEND_ATTRIBUTE_UNUSED /* clang mistakenly warns about this */
static void *resolve_base64_encode() { static base64_encode_func_t resolve_base64_encode() {
# if ZEND_INTRIN_AVX2_FUNC_PROTO # if ZEND_INTRIN_AVX2_FUNC_PROTO
if (zend_cpu_supports_avx2()) { if (zend_cpu_supports_avx2()) {
return php_base64_encode_avx2; return php_base64_encode_avx2;
@ -401,7 +404,7 @@ static void *resolve_base64_encode() {
ZEND_NO_SANITIZE_ADDRESS ZEND_NO_SANITIZE_ADDRESS
ZEND_ATTRIBUTE_UNUSED /* clang mistakenly warns about this */ ZEND_ATTRIBUTE_UNUSED /* clang mistakenly warns about this */
static void *resolve_base64_decode() { static base64_decode_func_t resolve_base64_decode() {
# if ZEND_INTRIN_AVX2_FUNC_PROTO # if ZEND_INTRIN_AVX2_FUNC_PROTO
if (zend_cpu_supports_avx2()) { if (zend_cpu_supports_avx2()) {
return php_base64_decode_ex_avx2; return php_base64_decode_ex_avx2;