lto.c (iterative_hash_canonical_type, [...]): only hash main variants of types

	* lto.c (iterative_hash_canonical_type,
	gimple_register_canonical_type): only hash main variants of types
	* tree.c (verify_type_variant): Verify that type and variant is
	compatible.
	(gimple_canonical_types_compatible_p): Look for main variants.

From-SVN: r224107

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2124e52439bab6221a232a23a9e4b55b3d28efa8..948abe5164348cc73270b7e15b4f6238b188fecf 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2015-06-03  Jan Hubicka  <hubicka@ucw.cz>
+
+       * tree.c (verify_type_variant): Verify that type and variant is
+       compatible.
+       (gimple_canonical_types_compatible_p): Look for main variants.
+
 2015-06-03  Michael Meissner  <meissner@linux.vnet.ibm.com>
 
        * config.gcc (powerpc*-*-*): Add support for a new configure

diff --git a/gcc/lto/ChangeLog b/gcc/lto/ChangeLog
index 6e27922f6eec1e14b4e5534bbd3f4f01d5d1c51c..db0214beb310b083f4f0e4bc8726f3098e94bf16 100644 (file)
--- a/gcc/lto/ChangeLog
+++ b/gcc/lto/ChangeLog
@@ -1,3 +1,8 @@
+2015-06-03  Jan Hubicka  <hubicka@ucw.cz>
+
+       * lto.c (iterative_hash_canonical_type,
+       gimple_register_canonical_type): only hash main variants of types
+
 2015-05-27  Martin Liska  <mliska@suse.cz>
 
        * lto-partition.c (new_partition): Reset number of symbols.

diff --git a/gcc/lto/lto.c b/gcc/lto/lto.c
index 169b025eda5fb5a6f6b40e572bca82a98423e4d0..75774a1060024585db71c58bb1ad6199dcd42a4c 100644 (file)
--- a/gcc/lto/lto.c
+++ b/gcc/lto/lto.c
@@ -413,6 +413,9 @@ static void
 iterative_hash_canonical_type (tree type, inchash::hash &hstate)
 {
   hashval_t v;
+
+  /* All type variants have same TYPE_CANONICAL.  */
+  type = TYPE_MAIN_VARIANT (type);
   /* An already processed type.  */
   if (TYPE_CANONICAL (type))
     {
@@ -498,7 +501,15 @@ gimple_register_canonical_type (tree t)
   if (TYPE_CANONICAL (t) || !type_with_alias_set_p (t))
     return;
 
-  gimple_register_canonical_type_1 (t, hash_canonical_type (t));
+  /* Canonical types are same among all complete variants.  */
+  if (TYPE_CANONICAL (TYPE_MAIN_VARIANT (t)))
+    TYPE_CANONICAL (t) = TYPE_CANONICAL (TYPE_MAIN_VARIANT (t));
+  else
+    {
+      gimple_register_canonical_type_1 (TYPE_MAIN_VARIANT (t),
+                                       hash_canonical_type (TYPE_MAIN_VARIANT (t)));
+      TYPE_CANONICAL (t) = TYPE_CANONICAL (TYPE_MAIN_VARIANT (t));
+    }
 }
 
 /* Re-compute TYPE_CANONICAL for NODE and related types.  */

diff --git a/gcc/tree.c b/gcc/tree.c
index 701a592cca2816596b0344e23dc37c374ca3b1e7..b0aeb74f64d1ae5c9be097eb59a99423a7173be3 100644 (file)
--- a/gcc/tree.c
+++ b/gcc/tree.c
@@ -12855,6 +12855,17 @@ verify_type_variant (const_tree t, tree tv)
       debug_tree (TREE_TYPE (t));
       return false;
     }
+  if (type_with_alias_set_p (t)
+      && !gimple_canonical_types_compatible_p (t, tv, false))
+    {
+      error ("type is not compatible with its vairant");
+      debug_tree (tv);
+      error ("type variant's TREE_TYPE");
+      debug_tree (TREE_TYPE (tv));
+      error ("type's TREE_TYPE");
+      debug_tree (TREE_TYPE (t));
+      return false;
+    }
   return true;
 #undef verify_variant_match
 }
@@ -12879,7 +12890,13 @@ bool
 gimple_canonical_types_compatible_p (const_tree t1, const_tree t2,
                                     bool trust_type_canonical)
 {
-  /* Before starting to set up the SCC machinery handle simple cases.  */
+  /* Type variants should be same as the main variant.  When not doing sanity
+     checking to verify this fact, go to main variants and save some work.  */
+  if (trust_type_canonical)
+    {
+      t1 = TYPE_MAIN_VARIANT (t1);
+      t2 = TYPE_MAIN_VARIANT (t2);
+    }
 
   /* Check first for the obvious case of pointer identity.  */
   if (t1 == t2)