From: Tom Tromey <tromey@adacore.com>
To: gdb-patches@sourceware.org
Subject: [PATCH 2/5] Declare 'tem' in loop header in array_operation::evaluate
Date: Mon, 28 Aug 2023 13:59:32 -0600 [thread overview]
Message-ID: <20230828-cleanup-array-op-v1-2-12ca00f20917@adacore.com> (raw)
In-Reply-To: <20230828-cleanup-array-op-v1-0-12ca00f20917@adacore.com>
This changes array_operation::evaluate to declare the 'tem' variable
in the loop header, rather than at the top of the function. This is
cleaner and easier to reason about. I also changed 'nargs' to be
'const'.
---
gdb/eval.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/gdb/eval.c b/gdb/eval.c
index 00b9231a5b9..63c414e546e 100644
--- a/gdb/eval.c
+++ b/gdb/eval.c
@@ -2397,11 +2397,10 @@ array_operation::evaluate (struct type *expect_type,
struct expression *exp,
enum noside noside)
{
- int tem;
int tem2 = std::get<0> (m_storage);
int tem3 = std::get<1> (m_storage);
const std::vector<operation_up> &in_args = std::get<2> (m_storage);
- int nargs = tem3 - tem2 + 1;
+ const int nargs = tem3 - tem2 + 1;
struct type *type = expect_type ? check_typedef (expect_type) : nullptr;
if (expect_type != nullptr
@@ -2429,7 +2428,7 @@ array_operation::evaluate (struct type *expect_type,
}
index = low_bound;
memset (array->contents_raw ().data (), 0, expect_type->length ());
- for (tem = nargs; --nargs >= 0;)
+ for (int tem = 0; tem < nargs; ++tem)
{
struct value *element;
@@ -2467,7 +2466,7 @@ array_operation::evaluate (struct type *expect_type,
error (_("(power)set type with unknown size"));
memset (valaddr, '\0', type->length ());
int idx = 0;
- for (tem = 0; tem < nargs; tem++)
+ for (int tem = 0; tem < nargs; tem++)
{
LONGEST range_low, range_high;
struct type *range_low_type, *range_high_type;
@@ -2516,7 +2515,7 @@ array_operation::evaluate (struct type *expect_type,
}
std::vector<value *> argvec (nargs);
- for (tem = 0; tem < nargs; tem++)
+ for (int tem = 0; tem < nargs; tem++)
{
/* Ensure that array expressions are coerced into pointer
objects. */
--
2.40.1
next prev parent reply other threads:[~2023-08-28 19:59 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-28 19:59 [PATCH 0/5] Small cleanups " Tom Tromey
2023-08-28 19:59 ` [PATCH 1/5] Use gdb::array_view for value_array Tom Tromey
2023-08-28 21:10 ` Simon Marchi
2023-08-29 15:13 ` Tom Tromey
2023-08-28 19:59 ` Tom Tromey [this message]
2023-08-28 19:59 ` [PATCH 3/5] Hoist array bounds check in array_operation::evaluate Tom Tromey
2023-08-28 19:59 ` [PATCH 4/5] Remove redundant variable from array_operation::evaluate Tom Tromey
2023-08-28 19:59 ` [PATCH 5/5] Remove another " Tom Tromey
2023-08-28 21:12 ` [PATCH 0/5] Small cleanups in array_operation::evaluate John Baldwin
2023-08-29 15:35 ` Tom Tromey
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230828-cleanup-array-op-v1-2-12ca00f20917@adacore.com \
--to=tromey@adacore.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).