re PR ipa/66181 (/usr/include/bits/types.h:134:16: ICE: verify_type failed)

	PR ipa/66181
	* lto.c (compare_tree_sccs_1): Do not compare TYPE_NO_FORCE_BLK.
	* lto-streamer-out.c (hash_tree): Do not hash TYPE_NO_FORCE_BLK.
	* tree-streamer-out.c (pack_ts_type_common_value_fields): Do not stream
	TYPE_NO_FORCE_BLK.
	* tree-streamer-in.c (unpack_ts_type_common_value_fields): Likewise.

From-SVN: r224471

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c9b156f2e8d165307a0e2dc3d5466af98e0e363a..49cd8c7881a656820251a23631faeba1c56e14c9 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2015-06-14  Jan Hubicka  <hubicka@ucw.cz>
+
+       PR ipa/66181
+       * lto-streamer-out.c (hash_tree): Do not hash TYPE_NO_FORCE_BLK.
+       * tree-streamer-out.c (pack_ts_type_common_value_fields): Do not stream
+       TYPE_NO_FORCE_BLK.
+       * tree-streamer-in.c (unpack_ts_type_common_value_fields): Likewise.
+
 2015-06-14  Richard Sandiford  <richard.sandiford@arm.com>
 
        * rtl.h (classify_insn): Declare.

diff --git a/gcc/lto-streamer-out.c b/gcc/lto-streamer-out.c
index 9ee43120080429a9db2b6cd4ff3acc4676c36dcc..f3492c14c1f5ca4da548f8e2fa7b73325f7324b6 100644 (file)
--- a/gcc/lto-streamer-out.c
+++ b/gcc/lto-streamer-out.c
@@ -1119,7 +1119,8 @@ hash_tree (struct streamer_tree_cache_d *cache, hash_map<tree, hashval_t> *map,
     {
       hstate.add_wide_int (TYPE_MODE (t));
       hstate.add_flag (TYPE_STRING_FLAG (t));
-      hstate.add_flag (TYPE_NO_FORCE_BLK (t));
+      /* TYPE_NO_FORCE_BLK is private to stor-layout and need
+        no streaming.  */
       hstate.add_flag (TYPE_NEEDS_CONSTRUCTING (t));
       hstate.add_flag (TYPE_PACKED (t));
       hstate.add_flag (TYPE_RESTRICT (t));

diff --git a/gcc/lto/ChangeLog b/gcc/lto/ChangeLog
index 9665bf096b28c4adb0015bb96f788e0bd0d957a8..af12a06a3fd9c0eaf5cd0fc95396d46723a4d45b 100644 (file)
--- a/gcc/lto/ChangeLog
+++ b/gcc/lto/ChangeLog
@@ -1,3 +1,8 @@
+2015-06-14  Jan Hubicka  <hubicka@ucw.cz>
+
+       PR ipa/66181
+       * lto.c (compare_tree_sccs_1): Do not compare TYPE_NO_FORCE_BLK.
+
 2015-06-12  DJ Delorie  <dj@redhat.com>
 
        * lto-lang.c (lto_type_for_size): Include intN types.

diff --git a/gcc/lto/lto.c b/gcc/lto/lto.c
index b9b11106ac3063b9b360bb56d0cc3a545aac9de5..2001bf3e486f22f1f49904ce9e630a81b4a0fc9a 100644 (file)
--- a/gcc/lto/lto.c
+++ b/gcc/lto/lto.c
@@ -1159,7 +1159,6 @@ compare_tree_sccs_1 (tree t1, tree t2, tree **map)
     {
       compare_values (TYPE_MODE);
       compare_values (TYPE_STRING_FLAG);
-      compare_values (TYPE_NO_FORCE_BLK);
       compare_values (TYPE_NEEDS_CONSTRUCTING);
       if (RECORD_OR_UNION_TYPE_P (t1))
        {

diff --git a/gcc/tree-streamer-in.c b/gcc/tree-streamer-in.c
index 32bd5a7ae05e44aa1f6b62e31b94a20b0803cf9b..9b2d1432aaa6e7ec720db36ef00ff86a9b4247d1 100644 (file)
--- a/gcc/tree-streamer-in.c
+++ b/gcc/tree-streamer-in.c
@@ -370,7 +370,8 @@ unpack_ts_type_common_value_fields (struct bitpack_d *bp, tree expr)
   mode = bp_unpack_machine_mode (bp);
   SET_TYPE_MODE (expr, mode);
   TYPE_STRING_FLAG (expr) = (unsigned) bp_unpack_value (bp, 1);
-  TYPE_NO_FORCE_BLK (expr) = (unsigned) bp_unpack_value (bp, 1);
+  /* TYPE_NO_FORCE_BLK is private to stor-layout and need
+     no streaming.  */
   TYPE_NEEDS_CONSTRUCTING (expr) = (unsigned) bp_unpack_value (bp, 1);
   if (RECORD_OR_UNION_TYPE_P (expr))
     {

diff --git a/gcc/tree-streamer-out.c b/gcc/tree-streamer-out.c
index 623c32bc578aa57cd9cca94347721e42e9a5422e..6543d409bc2ca6e3282f81172d4a79e613eaf97c 100644 (file)
--- a/gcc/tree-streamer-out.c
+++ b/gcc/tree-streamer-out.c
@@ -318,7 +318,8 @@ pack_ts_type_common_value_fields (struct bitpack_d *bp, tree expr)
 {
   bp_pack_machine_mode (bp, TYPE_MODE (expr));
   bp_pack_value (bp, TYPE_STRING_FLAG (expr), 1);
-  bp_pack_value (bp, TYPE_NO_FORCE_BLK (expr), 1);
+  /* TYPE_NO_FORCE_BLK is private to stor-layout and need
+     no streaming.  */
   bp_pack_value (bp, TYPE_NEEDS_CONSTRUCTING (expr), 1);
   if (RECORD_OR_UNION_TYPE_P (expr))
     {