From b094015443c17d6ef43ecfb77b01932701e3b4e4 Mon Sep 17 00:00:00 2001 From: Andrew Pinski Date: Thu, 6 Mar 2008 21:56:04 +0000 Subject: [PATCH] re PR tree-optimization/35402 (Store CCP will not inline static const variable which is default initialized) 2008-03-06 Andrew Pinski PR tree-opt/35402 * tree-ssa-ccp.c (get_symbol_constant_value): Handle integral and scalar float variables which have a NULL DECL_INITIAL. 2008-03-06 Andrew Pinski PR tree-opt/35402 * gcc.dg/tree-ssa/ssa-store-ccp-1.c: New test. From-SVN: r132991 --- gcc/ChangeLog | 7 +++++++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.dg/tree-ssa/ssa-store-ccp-1.c | 14 ++++++++++++++ gcc/tree-ssa-ccp.c | 6 ++++++ 4 files changed, 32 insertions(+) create mode 100644 gcc/testsuite/gcc.dg/tree-ssa/ssa-store-ccp-1.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 5b3525037d9..d3a2325d2b6 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2008-03-06 Andrew Pinski + + PR tree-opt/35402 + * tree-ssa-ccp.c (get_symbol_constant_value): Handle + integral and scalar float variables which have a + NULL DECL_INITIAL. + 2008-03-06 Nathan Froyd * dwarf2out.c (dwarf2out_frame_debug_expr): Consult the diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 38bf08d7db9..b24b8daa07b 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2008-03-06 Andrew Pinski + + PR tree-opt/35402 + * gcc.dg/tree-ssa/ssa-store-ccp-1.c: New test. + 2008-03-06 Markus Milleder PR preprocessor/35458 diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-store-ccp-1.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-store-ccp-1.c new file mode 100644 index 00000000000..aaa3d13cad4 --- /dev/null +++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-store-ccp-1.c @@ -0,0 +1,14 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -fdump-tree-optimized" } */ + +static const int conststaticvariable; + +int f(void) +{ + return conststaticvariable; +} + +/* There should be no reference to conststaticvariable as we should have + inlined the 0. */ +/* { dg-final { scan-tree-dump-times "conststaticvariable" 0 "optimized"} } */ +/* { dg-final { cleanup-tree-dump "optimized" } } */ diff --git a/gcc/tree-ssa-ccp.c b/gcc/tree-ssa-ccp.c index f9f1217c5fc..b9211a5df9c 100644 --- a/gcc/tree-ssa-ccp.c +++ b/gcc/tree-ssa-ccp.c @@ -306,6 +306,12 @@ get_symbol_constant_value (tree sym) if (val && ccp_decl_initial_min_invariant (val)) return val; + /* Variables declared 'const' without an initializer + have zero as the intializer. */ + if (!val + && (INTEGRAL_TYPE_P (TREE_TYPE (sym)) + || SCALAR_FLOAT_TYPE_P (TREE_TYPE (sym)))) + return fold_convert (TREE_TYPE (sym), integer_zero_node); } return NULL_TREE;