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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index eabfcb69639755a88f197827e47575ed40bd1fdb..127fa6cb5d04e83d6549699cd074c79744b58839 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 6a39a3a24f310686783adbd0ce10c1fe56300c9f..21dfc140e14e8e334074ab442dd615e9b721a10c 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 93345a99ccc17b6069093f017ae219db8aa75a14..8f2868301d50e160536cc7d20aebef2921f26b39 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;
        }