tree-ssa-coalesce.c (gimple_can_coalesce_p): In the optimized case, allow coalescing...

	* tree-ssa-coalesce.c (gimple_can_coalesce_p): In the optimized case,
	allow coalescing if the types are compatible.

From-SVN: r235980

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c65156d0919bed2a29d3f36071aa9b5c0144c78a..0870dfbe7e6861c4aec08d5119f507d8b41caf02 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2016-05-06  Eric Botcazou  <ebotcazou@adacore.com>
+
+       * tree-ssa-coalesce.c (gimple_can_coalesce_p): In the optimized case,
+       allow coalescing if the types are compatible.
+
 2016-05-06  David Malcolm  <dmalcolm@redhat.com>
 
        * pass_manager.h (pass_manager::register_pass_name): New method.

diff --git a/gcc/tree-ssa-coalesce.c b/gcc/tree-ssa-coalesce.c
index 5f8f64514d53c3ecd99fcfac678f8bd1fd744fa3..34c3fa16ccf852343589377e69cf7edaefdf1d29 100644 (file)
--- a/gcc/tree-ssa-coalesce.c
+++ b/gcc/tree-ssa-coalesce.c
@@ -1569,17 +1569,24 @@ gimple_can_coalesce_p (tree name1, tree name2)
                            var2 ? LOCAL_DECL_ALIGNMENT (var2) : TYPE_ALIGN (t2)))
     return false;
 
-  /* If the types are not the same, check for a canonical type match.  This
+  /* If the types are not the same, see whether they are compatible.  This
      (for example) allows coalescing when the types are fundamentally the
-     same, but just have different names. 
-
-     Note pointer types with different address spaces may have the same
-     canonical type.  Those are rejected for coalescing by the
-     types_compatible_p check.  */
-  if (TYPE_CANONICAL (t1)
-      && TYPE_CANONICAL (t1) == TYPE_CANONICAL (t2)
-      && types_compatible_p (t1, t2))
-    goto check_modes;
+     same, but just have different names.
+
+     In the non-optimized case, we must first test TYPE_CANONICAL because
+     we use it to compute the partition_to_base_index of the map.  */
+  if (flag_tree_coalesce_vars)
+    {
+      if (types_compatible_p (t1, t2))
+       goto check_modes;
+    }
+  else
+    {
+      if (TYPE_CANONICAL (t1)
+         && TYPE_CANONICAL (t1) == TYPE_CANONICAL (t2)
+         && types_compatible_p (t1, t2))
+       goto check_modes;
+    }
 
   return false;
 }