archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Avoid MSVC unused variable warning in FastZPP

Browse source 
MSVC doesn't support __attribute__((unused)), so this can cause
a lot of warnings for extensions. Use the (void) trick instead.
However, this requires us to initialize the variable as well,
to ensure that ubsan does not read a trap representation.
This commit is contained in:
Nikita Popov 2021-06-08 10:12:21 +02:00
parent 1671996ed7
commit 3ee6a4b35f
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Zend/zend_API.h
View file

@ -1282,7 +1282,7 @@ ZEND_API ZEND_COLD void zend_argument_value_error(uint32_t arg_num, const char *
zval *_real_arg, *_arg = NULL; \ zval *_real_arg, *_arg = NULL; \
zend_expected_type _expected_type = Z_EXPECTED_LONG; \ zend_expected_type _expected_type = Z_EXPECTED_LONG; \
char *_error = NULL; \ char *_error = NULL; \
ZEND_ATTRIBUTE_UNUSED zend_bool _dummy; \ zend_bool _dummy = 0; \
zend_bool _optional = 0; \ zend_bool _optional = 0; \
int _error_code = ZPP_ERROR_OK; \ int _error_code = ZPP_ERROR_OK; \
((void)_i); \ ((void)_i); \
@ -1291,6 +1291,7 @@ ZEND_API ZEND_COLD void zend_argument_value_error(uint32_t arg_num, const char *
((void)_expected_type); \ ((void)_expected_type); \
((void)_error); \ ((void)_error); \
((void)_optional); \ ((void)_optional); \
((void)_dummy); \
\ \
do { \ do { \
if (UNEXPECTED(_num_args < _min_num_args) || \ if (UNEXPECTED(_num_args < _min_num_args) || \