public inbox for gdb-cvs@sourceware.org
help / color / mirror / Atom feed
From: Vladimir Mezentsev <vmezents@sourceware.org>
To: bfd-cvs@sourceware.org, gdb-cvs@sourceware.org
Subject: [binutils-gdb] gprofng: assertion in gprofng/src/Expression.cc:139
Date: Fri, 29 Apr 2022 21:04:36 +0000 (GMT) [thread overview]
Message-ID: <20220429210436.EFE743858D28@sourceware.org> (raw)
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=835e063d3a0d08a85862e3cdf217773f524cd006
commit 835e063d3a0d08a85862e3cdf217773f524cd006
Author: Vladimir Mezentsev <vladimir.mezentsev@oracle.com>
Date: Thu Apr 28 22:26:51 2022 -0700
gprofng: assertion in gprofng/src/Expression.cc:139
gprofng/ChangeLog
2022-04-28 Vladimir Mezentsev <vladimir.mezentsev@oracle.com>
PR gprofng/29102
* src/Expression.h: Remove fixupValues.
* src/Expression.cc (Expression::copy): Fix a bug.
Diff:
---
gprofng/src/Expression.cc | 34 ++++++++++++++++++----------------
gprofng/src/Expression.h | 2 --
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/gprofng/src/Expression.cc b/gprofng/src/Expression.cc
index 49c94a80cd2..df440927e79 100644
--- a/gprofng/src/Expression.cc
+++ b/gprofng/src/Expression.cc
@@ -91,12 +91,18 @@ Expression::Expression (const Expression &rhs)
op = rhs.op;
arg0 = NULL;
arg1 = NULL;
+ v = Value (rhs.v);
if (rhs.arg0)
- arg0 = rhs.arg0->copy ();
+ {
+ arg0 = rhs.arg0->copy ();
+ if (v.next)
+ {
+ assert (arg0 && v.next == &(rhs.arg0->v));
+ v.next = &(arg0->v);
+ }
+ }
if (rhs.arg1)
arg1 = rhs.arg1->copy ();
- v = Value (rhs.v);
- fixupValues ();
}
Expression::Expression (const Expression *rhs)
@@ -114,12 +120,18 @@ Expression::copy (const Expression *rhs)
delete arg1;
arg0 = NULL;
arg1 = NULL;
+ v = Value (rhs->v);
if (rhs->arg0)
- arg0 = rhs->arg0->copy ();
+ {
+ arg0 = rhs->arg0->copy ();
+ if (v.next)
+ {
+ assert (arg0 && v.next == &(rhs->arg0->v));
+ v.next = &(arg0->v);
+ }
+ }
if (rhs->arg1)
arg1 = rhs->arg1->copy ();
- v = Value (rhs->v);
- fixupValues ();
}
Expression &
@@ -131,16 +143,6 @@ Expression::operator= (const Expression &rhs)
return *this;
}
-void
-Expression::fixupValues ()
-{
- if (v.next)
- {
- assert (arg0 && v.next == &(arg0->v));
- v.next = &(arg0->v);
- }
-}
-
bool
Expression::getVal (int propId, Context *ctx)
{
diff --git a/gprofng/src/Expression.h b/gprofng/src/Expression.h
index 7542853fd64..29d3e4e720f 100644
--- a/gprofng/src/Expression.h
+++ b/gprofng/src/Expression.h
@@ -166,9 +166,7 @@ private:
bool getVal (int propId, Context *ctx);
bool bEval (Context *ctx);
-
bool hasLoadObject ();
- void fixupValues ();
OpCode op;
Value v;
reply other threads:[~2022-04-29 21:04 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20220429210436.EFE743858D28@sourceware.org \
--to=vmezents@sourceware.org \
--cc=bfd-cvs@sourceware.org \
--cc=gdb-cvs@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).