1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QSimd: clean up some -Wundef warnings

Browse Source 
While the whole qsimd_p.h file is suppressing -Wundef, the
compiler-supports macros are being used elsewhere, and triggering
warnings in other people's code (qhash.cpp, qfloat16.cpp, etc.).

Amend those macros to do the usual `defined(x) && x` check instead of
just checking for `x`.

Technically speaking expansion to defined is UB, but expansion of
functions is OK on our supported toolchains (we're testing for it).

Task-number: QTBUG-132900
Change-Id: I22b76d49aa32afde7f86d4261ccb33442219ac68
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Giuseppe D'Angelo 2025-01-17 16:58:16 +01:00
parent 42ea8c31fe
commit 79a2cc13f4
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/corelib/global/qsimd_p.h
View File

@ -97,10 +97,10 @@ QT_WARNING_DISABLE_INTEL(103)
#include <intrin.h>
#endif
#define QT_COMPILER_SUPPORTS(x) (QT_COMPILER_SUPPORTS_ ## x - 0)
#define QT_COMPILER_SUPPORTS(x) (defined QT_COMPILER_SUPPORTS_##x && QT_COMPILER_SUPPORTS_##x)
#if defined(Q_PROCESSOR_ARM_64)
# define QT_COMPILER_SUPPORTS_HERE(x) ((__ARM_FEATURE_ ## x) || (__ ## x ## __) || QT_COMPILER_SUPPORTS(x))
# define QT_COMPILER_SUPPORTS_HERE(x) ((defined __ARM_FEATURE_##x && __ARM_FEATURE_##x) || (defined __##x##__ && __##x##__) || QT_COMPILER_SUPPORTS(x))
# if defined(Q_CC_GNU) || defined(Q_CC_CLANG)
/* GCC requires attributes for a function */
# define QT_FUNCTION_TARGET(x) __attribute__((__target__(QT_FUNCTION_TARGET_STRING_ ## x)))
@ -109,10 +109,10 @@ QT_WARNING_DISABLE_INTEL(103)
# endif
#elif defined(Q_PROCESSOR_ARM_32)
/* We do not support for runtime CPU feature switching on ARM32 */
# define QT_COMPILER_SUPPORTS_HERE(x) ((__ARM_FEATURE_ ## x) || (__ ## x ## __))
# define QT_COMPILER_SUPPORTS_HERE(x) ((defined __ARM_FEATURE_##x && __ARM_FEATURE_##x) || (defined __##x##__ && __##x##__))
# define QT_FUNCTION_TARGET(x)
#elif defined(Q_PROCESSOR_MIPS)
# define QT_COMPILER_SUPPORTS_HERE(x) (__ ## x ## __)
# define QT_COMPILER_SUPPORTS_HERE(x) (defined __##x##__ && __##x##__)
# define QT_FUNCTION_TARGET(x)
# if !defined(__MIPS_DSP__) && defined(__mips_dsp) && defined(Q_PROCESSOR_MIPS_32)
# define __MIPS_DSP__
@ -125,9 +125,9 @@ QT_WARNING_DISABLE_INTEL(103)
# define QT_FUNCTION_TARGET(x)
#elif defined(Q_PROCESSOR_X86)
# if defined(Q_CC_CLANG) && defined(Q_CC_MSVC) && (Q_CC_CLANG < 1900)
# define QT_COMPILER_SUPPORTS_HERE(x) (__ ## x ## __)
# define QT_COMPILER_SUPPORTS_HERE(x) (defined __##x##__ && __##x##__)
# else
# define QT_COMPILER_SUPPORTS_HERE(x) ((__ ## x ## __) || QT_COMPILER_SUPPORTS(x))
# define QT_COMPILER_SUPPORTS_HERE(x) ((defined __##x##__ && __##x##__) || QT_COMPILER_SUPPORTS(x))
# endif
# if defined(Q_CC_GNU) || defined(Q_CC_CLANG)
/* GCC requires attributes for a function */
@ -136,7 +136,7 @@ QT_WARNING_DISABLE_INTEL(103)
# define QT_FUNCTION_TARGET(x)
# endif
#else
# define QT_COMPILER_SUPPORTS_HERE(x) (__ ## x ## __)
# define QT_COMPILER_SUPPORTS_HERE(x) (defined __##x##__ && __##x##__)
# define QT_FUNCTION_TARGET(x)
#endif