From 5d8254e18560653d6d4d4d62be2a35ef68de4376 Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Wed, 18 Nov 2020 19:59:45 +0100 Subject: [PATCH] [gdb/build] Fix -Werror=bool-compare warning in update_static_array_size With current trunk I run into: ... src/gdb/gdbtypes.c: In function 'bool update_static_array_size(type*)': src/gdb/gdbtypes.c:1250:64: error: comparison of constant '0' with boolean \ expression is always true [-Werror=bool-compare] && get_array_bounds (element_type, &low_bound, &high_bound) >= 0 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~ ... Fix this by dropping the compare. gdb/ChangeLog: 2020-11-18 Tom de Vries * gdbtypes.c (update_static_array_size): Fix -Werror=bool-compare warning. --- gdb/ChangeLog | 5 +++++ gdb/gdbtypes.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 8c21f97313..49b2511cae 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2020-11-18 Tom de Vries + + * gdbtypes.c (update_static_array_size): Fix -Werror=bool-compare + warning. + 2020-11-17 Simon Marchi * gdbtypes.h (get_array_bounds): Return bool, adjust some diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c index cde0770273..b822a369a1 100644 --- a/gdb/gdbtypes.c +++ b/gdb/gdbtypes.c @@ -1247,7 +1247,7 @@ update_static_array_size (struct type *type) if (element_type->code () == TYPE_CODE_ARRAY && TYPE_LENGTH (element_type) != 0 && TYPE_FIELD_BITSIZE (element_type, 0) != 0 - && get_array_bounds (element_type, &low_bound, &high_bound) >= 0 + && get_array_bounds (element_type, &low_bound, &high_bound) && high_bound >= low_bound) TYPE_FIELD_BITSIZE (type, 0) = ((high_bound - low_bound + 1) -- 2.34.1