From 191849105b95e5ac3a3173547fd77f7b1fc3b283 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 25 Jan 2021 07:38:21 -0700 Subject: Specially handle array contexts in Ada expression resolution A user noticed that the Ada expression code in gdb did not automatically disambiguate an enumerator in an array context. That is, an expression like "print array(enumerator)" is not ambiguous, even if "enumerator" is declared in multiple enumerations, because the correct one can be found by examining the array's index type. This patch changes the Ada expression resolution code to handle this case. gdb/ChangeLog 2021-01-25 Tom Tromey * ada-lang.c (resolve_subexp): Handle array context. gdb/testsuite/ChangeLog 2021-01-25 Tom Tromey * gdb.ada/local-enum.exp: Add enumerator resolution test. --- gdb/ada-lang.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) (limited to 'gdb/ada-lang.c') diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index e2befe1..8d91240 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -3474,6 +3474,12 @@ resolve_subexp (expression_up *expp, int *pos, int deprocedure_p, struct value **argvec; /* Vector of operand types (alloca'ed). */ int nargs; /* Number of operands. */ int oplen; + /* If we're resolving an expression like ARRAY(ARG...), then we set + this to the type of the array, so we can use the index types as + the expected types for resolution. */ + struct type *array_type = nullptr; + /* The arity of ARRAY_TYPE. */ + int array_arity = 0; argvec = NULL; nargs = 0; @@ -3490,7 +3496,12 @@ resolve_subexp (expression_up *expp, int *pos, int deprocedure_p, else { *pos += 3; - resolve_subexp (expp, pos, 0, NULL, parse_completion, tracker); + struct value *lhs = resolve_subexp (expp, pos, 0, NULL, + parse_completion, tracker); + struct type *lhstype = ada_check_typedef (value_type (lhs)); + array_arity = ada_array_arity (lhstype); + if (array_arity > 0) + array_type = lhstype; } nargs = longest_to_int (exp->elts[pc + 1].longconst); break; @@ -3627,8 +3638,13 @@ resolve_subexp (expression_up *expp, int *pos, int deprocedure_p, argvec = XALLOCAVEC (struct value *, nargs + 1); for (i = 0; i < nargs; i += 1) - argvec[i] = resolve_subexp (expp, pos, 1, NULL, parse_completion, - tracker); + { + struct type *subtype = nullptr; + if (i < array_arity) + subtype = ada_index_type (array_type, i + 1, "array type"); + argvec[i] = resolve_subexp (expp, pos, 1, subtype, parse_completion, + tracker); + } argvec[i] = NULL; exp = expp->get (); -- cgit v1.1