From ef136c7fa165cf3ee75c37d41561be8a7bdc89bd Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Thu, 7 Sep 2023 21:39:42 +0200 Subject: [PATCH] [gdb/ada] Move identical enums handling later When running test-case gdb.ada/arr_acc_idx_w_gap.exp with target board cc-with-dwz, I run into: ... (gdb) print enum_with_gaps'enum_rep(lit3)^M 'Enum_Rep requires argument to have same type as enum^M (gdb) FAIL: gdb.ada/arr_acc_idx_w_gap.exp: enum_rep ... With target_board unix, we have instead: ... (gdb) print enum_with_gaps'enum_rep(lit3)^M $16 = 13^M (gdb) PASS: gdb.ada/arr_acc_idx_w_gap.exp: enum_rep ... Conversely, when I add this test to the test-case: ... gdb_test "print enum_with_gaps'enum_rep(lit3)" " = 13" \ "enum_rep" + gdb_test "print enum_subrange'enum_rep(lit3)" " = 13" \ + "other enum_rep" ... the extra test passes with target board cc-with-dwz, but fails with target board unix. The problem is here in remove_extra_symbols: ... if (symbols_are_identical_enums (syms)) syms.resize (1); ... where one of the two identical enums is picked before the enum_rep handling can resolve lit3 to one of the two. Fix this by moving the code to ada_resolve_variable. Tested on x86_64-linux. Approved-By: Tom Tromey PR ada/30726 Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=30726 --- gdb/ada-lang.c | 35 ++++++++++++--------- gdb/testsuite/gdb.ada/arr_acc_idx_w_gap.exp | 2 ++ 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index c0cc512bfa3..2e1b9664fdc 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -202,6 +202,8 @@ static struct type *ada_find_any_type (const char *name); static symbol_name_matcher_ftype *ada_get_symbol_name_matcher (const lookup_name_info &lookup_name); +static int symbols_are_identical_enums + (const std::vector &syms); /* The character set used for source files. */ @@ -3875,6 +3877,24 @@ ada_resolve_variable (struct symbol *sym, const struct block *block, && context_type->code () == TYPE_CODE_ENUM) i = ada_resolve_enum (candidates, sym->linkage_name (), context_type, parse_completion); + else if (context_type == nullptr + && symbols_are_identical_enums (candidates)) + { + /* If all the remaining symbols are identical enumerals, then + just keep the first one and discard the rest. + + Unlike what we did previously, we do not discard any entry + unless they are ALL identical. This is because the symbol + comparison is not a strict comparison, but rather a practical + comparison. If all symbols are considered identical, then + we can just go ahead and use the first one and discard the rest. + But if we cannot reduce the list to a single element, we have + to ask the user to disambiguate anyways. And if we have to + present a multiple-choice menu, it's less confusing if the list + isn't missing some choices that were identical and yet distinct. */ + candidates.resize (1); + i = 0; + } else if (deprocedure_p && !is_nonfunction (candidates)) { i = ada_resolve_function @@ -5091,21 +5111,6 @@ remove_extra_symbols (std::vector &syms) else i += 1; } - - /* If all the remaining symbols are identical enumerals, then - just keep the first one and discard the rest. - - Unlike what we did previously, we do not discard any entry - unless they are ALL identical. This is because the symbol - comparison is not a strict comparison, but rather a practical - comparison. If all symbols are considered identical, then - we can just go ahead and use the first one and discard the rest. - But if we cannot reduce the list to a single element, we have - to ask the user to disambiguate anyways. And if we have to - present a multiple-choice menu, it's less confusing if the list - isn't missing some choices that were identical and yet distinct. */ - if (symbols_are_identical_enums (syms)) - syms.resize (1); } /* Given a type that corresponds to a renaming entity, use the type name diff --git a/gdb/testsuite/gdb.ada/arr_acc_idx_w_gap.exp b/gdb/testsuite/gdb.ada/arr_acc_idx_w_gap.exp index 4a1482b6d99..a98e9e1e2c3 100644 --- a/gdb/testsuite/gdb.ada/arr_acc_idx_w_gap.exp +++ b/gdb/testsuite/gdb.ada/arr_acc_idx_w_gap.exp @@ -69,6 +69,8 @@ foreach_with_prefix scenario {all minimal} { gdb_test "print enum_with_gaps'enum_rep(lit3)" " = 13" \ "enum_rep" + gdb_test "print enum_subrange'enum_rep(lit3)" " = 13" \ + "other enum_rep" gdb_test "print enum_with_gaps'enum_val(21)" " = lit4" \ "enum_val" } -- 2.30.2