OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

store-merging: Fix up -fnon-call-exceptions handling [PR94224] 

When we are adding a single store into a store group, we are already
checking that store->lp_nr matches, but we have also code to add further
INTEGER_CST stores into the group right away if the ordering requires that
either we put there all or none from a certain set of stores.  And in those
cases we weren't doing these lp_nr checks, which means we could end up with
stores with different lp_nr in the same group, which then ICEs during
output_merged_store.

2020-03-20  Jakub Jelinek  <jakub@redhat.com>

	PR tree-optimization/94224
	* gimple-ssa-store-merging.c
	(imm_store_chain_info::coalesce_immediate): Don't consider overlapping
	or adjacent INTEGER_CST rhs_code stores as mergeable if they have
	different lp_nr.

	* g++.dg/tree-ssa/pr94224.C: New test.
This commit is contained in:
Jakub Jelinek 2020-03-20 09:33:38 +01:00
parent 05009698ee
commit 4119cd693d
4 changed files with 50 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gcc/ChangeLog
View File

@ -1,3 +1,11 @@
2020-03-20 Jakub Jelinek <jakub@redhat.com>
PR tree-optimization/94224
* gimple-ssa-store-merging.c
(imm_store_chain_info::coalesce_immediate): Don't consider overlapping
or adjacent INTEGER_CST rhs_code stores as mergeable if they have
different lp_nr.
2020-03-20 Andre Vieira <andre.simoesdiasvieira@arm.com>
* config/arm/arm.md (define_attr "conds"): Fix logic for neon and mve.

4
gcc/gimple-ssa-store-merging.c
View File

@ -2773,7 +2773,8 @@ imm_store_chain_info::coalesce_immediate_stores ()
break;
if (info2->order < try_order)
{
if (info2->rhs_code != INTEGER_CST)
if (info2->rhs_code != INTEGER_CST
|| info2->lp_nr != merged_store->lp_nr)
{
/* Normally check_no_overlap makes sure this
doesn't happen, but if end grows below,
@ -2791,6 +2792,7 @@ imm_store_chain_info::coalesce_immediate_stores ()
info2->bitpos + info2->bitsize);
}
else if (info2->rhs_code == INTEGER_CST
&& info2->lp_nr == merged_store->lp_nr
&& !last_iter)
{
max_order = MAX (max_order, info2->order + 1);

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2020-03-20 Jakub Jelinek <jakub@redhat.com>
PR tree-optimization/94224
* g++.dg/tree-ssa/pr94224.C: New test.
2020-03-19 Jan Hubicka <hubicka@ucw.cz>
PR ipa/94202

34
gcc/testsuite/g++.dg/tree-ssa/pr94224.C Normal file
View File

@ -0,0 +1,34 @@
// PR tree-optimization/94224
// { dg-do compile }
// { dg-options "-O2 -fnon-call-exceptions -Wno-return-type" }
void foo (int, int, long);
static inline int
bar (int &x)
{
x = 0;
}
struct U
{
int n, p;
long q;
bool *z;
int a;
U () : n (), z (), a (1) {}
~U () { if (n) foo (p, n, q); }
void baz () { bar (a); }
};
struct W
{
U w[2];
W () { w[0].baz (); }
};
void
qux ()
{
new W;
}