* tree-ssa-ccp.c (fold_const_aggregate_ref): Use fold_convert.

	* gcc.c-torture/execute/20070724-1.c: New.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@126888 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index eabfcb6..127fa6c 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2007-07-24  Daniel Jacobowitz  <dan@codesourcery.com>
+
+       * tree-ssa-ccp.c (fold_const_aggregate_ref): Use fold_convert.
+
 2007-07-24  Jan Hubicka  <jh@suse.cz>
 
        * caller-save.c: Include ggc.h, gt-caller-save.h

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 6a39a3a..21dfc14 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2007-07-24  Daniel Jacobowitz  <dan@codesourcery.com>
+
+       * gcc.c-torture/execute/20070724-1.c: New.
+
 2007-07-24 Paul Thomas <pault@gcc.gnu.org>
 
        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 (file)
index 0000000..011a903
--- /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 93345a9..8f28683 100644 (file)
--- 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;
        }