From: Aldy Hernandez <aldyh@redhat.com>
To: GCC patches <gcc-patches@gcc.gnu.org>
Subject: [COMMITTED] Avoid using unavailable objects in jt_state.
Date: Fri, 3 Sep 2021 15:49:53 +0200 [thread overview]
Message-ID: <20210903134951.734347-1-aldyh@redhat.com> (raw)
[Jeff: I'm going to go out on a limb here and commit this under the
obvious rule. If I am overstepping my obvious powers, please let me
know.]
The jump threading state is about to get more interesting, and it may
get with a ranger or with the const_copies/etc helpers. This patch
makes sure we have an object before we attempt to call push_marker or
pop_to_marker.
Tested on x86-64 Linux.
gcc/ChangeLog:
* tree-ssa-threadedge.c (jt_state::push): Only call methods for
which objects are available.
(jt_state::pop): Same.
(jt_state::register_equiv): Same.
(jt_state::register_equivs_on_edge): Same.
---
gcc/tree-ssa-threadedge.c | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/gcc/tree-ssa-threadedge.c b/gcc/tree-ssa-threadedge.c
index 8a485125ff5..e57f6d3e39c 100644
--- a/gcc/tree-ssa-threadedge.c
+++ b/gcc/tree-ssa-threadedge.c
@@ -1323,8 +1323,10 @@ jt_state::jt_state (const_and_copies *copies,
void
jt_state::push (edge)
{
- m_copies->push_marker ();
- m_exprs->push_marker ();
+ if (m_copies)
+ m_copies->push_marker ();
+ if (m_exprs)
+ m_exprs->push_marker ();
if (m_evrp)
m_evrp->push_marker ();
}
@@ -1334,8 +1336,10 @@ jt_state::push (edge)
void
jt_state::pop ()
{
- m_copies->pop_to_marker ();
- m_exprs->pop_to_marker ();
+ if (m_copies)
+ m_copies->pop_to_marker ();
+ if (m_exprs)
+ m_exprs->pop_to_marker ();
if (m_evrp)
m_evrp->pop_to_marker ();
}
@@ -1346,7 +1350,8 @@ jt_state::pop ()
void
jt_state::register_equiv (tree dst, tree src, bool update_range)
{
- m_copies->record_const_or_copy (dst, src);
+ if (m_copies)
+ m_copies->record_const_or_copy (dst, src);
/* If requested, update the value range associated with DST, using
the range from SRC. */
@@ -1396,7 +1401,8 @@ jt_state::record_ranges_from_stmt (gimple *stmt, bool temporary)
void
jt_state::register_equivs_on_edge (edge e)
{
- record_temporary_equivalences (e, m_copies, m_exprs);
+ if (m_copies && m_exprs)
+ record_temporary_equivalences (e, m_copies, m_exprs);
}
jump_threader_simplifier::jump_threader_simplifier (vr_values *v)
--
2.31.1
reply other threads:[~2021-09-03 13:50 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=20210903134951.734347-1-aldyh@redhat.com \
--to=aldyh@redhat.com \
--cc=gcc-patches@gcc.gnu.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).