mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-11 08:50:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

analyzer: fix ICE with equiv_class constant (PR 93649)

Browse Source 
gcc/analyzer/ChangeLog:
	PR analyzer/93649
	* constraint-manager.cc (constraint_manager::add_constraint): When
	merging equivalence classes and updating m_constant, also update
	m_cst_sid.
	(constraint_manager::validate): If m_constant is non-NULL assert
	that m_cst_sid is non-null and is valid.

gcc/testsuite/ChangeLog:
	PR analyzer/93649
	* gcc.dg/analyzer/torture/pr93649.c: New test.
This commit is contained in:
David Malcolm 2020-02-10 16:47:21 -05:00
parent 5e17c1bdad
commit cd28b75921
4 changed files with 86 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gcc/analyzer/ChangeLog
View File

@ -1,3 +1,12 @@
2020-02-11 David Malcolm <dmalcolm@redhat.com>
PR analyzer/93649
* constraint-manager.cc (constraint_manager::add_constraint): When
merging equivalence classes and updating m_constant, also update
m_cst_sid.
(constraint_manager::validate): If m_constant is non-NULL assert
that m_cst_sid is non-null and is valid.
2020-02-11 David Malcolm <dmalcolm@redhat.com>
PR analyzer/93657

8
gcc/analyzer/constraint-manager.cc
View File

@ -686,8 +686,8 @@ constraint_manager::add_constraint (equiv_class_id lhs_ec_id,
if (rhs_ec_obj.m_constant)
{
//gcc_assert (lhs_ec_obj.m_constant == NULL);
lhs_ec_obj.m_constant = rhs_ec_obj.m_constant;
lhs_ec_obj.m_cst_sid = rhs_ec_obj.m_cst_sid;
}
/* Drop rhs equivalence class, overwriting it with the
@ -1516,7 +1516,11 @@ constraint_manager::validate () const
gcc_assert (sid->as_int () < get_num_svalues ());
}
if (ec->m_constant)
gcc_assert (CONSTANT_CLASS_P (ec->m_constant));
{
gcc_assert (CONSTANT_CLASS_P (ec->m_constant));
gcc_assert (!ec->m_cst_sid.null_p ());
gcc_assert (ec->m_cst_sid.as_int () < get_num_svalues ());
}
#if 0
else
gcc_assert (ec->m_vars.length () > 0);

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2020-02-11 David Malcolm <dmalcolm@redhat.com>
PR analyzer/93649
* gcc.dg/analyzer/torture/pr93649.c: New test.
2020-02-11 Will Schmidt <will_schmidt@vnet.ibm.com>
* gcc.target/powerpc/pr70010-2.c: Add -maltivec.

66
gcc/testsuite/gcc.dg/analyzer/torture/pr93649.c Normal file
View File

@ -0,0 +1,66 @@
/* { dg-additional-options "-Wno-incompatible-pointer-types -Wno-analyzer-too-complex" } */
/* TODO: ideally we shouldn't have -Wno-analyzer-too-complex above; it
appears to be needed due to the recursion. */
struct tz {
int qc;
};
struct wp {
struct tz *p2;
} *ov;
struct dz {
struct wp *r5;
};
void
za (void);
void
h5 (struct dz *);
int
e7 (struct wp *f2)
{
return f2 == ov;
}
void
wr (struct wp *sw)
{
if (sw != 0)
za ();
}
void
m6 (const struct dz *gq)
{
wr (gq->r5);
asm ("" : "+m" (gq));
if (0)
{
asm ("" : "+m" (gq->r5->p2->qc));
asm ("" : "+m" (gq->r5->p2->qc));
}
asm ("" : "+m" (gq->r5->p2->qc));
if (e7 (gq->r5))
za ();
}
void
ts (struct dz *cx)
{
struct dz nt;
if (nt.r5)
{
m6 (cx);
h5 (cx);
ts (&cx);
}
}