public inbox for gdb-cvs@sourceware.org
help / color / mirror / Atom feed
* [binutils-gdb] Turn deprecated_value_modifiable into method
@ 2023-02-13 22:28 Tom Tromey
0 siblings, 0 replies; only message in thread
From: Tom Tromey @ 2023-02-13 22:28 UTC (permalink / raw)
To: gdb-cvs
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=4b53ca88831137e94a6882f224d755a2d32ab8ef
commit 4b53ca88831137e94a6882f224d755a2d32ab8ef
Author: Tom Tromey <tom@tromey.com>
Date: Tue Jan 31 10:17:10 2023 -0700
Turn deprecated_value_modifiable into method
This changes deprecated_value_modifiable to be a method of value.
Approved-By: Simon Marchi <simon.marchi@efficios.com>
Diff:
---
gdb/ada-lang.c | 4 ++--
gdb/breakpoint.c | 2 +-
gdb/opencl-lang.c | 2 +-
gdb/ppc-linux-nat.c | 2 +-
gdb/valops.c | 2 +-
gdb/value.c | 5 -----
gdb/value.h | 12 ++++++------
7 files changed, 12 insertions(+), 17 deletions(-)
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index c660e74e08c..5aec8b77b14 100644
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -2888,7 +2888,7 @@ ada_value_assign (struct value *toval, struct value *fromval)
if (ada_is_direct_array_type (fromval->type ()))
fromval = ada_coerce_to_simple_array (fromval);
- if (!deprecated_value_modifiable (toval))
+ if (!toval->deprecated_modifiable ())
error (_("Left operand of assignment is not a modifiable lvalue."));
if (VALUE_LVAL (toval) == lval_memory
@@ -9531,7 +9531,7 @@ ada_aggregate_operation::assign_aggregate (struct value *container,
if (ada_is_direct_array_type (container->type ()))
container = ada_coerce_to_simple_array (container);
lhs = ada_coerce_ref (lhs);
- if (!deprecated_value_modifiable (lhs))
+ if (!lhs->deprecated_modifiable ())
error (_("Left operand of assignment is not a modifiable lvalue."));
lhs_type = check_typedef (lhs->type ());
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 71a7225cf75..b8490b053d7 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -10452,7 +10452,7 @@ can_use_hardware_watchpoint (const std::vector<value_ref_ptr> &vals)
}
}
else if (VALUE_LVAL (v) != not_lval
- && deprecated_value_modifiable (v) == 0)
+ && v->deprecated_modifiable () == 0)
return 0; /* These are values from the history (e.g., $1). */
else if (VALUE_LVAL (v) == lval_register)
return 0; /* Cannot watch a register with a HW watchpoint. */
diff --git a/gdb/opencl-lang.c b/gdb/opencl-lang.c
index 107a138ff7c..8c59e823d5c 100644
--- a/gdb/opencl-lang.c
+++ b/gdb/opencl-lang.c
@@ -687,7 +687,7 @@ eval_opencl_assign (struct type *expect_type, struct expression *exp,
return arg1;
struct type *type1 = arg1->type ();
- if (deprecated_value_modifiable (arg1)
+ if (arg1->deprecated_modifiable ()
&& VALUE_LVAL (arg1) != lval_internalvar)
arg2 = opencl_value_cast (type1, arg2);
diff --git a/gdb/ppc-linux-nat.c b/gdb/ppc-linux-nat.c
index cb832726ea5..a796364b413 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<value_ref_ptr>
struct value *v = iter.get ();
/* Constants and values from the history are fine. */
- if (VALUE_LVAL (v) == not_lval || deprecated_value_modifiable (v) == 0)
+ if (VALUE_LVAL (v) == not_lval || v->->deprecated_modifiable () == 0)
continue;
else if (VALUE_LVAL (v) == lval_memory)
{
diff --git a/gdb/valops.c b/gdb/valops.c
index dce166d2532..f462da8b564 100644
--- a/gdb/valops.c
+++ b/gdb/valops.c
@@ -1089,7 +1089,7 @@ value_assign (struct value *toval, struct value *fromval)
struct value *val;
struct frame_id old_frame;
- if (!deprecated_value_modifiable (toval))
+ if (!toval->deprecated_modifiable ())
error (_("Left operand of assignment is not a modifiable lvalue."));
toval = coerce_ref (toval);
diff --git a/gdb/value.c b/gdb/value.c
index 9b9b022bf27..783ef7deae7 100644
--- a/gdb/value.c
+++ b/gdb/value.c
@@ -1515,11 +1515,6 @@ deprecated_value_regnum_hack (struct value *value)
return &value->m_location.reg.regnum;
}
-int
-deprecated_value_modifiable (const struct value *value)
-{
- return value->m_modifiable;
-}
\f
/* Return a mark in the value chain. All values allocated after the
mark is obtained (except for those released) are subject to being freed
diff --git a/gdb/value.h b/gdb/value.h
index 146848b40f1..befd41789ee 100644
--- a/gdb/value.h
+++ b/gdb/value.h
@@ -209,6 +209,12 @@ struct value
void set_offset (LONGEST offset)
{ m_offset = offset; }
+ /* 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
+ { return m_modifiable; }
+
/* Type of value; either not an lval, or one of the various
different possible kinds of lval. */
@@ -387,12 +393,6 @@ struct value
ULONGEST m_limited_length = 0;
};
-/* 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? */
-
-extern int deprecated_value_modifiable (const struct value *value);
-
/* If a value represents a C++ object, then the `type' field gives the
object's compile-time type. If the object actually belongs to some
class derived from `type', perhaps with other base classes and
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-02-13 22:28 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-02-13 22:28 [binutils-gdb] Turn deprecated_value_modifiable into method Tom Tromey
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).