diff options
| author | Richard Guenther <rguenther@suse.de> | 2008-03-27 16:32:28 +0000 |
|---|---|---|
| committer | Richard Biener <rguenth@gcc.gnu.org> | 2008-03-27 16:32:28 +0000 |
| commit | 62bc00e258331aeba39f47e9fee275f4ba5b7956 (patch) | |
| tree | c628fc1d3e3534745082337d622e3b846f62f870 | |
| parent | 525521b6ddb69a9f0478704e0eec2231c0923d2d (diff) | |
| download | gcc-62bc00e258331aeba39f47e9fee275f4ba5b7956.zip gcc-62bc00e258331aeba39f47e9fee275f4ba5b7956.tar.gz gcc-62bc00e258331aeba39f47e9fee275f4ba5b7956.tar.bz2 | |
re PR tree-optimization/32810 (Not folding of const element for goto)
2008-03-27 Richard Guenther <rguenther@suse.de>
PR tree-optimization/32810
* tree-ssa-ccp.c (get_symbol_constant_value): Strip useless
conversions from DECL_INITIAL.
(fold_const_aggregate_ref): Likewise from constructor elements.
* gcc.dg/tree-ssa/ssa-ccp-18.c: New testcase.
From-SVN: r133645
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-18.c | 20 | ||||
| -rw-r--r-- | gcc/tree-ssa-ccp.c | 19 |
4 files changed, 46 insertions, 5 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 337716a..215f0b2 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2008-03-27 Richard Guenther <rguenther@suse.de> + + PR tree-optimization/32810 + * tree-ssa-ccp.c (get_symbol_constant_value): Strip useless + conversions from DECL_INITIAL. + (fold_const_aggregate_ref): Likewise from constructor elements. + 2008-03-27 Zdenek Dvorak <ook@ucw.cz> * tree-affine.h (aff_combination_expand): Declare. diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 42b5dcd..abaed69 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2008-03-27 Richard Guenther <rguenther@suse.de> + + PR tree-optimization/32810 + * gcc.dg/tree-ssa/ssa-ccp-18.c: New testcase. + 2008-03-27 Douglas Gregor <doug.gregor@gmail.com> * g++.dg/cpp0x/variadic91.C: New. diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-18.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-18.c new file mode 100644 index 0000000..cbe1259 --- /dev/null +++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-18.c @@ -0,0 +1,20 @@ +/* { dg-do compile } */ +/* { dg-options "-O -fdump-tree-ccp1" } */ + +/* Check that we constant propagate &&c into the goto and remove + the unreachable BBs. */ + +void a(int*); void b(int*); void c(int*); void d(int*); +void func2(int* val) +{ + const void *const labels[] = { &&a, &&b, &&c, &&d }; + goto *labels[2]; + a: a(val); + b: b(val); + c: c(val); + d: d(val); +} + +/* { dg-final { scan-tree-dump-not "a \\\(" "ccp1" } } */ +/* { dg-final { scan-tree-dump-not "b \\\(" "ccp1" } } */ +/* { dg-final { cleanup-tree-dump "ccp1" } } */ diff --git a/gcc/tree-ssa-ccp.c b/gcc/tree-ssa-ccp.c index 8dcc759..9bba505 100644 --- a/gcc/tree-ssa-ccp.c +++ b/gcc/tree-ssa-ccp.c @@ -278,9 +278,12 @@ get_symbol_constant_value (tree sym) && !MTAG_P (sym)) { tree val = DECL_INITIAL (sym); - if (val - && is_gimple_min_invariant (val)) - return val; + if (val) + { + STRIP_USELESS_TYPE_CONVERSION (val); + if (is_gimple_min_invariant (val)) + return val; + } /* Variables declared 'const' without an initializer have zero as the intializer if they may not be overridden at link or run time. */ @@ -1104,7 +1107,10 @@ fold_const_aggregate_ref (tree t) /* Whoo-hoo! I'll fold ya baby. Yeah! */ FOR_EACH_CONSTRUCTOR_ELT (CONSTRUCTOR_ELTS (ctor), cnt, cfield, cval) if (tree_int_cst_equal (cfield, idx)) - return cval; + { + STRIP_USELESS_TYPE_CONVERSION (cval); + return cval; + } break; case COMPONENT_REF: @@ -1144,7 +1150,10 @@ fold_const_aggregate_ref (tree t) if (cfield == field /* FIXME: Handle bit-fields. */ && ! DECL_BIT_FIELD (cfield)) - return cval; + { + STRIP_USELESS_TYPE_CONVERSION (cval); + return cval; + } break; case REALPART_EXPR: |