From 7d0a07d0c66be19ec1bd822242a6451dc0d3b024 Mon Sep 17 00:00:00 2001 From: Daniel Jacobowitz Date: Tue, 24 Jul 2007 19:44:17 +0000 Subject: [PATCH] tree-ssa-ccp.c (fold_const_aggregate_ref): Use fold_convert. * tree-ssa-ccp.c (fold_const_aggregate_ref): Use fold_convert. * gcc.c-torture/execute/20070724-1.c: New. From-SVN: r126888 --- gcc/ChangeLog | 4 ++++ gcc/testsuite/ChangeLog | 4 ++++ gcc/testsuite/gcc.c-torture/execute/20070724-1.c | 11 +++++++++++ gcc/tree-ssa-ccp.c | 6 ++++-- 4 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gcc.c-torture/execute/20070724-1.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index eabfcb69639..127fa6cb5d0 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2007-07-24 Daniel Jacobowitz + + * tree-ssa-ccp.c (fold_const_aggregate_ref): Use fold_convert. + 2007-07-24 Jan Hubicka * caller-save.c: Include ggc.h, gt-caller-save.h diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 6a39a3a24f3..21dfc140e14 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2007-07-24 Daniel Jacobowitz + + * gcc.c-torture/execute/20070724-1.c: New. + 2007-07-24 Paul Thomas PR fortran/31205 diff --git a/gcc/testsuite/gcc.c-torture/execute/20070724-1.c b/gcc/testsuite/gcc.c-torture/execute/20070724-1.c new file mode 100644 index 00000000000..011a903f8d3 --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/execute/20070724-1.c @@ -0,0 +1,11 @@ +void abort (void); + +static unsigned char magic[] = "\235"; +static unsigned char value = '\235'; + +int main() +{ + if (value != magic[0]) + abort (); + return 0; +} diff --git a/gcc/tree-ssa-ccp.c b/gcc/tree-ssa-ccp.c index 93345a99ccc..8f2868301d5 100644 --- a/gcc/tree-ssa-ccp.c +++ b/gcc/tree-ssa-ccp.c @@ -1053,8 +1053,10 @@ fold_const_aggregate_ref (tree t) == MODE_INT) && GET_MODE_SIZE (TYPE_MODE (TREE_TYPE (TREE_TYPE (ctor)))) == 1 && compare_tree_int (idx, TREE_STRING_LENGTH (ctor)) < 0) - return build_int_cst (TREE_TYPE (t), (TREE_STRING_POINTER (ctor) - [TREE_INT_CST_LOW (idx)])); + return fold_convert (TREE_TYPE (t), + build_int_cst (NULL, + (TREE_STRING_POINTER (ctor) + [TREE_INT_CST_LOW (idx)]))); return NULL_TREE; } -- 2.30.2