From 3a706c17ee29eeab71cb7b7823cad322a66df256 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Wed, 26 May 2021 23:31:29 -0400 Subject: [PATCH] Revert "gdb: change dwarf_die_debug to bool" This was wrong: dwarf_die_debug is used as an integer, for example where it is passed to dump_die. It is documented in the command's help, which I missed the first time. This reverts commit 749369c430d88c4abc9acde5cfc7b5218651de10. Change-Id: I1d09c3da57f8885f4f9fe9f4eae0cf86006e617a --- gdb/ChangeLog | 5 ----- gdb/dwarf2/read.c | 14 +++++++------- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 36491171d5..39f444e1f7 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,8 +1,3 @@ -2021-05-26 Simon Marchi - - * dwarf2/read.c (dwarf_die_debug): Change type to bool. - (_initialize_dwarf2_read): Update. - 2021-05-26 Simon Marchi * regcache.c (reg_buffer::reg_buffer): Default-initialize diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index b40d3a7aa2..d3b5b89c1c 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -107,8 +107,8 @@ static unsigned int dwarf_read_debug = 0; debug_prefixed_printf_cond (dwarf_read_debug >= 2, "dwarf-read", fmt, \ ##__VA_ARGS__) -/* When true, dump DIEs after they are read in. */ -static bool dwarf_die_debug = false; +/* When non-zero, dump DIEs after they are read in. */ +static unsigned int dwarf_die_debug = 0; /* When non-zero, dump line number entries as they are read in. */ unsigned int dwarf_line_debug = 0; @@ -24735,14 +24735,14 @@ information. A value greater than 1 provides more verbose information."), NULL, &setdebuglist, &showdebuglist); - add_setshow_boolean_cmd ("dwarf-die", no_class, &dwarf_die_debug, _("\ + add_setshow_zuinteger_cmd ("dwarf-die", no_class, &dwarf_die_debug, _("\ Set debugging of the DWARF DIE reader."), _("\ Show debugging of the DWARF DIE reader."), _("\ -When enabled, DIEs are dumped after they are read in.\n\ +When enabled (non-zero), DIEs are dumped after they are read in.\n\ The value is the maximum depth to print."), - NULL, - NULL, - &setdebuglist, &showdebuglist); + NULL, + NULL, + &setdebuglist, &showdebuglist); add_setshow_zuinteger_cmd ("dwarf-line", no_class, &dwarf_line_debug, _("\ Set debugging of the dwarf line reader."), _("\ -- 2.34.1