From b2227e67b4bdee65b1240f725dd2ea214178d984 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 14 Feb 2023 09:34:53 -0700 Subject: [PATCH] Change value::m_modifiable to bool This changes value::m_modifiable to be a bool and updates the various uses. Reviewed-By: Bruno Larsen --- gdb/breakpoint.c | 3 +-- gdb/ppc-linux-nat.c | 2 +- gdb/value.c | 6 +++--- gdb/value.h | 8 ++++---- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 3b9aebc5605..b1922fc1e98 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -10450,8 +10450,7 @@ can_use_hardware_watchpoint (const std::vector &vals) } } } - else if (v->lval () != not_lval - && v->deprecated_modifiable () == 0) + else if (v->lval () != not_lval && !v->deprecated_modifiable ()) return 0; /* These are values from the history (e.g., $1). */ else if (v->lval () == lval_register) return 0; /* Cannot watch a register with a HW watchpoint. */ diff --git a/gdb/ppc-linux-nat.c b/gdb/ppc-linux-nat.c index 32c0177228a..494e9bf6119 100644 --- a/gdb/ppc-linux-nat.c +++ b/gdb/ppc-linux-nat.c @@ -2455,7 +2455,7 @@ ppc_linux_nat_target::num_memory_accesses (const std::vector struct value *v = iter.get (); /* Constants and values from the history are fine. */ - if (v->lval () == not_lval || v->deprecated_modifiable () == 0) + if (v->lval () == not_lval || !v->deprecated_modifiable ()) continue; else if (v->lval () == lval_memory) { diff --git a/gdb/value.c b/gdb/value.c index 34a282b9746..2dc2dabd790 100644 --- a/gdb/value.c +++ b/gdb/value.c @@ -1677,7 +1677,7 @@ value::record_latest () /* We preserve VALUE_LVAL so that the user can find out where it was fetched from. This is a bit dubious, because then *&$1 does not just return $1 but the current contents of that location. c'est la vie... */ - set_modifiable (0); + set_modifiable (false); value_history.push_back (release_value (this)); @@ -2174,7 +2174,7 @@ set_internalvar (struct internalvar *var, struct value *val) default: new_kind = INTERNALVAR_VALUE; struct value *copy = val->copy (); - copy->set_modifiable (1); + copy->set_modifiable (true); /* Force the value to be fetched from the target now, to avoid problems later when this internalvar is referenced and the target is gone or @@ -2498,7 +2498,7 @@ value::from_xmethod (xmethod_worker_up &&worker) v = value::allocate (builtin_type (target_gdbarch ())->xmethod); v->m_lval = lval_xcallable; v->m_location.xm_worker = worker.release (); - v->m_modifiable = 0; + v->m_modifiable = false; return v; } diff --git a/gdb/value.h b/gdb/value.h index 8b45f7fdee8..92247185cd0 100644 --- a/gdb/value.h +++ b/gdb/value.h @@ -132,7 +132,7 @@ private: /* Values can only be created via "static constructors". */ explicit value (struct type *type_) - : m_modifiable (1), + : m_modifiable (true), m_lazy (1), m_initialized (1), m_stack (0), @@ -228,11 +228,11 @@ public: /* The comment from "struct value" reads: ``Is it modifiable? Only relevant if lval != not_lval.''. Shouldn't the value instead be not_lval and be done with it? */ - int deprecated_modifiable () const + bool deprecated_modifiable () const { return m_modifiable; } /* Set or clear the modifiable flag. */ - void set_modifiable (int val) + void set_modifiable (bool val) { m_modifiable = val; } LONGEST pointed_to_offset () const @@ -619,7 +619,7 @@ private: enum lval_type m_lval = not_lval; /* Is it modifiable? Only relevant if lval != not_lval. */ - unsigned int m_modifiable : 1; + bool m_modifiable : 1; /* If zero, contents of this value are in the contents field. If nonzero, contents are in inferior. If the lval field is lval_memory, -- 2.30.2