coverity: provide Coverity-friendly MIN_CONST and MAX_CONST
PATCH v2 1/1 coverity: provide Coverity-friendly MIN_CONST and MAX_CONST
Coverity has problems seeing through __builtin_choose_expr, which result in it abandoning analysis of later functions that utilize a definition that used MIN_CONST or MAX_CONST, such as in qemu-file.c:
50 DECLARE_BITMAP(may_free, MAX_IOV_SIZE);
CID 1429992 (#1 of 1): Unrecoverable parse warning (PARSE_ERROR)1.expr_not_constant: expression must have a constant value
As has been done in the past (see 07d66672), it's okay to dumb things down when compiling for static analyzers. (Of course, now the syntax-checker has a false positive on our reference to __COVERITY__...)
---
Improvements over Paolo's v1:
- proper use of ()
- add comment explaining the COVERITY section
- add indentation for easier read of #if/#else flow
include/qemu/osdep.h | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-)
include/qemu/osdep.h +14 -7
@@ -250,7 +250,8 @@ extern int daemon(int, int);* Note that neither form is usable as an #if condition; if you truly * need to write conditional code that depends on a minimum or maximum * determined by the pre-processor instead of the compiler, you'll -* have to open-code it. +* have to open-code it. Sadly, Coverity is severely confused by the +* constant variants, so we have to dumb things down there. */ #undef MIN#define MIN (a, b) \
@@ -258,22 +259,28 @@ extern int daemon(int, int); typeof(1 ? (a) : (b)) _a = (a), _b = (b); \ _a < _b ? _a : _b; \ }) -#define MIN_CONST (a, b) \ - __builtin_choose_expr( \ - __builtin_constant_p(a) && __builtin_constant_p(b), \ - (a) < (b) ? (a) : (b), \ - ((void)0))#undef MAX#define MAX (a, b) \ ({ \ typeof(1 ? (a) : (b)) _a = (a), _b = (b); \ _a > _b ? _a : _b; \ }) -#define MAX_CONST (a, b) \ + +#ifdef __COVERITY__ +# define MIN_CONST (a, b) ((a) < (b) ? (a) : (b)) +# define MAX_CONST (a, b) ((a) > (b) ? (a) : (b)) +#else +# define MIN_CONST (a, b) \ + __builtin_choose_expr( \ + __builtin_constant_p(a) && __builtin_constant_p(b), \ + (a) < (b) ? (a) : (b), \ + ((void)0)) +# define MAX_CONST (a, b) \ __builtin_choose_expr( \ __builtin_constant_p(a) && __builtin_constant_p(b), \ (a) > (b) ? (a) : (b), \ ((void)0)) +#endif /* * Minimum function that returns zero only if both values are zero.
Signature · 1 line
2.27.0
Quoted 9 lines · Eric Blake
Coverity has problems seeing through
__builtin_choose_expr, which result in it abandoning analysis of later functions that utilize a definition that usedMIN_CONSTorMAX_CONST, such as inqemu-file.c:50
DECLARE_BITMAP(may_free, MAX_IOV_SIZE);CID 1429992 (#1 of 1): Unrecoverable parse warning (PARSE_ERROR)1.
expr_not_constant: expression must have a constant value
Quoted 8 lines
As has been done in the past (see
07d66672), it's okay to dumb things down when compiling for static analyzers. (Of course, now the syntax-checker has a false positive on our reference to__COVERITY__...)Reported-by Peter Maydell <[email protected]>Fixes CID 1429992, CID 1429995, CID 1429997, CID 1429999Signed-off-by Eric Blake <[email protected]>
Quoted 60 lines
---
Improvements over Paolo's v1:
- proper use of ()
- add comment explaining the COVERITY section
- add indentation for easier read of #if/#else flowinclude/qemu/osdep.h | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-)include/qemu/osdep.h +14
-7@@ -250,7 +250,8 @@ extern int daemon(int, int);* Note that neither form is usable as an #if condition; if you truly * need to write conditional code that depends on a minimum or maximum * determined by the pre-processor instead of the compiler, you'll -* have to open-code it. +* have to open-code it. Sadly, Coverity is severely confused by the +* constant variants, so we have to dumb things down there. */ #undef MIN#define MIN (a, b) \@@ -258,22 +259,28 @@ extern int daemon(int, int); typeof(1 ? (a) : (b)) _a = (a), _b = (b); \ _a < _b ? _a : _b; \ }) -#define MIN_CONST (a, b) \ - __builtin_choose_expr( \ - __builtin_constant_p(a) && __builtin_constant_p(b), \ - (a) < (b) ? (a) : (b), \ - ((void)0))#undef MAX#define MAX (a, b) \ ({ \ typeof(1 ? (a) : (b)) _a = (a), _b = (b); \ _a > _b ? _a : _b; \ }) -#define MAX_CONST (a, b) \ + +#ifdef __COVERITY__ +# define MIN_CONST (a, b) ((a) < (b) ? (a) : (b)) +# define MAX_CONST (a, b) ((a) > (b) ? (a) : (b)) +#else +# define MIN_CONST (a, b) \ + __builtin_choose_expr( \ + __builtin_constant_p(a) && __builtin_constant_p(b), \ + (a) < (b) ? (a) : (b), \ + ((void)0)) +# define MAX_CONST (a, b) \ __builtin_choose_expr( \ __builtin_constant_p(a) && __builtin_constant_p(b), \ (a) > (b) ? (a) : (b), \ ((void)0)) +#endif /* * Minimum function that returns zero only if both values are zero.
Paolo Bonzini
AppliedQuoted 67 lines · Eric Blake
Coverity has problems seeing through
__builtin_choose_expr, which result in it abandoning analysis of later functions that utilize a definition that usedMIN_CONSTorMAX_CONST, such as inqemu-file.c:50
DECLARE_BITMAP(may_free, MAX_IOV_SIZE);CID 1429992 (#1 of 1): Unrecoverable parse warning (PARSE_ERROR)1.
expr_not_constant: expression must have a constant valueAs has been done in the past (see
07d66672), it's okay to dumb things down when compiling for static analyzers. (Of course, now the syntax-checker has a false positive on our reference to__COVERITY__...)Reported-by Peter Maydell <[email protected]>Fixes CID 1429992, CID 1429995, CID 1429997, CID 1429999Signed-off-by Eric Blake <[email protected]>---
Improvements over Paolo's v1:
- proper use of ()
- add comment explaining the COVERITY section
- add indentation for easier read of #if/#else flowinclude/qemu/osdep.h | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-)include/qemu/osdep.h +11
-7@@ -250,7 +250,8 @@ extern int daemon(int, int);* Note that neither form is usable as an #if condition; if you truly * need to write conditional code that depends on a minimum or maximum * determined by the pre-processor instead of the compiler, you'll -* have to open-code it. +* have to open-code it. Sadly, Coverity is severely confused by the +* constant variants, so we have to dumb things down there. */ #undef MIN#define MIN (a, b) \@@ -258,22 +259,28 @@ extern int daemon(int, int); typeof(1 ? (a) : (b)) _a = (a), _b = (b); \ _a < _b ? _a : _b; \ }) -#define MIN_CONST (a, b) \ - __builtin_choose_expr( \ - __builtin_constant_p(a) && __builtin_constant_p(b), \ - (a) < (b) ? (a) : (b), \ - ((void)0))#undef MAX#define MAX (a, b) \ ({ \ typeof(1 ? (a) : (b)) _a = (a), _b = (b); \ _a > _b ? _a : _b; \ }) -#define MAX_CONST (a, b) \ + +#ifdef __COVERITY__ +# define MIN_CONST (a, b) ((a) < (b) ? (a) : (b)) +# define MAX_CONST (a, b) ((a) > (b) ? (a) : (b)) +#else +# define MIN_CONST (a, b) \ + __builtin_choose_expr( \ + __builtin_constant_p(a) && __builtin_constant_p(b), \ + (a) < (b) ? (a) : (b), \
include/qemu/osdep.h extern int daemon(int, int); · line 286
Quoted 10 lines
include/qemu/osdep.h +3
-0+ ((void)0)) +# define MAX_CONST (a, b) \ __builtin_choose_expr( \ __builtin_constant_p(a) && __builtin_constant_p(b), \ (a) > (b) ? (a) : (b), \ ((void)0)) +#endif /* * Minimum function that returns zero only if both values are zero.
Queued, thanks.