re PR tree-optimization/49911 (SRA + DOM + VRP + -fstrict-enums incorrectly remove predicate)

2011-09-07  Martin Jambor  <mjambor@suse.cz>

	PR tree-optimization/49911
	* tree-sra.c (analyze_access_subtree): Change type of to-be-replaced
	enumerations to the corresponding plain integer type.

	* testsuite/g++.dg/tree-ssa/pr49911.C: New test.

From-SVN: r178639
This commit is contained in:
Martin Jambor 2011-09-07 16:25:39 +02:00 committed by Martin Jambor
parent 747633c574
commit da990dc0e0
4 changed files with 66 additions and 2 deletions

View File

@ -1,3 +1,9 @@
2011-09-07 Martin Jambor <mjambor@suse.cz>
PR tree-optimization/49911
* tree-sra.c (analyze_access_subtree): Change type of to-be-replaced
enumerations to the corresponding plain integer type.
2011-09-07 Richard Guenther <rguenther@suse.de>
PR tree-optimization/50319

View File

@ -1,3 +1,8 @@
2011-09-07 Martin Jambor <mjambor@suse.cz>
PR tree-optimization/49911
* g++.dg/tree-ssa/pr49911.C: New test.
2011-09-07 Richard Sandiford <richard.sandiford@linaro.org>
PR target/49030

View File

@ -0,0 +1,41 @@
/* { dg-do compile } */
/* { dg-options "-O2 -fno-rtti -fno-exceptions -fno-strict-aliasing -fdump-tree-vrp2" } */
extern void JS_Assert();
typedef enum {
eax, ecx, edx, ebx, esp, ebp,
esi, edi }
RegisterID;
union StateRemat {
RegisterID reg_;
int offset_;
};
static StateRemat FromRegister(RegisterID reg) {
StateRemat sr;
sr.reg_ = reg;
return sr;
}
static StateRemat FromAddress3(int address) {
StateRemat sr;
sr.offset_ = address;
//sr.offset_ = 0;
if (address < 46 && address >= 0) {
JS_Assert();
}
return sr;
}
struct FrameState {
StateRemat dataRematInfo2(bool y, int z) {
if (y) return FromRegister(RegisterID(1));
return FromAddress3(z);
}
};
FrameState frame;
StateRemat x;
void jsop_setelem(bool y, int z) {
x = frame.dataRematInfo2(y, z);
}
/* { dg-final { scan-tree-dump-times "Folding predicate.*45" 0 "vrp2"} } */
/* { dg-final { cleanup-tree-dump "vrp2" } } */

View File

@ -2075,13 +2075,25 @@ analyze_access_subtree (struct access *root, struct access *parent,
|| ((root->grp_scalar_read || root->grp_assignment_read)
&& (root->grp_scalar_write || root->grp_assignment_write))))
{
bool new_integer_type;
if (TREE_CODE (root->type) == ENUMERAL_TYPE)
{
tree rt = root->type;
root->type = build_nonstandard_integer_type (TYPE_PRECISION (rt),
TYPE_UNSIGNED (rt));
new_integer_type = true;
}
else
new_integer_type = false;
if (dump_file && (dump_flags & TDF_DETAILS))
{
fprintf (dump_file, "Marking ");
print_generic_expr (dump_file, root->base, 0);
fprintf (dump_file, " offset: %u, size: %u: ",
fprintf (dump_file, " offset: %u, size: %u ",
(unsigned) root->offset, (unsigned) root->size);
fprintf (dump_file, " to be replaced.\n");
fprintf (dump_file, " to be replaced%s.\n",
new_integer_type ? " with an integer": "");
}
root->grp_to_be_replaced = 1;