re PR tree-optimization/85257 (wrong code with -O -fno-tree-ccp and reading zeroed...

	PR tree-optimization/85257
	* fold-const.c (native_encode_vector): If not all elts could fit
	and off is -1, return 0 rather than offset.
	* tree-ssa-sccvn.c (vn_reference_lookup_3): Pass
	(offseti - offset2) / BITS_PER_UNIT as 4th argument to
	native_encode_expr.  Verify len * BITS_PER_UNIT >= maxsizei.  Don't
	adjust buffer in native_interpret_expr call.

	* gcc.dg/pr85257.c: New test.

From-SVN: r259206

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1f0dff3f6ab4630e372ea48b0e588b2d411cd6d3..85cf26a8800e172f86833f3d4d619d54decd76b9 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+2018-04-07  Jakub Jelinek  <jakub@redhat.com>
+
+       PR tree-optimization/85257
+       * fold-const.c (native_encode_vector): If not all elts could fit
+       and off is -1, return 0 rather than offset.
+       * tree-ssa-sccvn.c (vn_reference_lookup_3): Pass
+       (offseti - offset2) / BITS_PER_UNIT as 4th argument to
+       native_encode_expr.  Verify len * BITS_PER_UNIT >= maxsizei.  Don't
+       adjust buffer in native_interpret_expr call.
+
 2018-04-07  Monk Chiang  <sh.chiang04@gmail.com>
 
        * config/nds32/constants.md (unspec_volatile_element): Add cache

diff --git a/gcc/fold-const.c b/gcc/fold-const.c
index 3134f8e638320d4b4c6bf5a7a598080672b657c6..3a99b66cf452ef914f99138fa0e1150160890010 100644 (file)
--- a/gcc/fold-const.c
+++ b/gcc/fold-const.c
@@ -7307,7 +7307,7 @@ native_encode_vector (const_tree expr, unsigned char *ptr, int len, int off)
        return 0;
       offset += res;
       if (offset >= len)
-       return offset;
+       return (off == -1 && i < count - 1) ? 0 : offset;
       if (off != -1)
        off = 0;
     }

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index dad3874ff95fb3bfbf80f8329705c85cd7cbfd74..00ac96fca36399add7fbd33ca0615be0f462c95e 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2018-04-07  Jakub Jelinek  <jakub@redhat.com>
+
+       PR tree-optimization/85257
+       * gcc.dg/pr85257.c: New test.
+
 2018-04-06  Eric Botcazou  <ebotcazou@adacore.com>
 
        * g++.dg/opt/pr85196.C: New test.

diff --git a/gcc/testsuite/gcc.dg/pr85257.c b/gcc/testsuite/gcc.dg/pr85257.c
new file mode 100644 (file)
index 0000000..3bf07b3
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr85257.c
@@ -0,0 +1,20 @@
+/* PR tree-optimization/85257 */
+/* { dg-do run { target int128 } } */
+/* { dg-options "-O2 -fno-tree-ccp" } */
+
+typedef __int128 V __attribute__ ((__vector_size__ (16 * sizeof (__int128))));
+
+__int128 __attribute__ ((noipa))
+foo (void)
+{
+  V v = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16 };
+  return v[5];
+}
+
+int
+main ()
+{
+  if (foo () != 6)
+    __builtin_abort ();
+  return 0;
+}

diff --git a/gcc/tree-ssa-sccvn.c b/gcc/tree-ssa-sccvn.c
index 4e5f3385f9d80da11491cc27ec4a0773d4ffab41..1463c1d411651da649ea44ae57fec2e68572d8f1 100644 (file)
--- a/gcc/tree-ssa-sccvn.c
+++ b/gcc/tree-ssa-sccvn.c
@@ -2038,8 +2038,9 @@ vn_reference_lookup_3 (ao_ref *ref, tree vuse, void *vr_,
          if (TREE_CODE (rhs) == SSA_NAME)
            rhs = SSA_VAL (rhs);
          len = native_encode_expr (gimple_assign_rhs1 (def_stmt),
-                                   buffer, sizeof (buffer));
-         if (len > 0)
+                                   buffer, sizeof (buffer),
+                                   (offseti - offset2) / BITS_PER_UNIT);
+         if (len > 0 && len * BITS_PER_UNIT >= maxsizei)
            {
              tree type = vr->type;
              /* Make sure to interpret in a type that has a range
@@ -2048,10 +2049,7 @@ vn_reference_lookup_3 (ao_ref *ref, tree vuse, void *vr_,
                  && maxsizei != TYPE_PRECISION (vr->type))
                type = build_nonstandard_integer_type (maxsizei,
                                                       TYPE_UNSIGNED (type));
-             tree val = native_interpret_expr (type,
-                                               buffer
-                                               + ((offseti - offset2)
-                                                  / BITS_PER_UNIT),
+             tree val = native_interpret_expr (type, buffer,
                                                maxsizei / BITS_PER_UNIT);
              /* If we chop off bits because the types precision doesn't
                 match the memory access size this is ok when optimizing