diff options
| author | Tom Tromey <tromey@adacore.com> | 2021-01-08 12:20:12 -0700 |
|---|---|---|
| committer | Tom Tromey <tromey@adacore.com> | 2021-01-08 12:20:43 -0700 |
| commit | 8fc48b79618af335d6cea1d1d149668340298b81 (patch) | |
| tree | fff5e183fda0fd399702add8a0257b6d36440090 /gdb/printcmd.c | |
| parent | 6abd4cf281deda4b1eb2d569a2729a485105e553 (diff) | |
| download | gdb-8fc48b79618af335d6cea1d1d149668340298b81.zip gdb-8fc48b79618af335d6cea1d1d149668340298b81.tar.gz gdb-8fc48b79618af335d6cea1d1d149668340298b81.tar.bz2 | |
Pass void_context_p to parse_expression
An earlier patch pointed out that nothing in GDB sets void_context_p
when parsing an expression. This patch fixes this omission.
"print" and "call" differ in that the former will print a value that
has void type, while the latter will not. AdaCore has had a patch for
a long time that uses this distinction to help with overload
resolution. In particular, in a "call" context, a procedure will be
chosen, while in a "print" context, a zero-argument function will be
chosen instead.
Regression tested on x86-64 Fedora 32.
gdb/ChangeLog
2021-01-08 Tom Tromey <tromey@adacore.com>
* parse.c (parse_expression): Add void_context_p parameter. Use
parse_exp_in_context.
* printcmd.c (print_command_1): Change voidprint to bool. Pass to
parse_expression.
(print_command, call_command): Update.
* expression.h (parse_expression): Add void_context_p parameter.
gdb/testsuite/ChangeLog
2021-01-08 Tom Tromey <tromey@adacore.com>
* gdb.ada/voidctx/pck.adb: New file.
* gdb.ada/voidctx/pck.ads: New file.
* gdb.ada/voidctx/voidctx.adb: New file.
* gdb.ada/voidctx.exp: New file.
Diffstat (limited to 'gdb/printcmd.c')
| -rw-r--r-- | gdb/printcmd.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/gdb/printcmd.c b/gdb/printcmd.c index a1c9af1..2e56d28 100644 --- a/gdb/printcmd.c +++ b/gdb/printcmd.c @@ -1206,7 +1206,7 @@ print_value (value *val, const value_print_options &opts) /* Implementation of the "print" and "call" commands. */ static void -print_command_1 (const char *args, int voidprint) +print_command_1 (const char *args, bool voidprint) { struct value *val; value_print_options print_opts; @@ -1223,7 +1223,9 @@ print_command_1 (const char *args, int voidprint) if (exp != nullptr && *exp) { - expression_up expr = parse_expression (exp); + /* VOIDPRINT is true to indicate that we do want to print a void + value, so invert it for parse_expression. */ + expression_up expr = parse_expression (exp, nullptr, !voidprint); val = evaluate_expression (expr.get ()); } else @@ -1321,14 +1323,14 @@ print_command_completer (struct cmd_list_element *ignore, static void print_command (const char *exp, int from_tty) { - print_command_1 (exp, 1); + print_command_1 (exp, true); } /* Same as print, except it doesn't print void results. */ static void call_command (const char *exp, int from_tty) { - print_command_1 (exp, 0); + print_command_1 (exp, false); } /* Implementation of the "output" command. */ |