* [PATCH] sequencer: silence -Wtautological-constant-out-of-range-compare
@ 2016-11-09 3:57 Jeff King
2016-11-09 13:54 ` Johannes Schindelin
0 siblings, 1 reply; 2+ messages in thread
From: Jeff King @ 2016-11-09 3:57 UTC (permalink / raw)
To: git; +Cc: Johannes Schindelin, Lars Schneider
When clang compiles sequencer.c, it complains:
sequencer.c:632:14: warning: comparison of constant 2 with
expression of type 'const enum todo_command' is always
true [-Wtautological-constant-out-of-range-compare]
if (command < ARRAY_SIZE(todo_command_strings))
This is because "command" is an enum that may only have two
values (0 and 1) and the array in question has two elements.
As it turns out, clang is actually wrong here, at least
according to its own bug tracker:
https://llvm.org/bugs/show_bug.cgi?id=16154
But it's still worth working around this, as the warning is
present with -Wall, meaning we fail compilation with "make
DEVELOPER=1".
Casting the enum to size_t sufficiently unconfuses clang. As
a bonus, it also catches any possible out-of-bounds access
if the enum takes on a negative value (which shouldn't
happen either, but again, this is a defensive check).
Signed-off-by: Jeff King <peff@peff.net>
---
I know that a different fix is coming in a follow-on series, but I think
it's worth doing this to un-break clang on master (and v2.11) in the
meantime.
sequencer.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sequencer.c b/sequencer.c
index 5fd75f30d..6f0ff9e41 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -629,7 +629,7 @@ static const char *todo_command_strings[] = {
static const char *command_to_string(const enum todo_command command)
{
- if (command < ARRAY_SIZE(todo_command_strings))
+ if ((size_t)command < ARRAY_SIZE(todo_command_strings))
return todo_command_strings[command];
die("Unknown command: %d", command);
}
--
2.11.0.rc0.263.g6f44bc3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] sequencer: silence -Wtautological-constant-out-of-range-compare
2016-11-09 3:57 [PATCH] sequencer: silence -Wtautological-constant-out-of-range-compare Jeff King
@ 2016-11-09 13:54 ` Johannes Schindelin
0 siblings, 0 replies; 2+ messages in thread
From: Johannes Schindelin @ 2016-11-09 13:54 UTC (permalink / raw)
To: Jeff King; +Cc: git, Lars Schneider
Hi Peff,
On Tue, 8 Nov 2016, Jeff King wrote:
> diff --git a/sequencer.c b/sequencer.c
> index 5fd75f30d..6f0ff9e41 100644
> --- a/sequencer.c
> +++ b/sequencer.c
> @@ -629,7 +629,7 @@ static const char *todo_command_strings[] = {
>
> static const char *command_to_string(const enum todo_command command)
> {
> - if (command < ARRAY_SIZE(todo_command_strings))
> + if ((size_t)command < ARRAY_SIZE(todo_command_strings))
> return todo_command_strings[command];
> die("Unknown command: %d", command);
I have come to prefer a slightly different approach. Will send it out in a
moment.
Ciao,
Dscho
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-11-09 13:55 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-11-09 3:57 [PATCH] sequencer: silence -Wtautological-constant-out-of-range-compare Jeff King
2016-11-09 13:54 ` Johannes Schindelin
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).