Use proper type in linear transformation in tree-switch-conversion (PR tree-optimizat...

2019-01-08  Martin Liska  <mliska@suse.cz>

	PR tree-optimization/88753
	* tree-switch-conversion.c (switch_conversion::build_one_array):
	Come up with local variable constructor.  Convert first to
	type of constructor values.
2019-01-08  Martin Liska  <mliska@suse.cz>

	PR tree-optimization/88753
	* gcc.dg/tree-ssa/pr88753.c: New test.

From-SVN: r267728

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bc313e171af483da1683a33f6ca945d67a9088a3..c512ff496a8dee06da4be92b88b49d3696b79ef1 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2019-01-08  Martin Liska  <mliska@suse.cz>
+
+       PR tree-optimization/88753
+       * tree-switch-conversion.c (switch_conversion::build_one_array):
+       Come up with local variable constructor.  Convert first to
+       type of constructor values.
+
 2019-01-08  Richard Biener  <rguenther@suse.de>
 
        PR tree-optimization/86554

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 98a851c072cf4c133254db3b0633c70383aa0e0e..c53bf5a6ee77275fb0a858fdc9add61d3dd61127 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-01-08  Martin Liska  <mliska@suse.cz>
+
+       PR tree-optimization/88753
+       * gcc.dg/tree-ssa/pr88753.c: New test.
+
 2019-01-08  Richard Biener  <rguenther@suse.de>
 
        PR tree-optimization/86554

diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr88753.c b/gcc/testsuite/gcc.dg/tree-ssa/pr88753.c
new file mode 100644 (file)
index 0000000..eaefc38
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr88753.c
@@ -0,0 +1,57 @@
+/* PR tree-optimization/88753 */
+/* { dg-options "-O2 -fdump-tree-switchconv" } */
+/* { dg-do run { target nonpic } } */
+
+typedef unsigned short int uint16_t;
+typedef unsigned char uint8_t;
+
+uint16_t length;
+uint16_t enc_method_global;
+
+uint8_t
+__attribute__((noipa))
+_zip_buffer_get_8(int buffer)
+{
+  return buffer;
+}
+
+  int
+  __attribute__((noipa))
+foo(int v)
+{
+  uint16_t enc_method;
+  switch (_zip_buffer_get_8(v)) {
+    case 1:
+      enc_method = 0x0101;
+      break;
+    case 2:
+      enc_method = 0x0102;
+      break;
+    case 3:
+      enc_method = 0x0103;
+      break;
+    default:
+      __builtin_abort ();
+  }
+
+  enc_method_global = enc_method;
+}
+
+int main(int argc, char **argv)
+{
+  foo (1);
+  if (enc_method_global != 0x0101)
+    __builtin_abort ();
+
+  foo (2);
+  if (enc_method_global != 0x0102)
+    __builtin_abort ();
+
+  foo (3);
+  if (enc_method_global != 0x0103)
+    __builtin_abort ();
+
+  return 0;
+}
+
+/* { dg-final { scan-tree-dump-times "Linear transformation with A = 1 and B = 256" 1 "switchconv" } } */

diff --git a/gcc/tree-switch-conversion.c b/gcc/tree-switch-conversion.c
index 614c450dd4d0a83a1db2ff5af483caac208b85c8..c3f2baf39d70de39180311c7cc36dfe282b865eb 100644 (file)
--- a/gcc/tree-switch-conversion.c
+++ b/gcc/tree-switch-conversion.c
@@ -473,8 +473,10 @@ switch_conversion::contains_linear_function_p (vec<constructor_elt, va_gc> *vec,
   if (TREE_CODE (elt0) != INTEGER_CST || TREE_CODE (elt1) != INTEGER_CST)
     return false;
 
-  wide_int range_min = wi::to_wide (fold_convert (TREE_TYPE (elt0),
-                                                 m_range_min));
+  wide_int range_min
+    = wide_int::from (wi::to_wide (m_range_min),
+                     TYPE_PRECISION (TREE_TYPE (elt0)),
+                     TYPE_SIGN (TREE_TYPE (m_range_min)));
   wide_int y1 = wi::to_wide (elt0);
   wide_int y2 = wi::to_wide (elt1);
   wide_int a = y2 - y1;
@@ -600,9 +602,9 @@ switch_conversion::build_one_array (int num, tree arr_index_type,
   name = copy_ssa_name (PHI_RESULT (phi));
   m_target_inbound_names[num] = name;
 
+  vec<constructor_elt, va_gc> *constructor = m_constructors[num];
   wide_int coeff_a, coeff_b;
-  bool linear_p = contains_linear_function_p (m_constructors[num], &coeff_a,
-                                             &coeff_b);
+  bool linear_p = contains_linear_function_p (constructor, &coeff_a, &coeff_b);
   if (linear_p)
     {
       if (dump_file && coeff_a.to_uhwi () > 0)
@@ -610,7 +612,8 @@ switch_conversion::build_one_array (int num, tree arr_index_type,
                 " and B = %" PRId64 "\n", coeff_a.to_shwi (),
                 coeff_b.to_shwi ());
 
-      tree t = unsigned_type_for (TREE_TYPE (m_index_expr));
+      /* We must use type of constructor values.  */
+      tree t = unsigned_type_for (TREE_TYPE ((*constructor)[0].value));
       gimple_seq seq = NULL;
       tree tmp = gimple_convert (&seq, t, m_index_expr);
       tree tmp2 = gimple_build (&seq, MULT_EXPR, t,
@@ -633,10 +636,10 @@ switch_conversion::build_one_array (int num, tree arr_index_type,
          unsigned int i;
          constructor_elt *elt;
 
-         FOR_EACH_VEC_SAFE_ELT (m_constructors[num], i, elt)
+         FOR_EACH_VEC_SAFE_ELT (constructor, i, elt)
            elt->value = fold_convert (value_type, elt->value);
        }
-      ctor = build_constructor (array_type, m_constructors[num]);
+      ctor = build_constructor (array_type, constructor);
       TREE_CONSTANT (ctor) = true;
       TREE_STATIC (ctor) = true;