diff options
author | Steven Bosscher <stevenb@suse.de> | 2004-09-17 06:23:54 +0000 |
---|---|---|
committer | Steven Bosscher <steven@gcc.gnu.org> | 2004-09-17 06:23:54 +0000 |
commit | 275a4187085d13c53f0cb27ca74d3d73cebd58f9 (patch) | |
tree | 60dcd3daf28a15902b1426d100e008d5cc20b4d0 | |
parent | b355f2229a07beb1b1b08d1c7e6b7dbac55c8df9 (diff) | |
download | gcc-275a4187085d13c53f0cb27ca74d3d73cebd58f9.zip gcc-275a4187085d13c53f0cb27ca74d3d73cebd58f9.tar.gz gcc-275a4187085d13c53f0cb27ca74d3d73cebd58f9.tar.bz2 |
re PR rtl-optimization/17513 (ICE: verify_flow_info failed after gcse)
PR tree-optimization/17513
* cfgexpand.c (construct_init_block): Clear EDGE_EXECUTABLE
for successors of the entry block.
* gcc.dg/20040916-1.c: New test.
From-SVN: r87632
-rw-r--r-- | gcc/ChangeLog | 6 | ||||
-rw-r--r-- | gcc/cfgexpand.c | 18 | ||||
-rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
-rw-r--r-- | gcc/testsuite/gcc.dg/20040916-1.c | 45 |
4 files changed, 70 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 9b79868..21250cf 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2004-09-17 Steven Bosscher <stevenb@suse.de> + + PR tree-optimization/17513 + * cfgexpand.c (construct_init_block): Clear EDGE_EXECUTABLE + for successors of the entry block. + 2004-09-17 Uros Bizjak <uros@kss-loka.si> PR rtl-optimization/15187 diff --git a/gcc/cfgexpand.c b/gcc/cfgexpand.c index 71dd039..bf179fe 100644 --- a/gcc/cfgexpand.c +++ b/gcc/cfgexpand.c @@ -1082,11 +1082,21 @@ static basic_block construct_init_block (void) { basic_block init_block, first_block; - edge e; + edge e = NULL, e2; + + for (e2 = ENTRY_BLOCK_PTR->succ; e2; e2 = e2->succ_next) + { + /* Clear EDGE_EXECUTABLE. This flag is never used in the backend. - for (e = ENTRY_BLOCK_PTR->succ; e; e = e->succ_next) - if (e->dest == ENTRY_BLOCK_PTR->next_bb) - break; + For all other blocks this edge flag is cleared while expanding + a basic block in expand_gimple_basic_block, but there we never + looked at the successors of the entry block. + This caused PR17513. */ + e2->flags &= ~EDGE_EXECUTABLE; + + if (e2->dest == ENTRY_BLOCK_PTR->next_bb) + e = e2; + } init_block = create_basic_block (NEXT_INSN (get_insns ()), get_last_insn (), diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 7a5fed3..85bc7ed 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2004-09-17 Steven Bosscher <stevenb@suse.de> + + PR tree-optimization/17513 + * gcc.dg/20040916-1.c: New test. + 2004-09-16 Mark Mitchell <mark@codesourcery.com> PR c++/17501 diff --git a/gcc/testsuite/gcc.dg/20040916-1.c b/gcc/testsuite/gcc.dg/20040916-1.c new file mode 100644 index 0000000..fbea9e3 --- /dev/null +++ b/gcc/testsuite/gcc.dg/20040916-1.c @@ -0,0 +1,45 @@ +/* { dg-do compile } */ +/* { dg-options "-O2" } */ + +/* PR17513 - we hit a bug where EDGE_EXECUTABLE was not cleared on + successors of the entry block. This lead to a flow verification + error much later in the compilation (after gcse). */ +typedef unsigned char uint8; +typedef unsigned int uint32; + +uint32 marker = 0; +uint8 *buff = 0; +uint32 bsize = 0; + +extern int foo (void); + +uint32 +bar (void) +{ + int len, d; + + for (;;) + { + if (foo () == 0) + return (0); + + switch (marker) + { + case 0xfe: + { + len |= (*buff++); + bsize -= 2; + + while (len > 0) + { + d = *buff++; + len--; + } + } + break; + default: + break; + } + } +} + |