From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1011) id 43C2139AD07C; Thu, 24 Jun 2021 17:34:11 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 43C2139AD07C MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Andrew Macleod To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-1796] Fix relation query of equivalences. X-Act-Checkin: gcc X-Git-Author: Andrew MacLeod X-Git-Refname: refs/heads/master X-Git-Oldrev: 5bdcfb74ff97b42f08993af8614c35685fdd8689 X-Git-Newrev: ce0b409f562cd09c67cc2dce74143a0f0647cde5 Message-Id: <20210624173411.43C2139AD07C@sourceware.org> Date: Thu, 24 Jun 2021 17:34:11 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Jun 2021 17:34:11 -0000 https://gcc.gnu.org/g:ce0b409f562cd09c67cc2dce74143a0f0647cde5 commit r12-1796-gce0b409f562cd09c67cc2dce74143a0f0647cde5 Author: Andrew MacLeod Date: Thu Jun 24 11:13:47 2021 -0400 Fix relation query of equivalences. When looking for relations between equivalencies, a typo was causing the wrong bitmap to be checked. Effect was is missed them. Plus don't dump blocks which don't exist. * value-relation.cc (equiv_oracle::dump): Do not dump NULL blocks. (relation_oracle::find_relation_block): Check correct bitmap. (relation_oracle::dump): Do not dump NULL blocks. Diff: --- gcc/value-relation.cc | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/gcc/value-relation.cc b/gcc/value-relation.cc index 3c8698f2a54..43fcab7995a 100644 --- a/gcc/value-relation.cc +++ b/gcc/value-relation.cc @@ -444,7 +444,7 @@ equiv_oracle::dump (FILE *f) const { fprintf (f, "Equivalency dump\n"); for (unsigned i = 0; i < m_equiv.length (); i++) - if (m_equiv[i]) + if (m_equiv[i] && BASIC_BLOCK_FOR_FN (cfun, i)) { fprintf (f, "BB%d\n", i); dump (f, BASIC_BLOCK_FOR_FN (cfun, i)); @@ -757,9 +757,9 @@ relation_oracle::find_relation_block (unsigned bb, const_bitmap b1, { unsigned op1 = SSA_NAME_VERSION (ptr->op1 ()); unsigned op2 = SSA_NAME_VERSION (ptr->op2 ()); - if (bitmap_bit_p (b1, op1) && bitmap_bit_p (b1, op2)) + if (bitmap_bit_p (b1, op1) && bitmap_bit_p (b2, op2)) return ptr->kind (); - if (bitmap_bit_p (b1, op2) && bitmap_bit_p (b1, op1)) + if (bitmap_bit_p (b1, op2) && bitmap_bit_p (b2, op1)) return relation_swap (ptr->kind ()); } @@ -925,8 +925,9 @@ relation_oracle::dump (FILE *f) const { fprintf (f, "Relation dump\n"); for (unsigned i = 0; i < m_relations.length (); i++) - { - fprintf (f, "BB%d\n", i); - dump (f, BASIC_BLOCK_FOR_FN (cfun, i)); - } + if (BASIC_BLOCK_FOR_FN (cfun, i)) + { + fprintf (f, "BB%d\n", i); + dump (f, BASIC_BLOCK_FOR_FN (cfun, i)); + } }