tree-optimization/103361 - fix unroll-and-jam direction vector handling

This properly uses lambda_int instead of truncating the direction
vector to int which leads to false unexpected negative values.

2021-11-23  Richard Biener  <rguenther@suse.de>

	PR tree-optimization/103361
	* gimple-loop-jam.c (adjust_unroll_factor): Use lambda_int
	for the dependence distance.
	* tree-data-ref.c (print_lambda_vector): Properly print a lambda_int.

	* g++.dg/torture/pr103361.C: New testcase.

(cherry picked from commit 6cd440670078af89d82cbb67e01a5ecec8eec238)

diff --git a/gcc/gimple-loop-jam.c b/gcc/gimple-loop-jam.c
index 58d265ea886afc0da527abe10022b69365a24718..bdf818cd333e83e8b7faa2210cca7456fb68250d 100644 (file)
--- a/gcc/gimple-loop-jam.c
+++ b/gcc/gimple-loop-jam.c
@@ -403,10 +403,10 @@ adjust_unroll_factor (class loop *inner, struct data_dependence_relation *ddr,
             a >= N, or b > 0, or b is zero and a > 0.  Otherwise the unroll
             factor needs to be limited so that the first condition holds.
             That may limit the factor down to zero in the worst case.  */
-         int dist = dist_v[0];
+         lambda_int dist = dist_v[0];
          if (dist < 0)
            gcc_unreachable ();
-         else if ((unsigned)dist >= *unroll)
+         else if (dist >= (lambda_int)*unroll)
            ;
          else if (lambda_vector_zerop (dist_v + 1, DDR_NB_LOOPS (ddr) - 1))
            {

diff --git a/gcc/testsuite/g++.dg/torture/pr103361.C b/gcc/testsuite/g++.dg/torture/pr103361.C
new file mode 100644 (file)
index 0000000..ec1d6e1
--- /dev/null
+++ b/gcc/testsuite/g++.dg/torture/pr103361.C
@@ -0,0 +1,18 @@
+/* { dg-do compile } */
+/* { dg-additional-options "-floop-unroll-and-jam" } */
+
+char a, b;
+extern unsigned short c[];
+extern bool d[];
+const unsigned short &e(const unsigned short &f, const unsigned short &g) {
+  if (g < f)
+    return g;
+  return f;
+}
+void k() {
+  for (int h = 0; b; h += 3)
+    for (unsigned long i = 0; i < 11104842004558084287ULL;
+         i += -11104842004558084300ULL)
+      for (bool j(e(6, e(6, c[h + i]))); j < (bool)a; j = 7)
+        d[7] = 0;
+}

diff --git a/gcc/tree-data-ref.c b/gcc/tree-data-ref.c
index a0613ed83ebad39f3c971773c3fb29d4a25c27b4..ba059ebc0de76b14699f8c240922b5954b6c5cdc 100644 (file)
--- a/gcc/tree-data-ref.c
+++ b/gcc/tree-data-ref.c
@@ -391,7 +391,7 @@ print_lambda_vector (FILE * outfile, lambda_vector vector, int n)
   int i;
 
   for (i = 0; i < n; i++)
-    fprintf (outfile, "%3d ", (int)vector[i]);
+    fprintf (outfile, HOST_WIDE_INT_PRINT_DEC " ", vector[i]);
   fprintf (outfile, "\n");
 }