diff mbox series

[v2] gdb: some int to bool conversion

Message ID OS3P286MB2152263B3BD0EFF0254EFB5DF0CB9@OS3P286MB2152.JPNP286.PROD.OUTLOOK.COM
State Committed
Headers
Series [v2] gdb: some int to bool conversion |

Commit Message

Enze Li Jan. 22, 2023, 5:54 a.m. UTC 
  When building GDB with clang 16, I got this,

  CXX    maint.o
maint.c:1045:23: error: implicit truncation from 'int' to a one-bit wide bit-field changes value from 1 to -1 [-Werror,-Wsingle-bit-bitfield-constant-conversion]
      m_space_enabled = 1;
                      ^ ~
maint.c:1057:22: error: implicit truncation from 'int' to a one-bit wide bit-field changes value from 1 to -1 [-Werror,-Wsingle-bit-bitfield-constant-conversion]
      m_time_enabled = 1;
                     ^ ~
maint.c:1073:24: error: implicit truncation from 'int' to a one-bit wide bit-field changes value from 1 to -1 [-Werror,-Wsingle-bit-bitfield-constant-conversion]
      m_symtab_enabled = 1;
                       ^ ~
3 errors generated.

Work around this by using bool bitfields instead.

Tested by rebuilding on x86_64-linux with clang 16 and gcc 12.
---
 gdb/maint.c | 12 ++++++------
 gdb/maint.h |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)


base-commit: 52480b9ef499870c36c8dfb34df31e67df7bb4dd

Comments

Tom Tromey Jan. 22, 2023, 5:38 p.m. UTC | #1 
>>>>> "Enze" == Enze Li via Gdb-patches <gdb-patches@sourceware.org> writes:

Enze> Work around this by using bool bitfields instead.

Thank you for doing this.
This is ok.

Tom
Enze Li Jan. 24, 2023, 3:21 a.m. UTC | #2 
On Sun, Jan 22 2023 at 10:38:12 AM -0700, Tom Tromey wrote:

>>>>>> "Enze" == Enze Li via Gdb-patches <gdb-patches@sourceware.org> writes:
>
> Enze> Work around this by using bool bitfields instead.
>
> Thank you for doing this.
> This is ok.
>
> Tom

Thank you.  I'm checking this in now.

Enze
diff mbox series

Patch

diff --git a/gdb/maint.c b/gdb/maint.c
index 1a226bf75e30..52f91a3246fe 100644
--- a/gdb/maint.c
+++ b/gdb/maint.c
@@ -1042,11 +1042,11 @@  scoped_command_stats::scoped_command_stats (bool msg_type)
 #ifdef HAVE_USEFUL_SBRK
       char *lim = (char *) sbrk (0);
       m_start_space = lim - lim_at_start;
-      m_space_enabled = 1;
+      m_space_enabled = true;
 #endif
     }
   else
-    m_space_enabled = 0;
+    m_space_enabled = false;
 
   if (msg_type == 0 || per_command_time)
     {
@@ -1054,13 +1054,13 @@  scoped_command_stats::scoped_command_stats (bool msg_type)
 
       m_start_cpu_time = run_time_clock::now ();
       m_start_wall_time = steady_clock::now ();
-      m_time_enabled = 1;
+      m_time_enabled = true;
 
       if (per_command_time)
 	print_time (_("command started"));
     }
   else
-    m_time_enabled = 0;
+    m_time_enabled = false;
 
   if (msg_type == 0 || per_command_symtab)
     {
@@ -1070,10 +1070,10 @@  scoped_command_stats::scoped_command_stats (bool msg_type)
       m_start_nr_symtabs = nr_symtabs;
       m_start_nr_compunit_symtabs = nr_compunit_symtabs;
       m_start_nr_blocks = nr_blocks;
-      m_symtab_enabled = 1;
+      m_symtab_enabled = true;
     }
   else
-    m_symtab_enabled = 0;
+    m_symtab_enabled = false;
 
   /* Initialize timer to keep track of how long we waited for the user.  */
   reset_prompt_for_continue_wait_time ();
diff --git a/gdb/maint.h b/gdb/maint.h
index 09a68c17befd..1741d1325677 100644
--- a/gdb/maint.h
+++ b/gdb/maint.h
@@ -49,9 +49,9 @@  class scoped_command_stats
   /* Track whether the stat was enabled at the start of the command
      so that we can avoid printing anything if it gets turned on by
      the current command.  */
-  int m_time_enabled : 1;
-  int m_space_enabled : 1;
-  int m_symtab_enabled : 1;
+  bool m_time_enabled : 1;
+  bool m_space_enabled : 1;
+  bool m_symtab_enabled : 1;
   run_time_clock::time_point m_start_cpu_time;
   std::chrono::steady_clock::time_point m_start_wall_time;
   long m_start_space;