Patchwork Fix PR51497

login
register
mail settings
Submitter Richard Guenther
Date Dec. 14, 2011, 3:30 p.m.
Message ID <alpine.LNX.2.00.1112141629091.4527@zhemvz.fhfr.qr>
Download mbox | patch
Permalink /patch/131420/
State New
Headers show

Comments

Richard Guenther - Dec. 14, 2011, 3:30 p.m.
This fixes PR51497 by making sure to fixup types that are streamed
locally.

LTO bootstrapped and tested on x86_64-unknown-linux-gnu, SPEC 2k6
smoke-tested and applied.

Richard.

2011-12-14  Richard Guenther  <rguenther@suse.de>

	PR lto/51497
	* lto-streamer-in.c (lto_read_body): Fixup local types
	TYPE_CANONICAL and variant chain.

Patch

Index: gcc/lto-streamer-in.c
===================================================================
--- gcc/lto-streamer-in.c	(revision 182329)
+++ gcc/lto-streamer-in.c	(working copy)
@@ -1012,6 +1012,7 @@  lto_read_body (struct lto_file_decl_data
       struct function *fn = DECL_STRUCT_FUNCTION (fn_decl);
       struct lto_in_decl_state *decl_state;
       struct cgraph_node *node = cgraph_get_node (fn_decl);
+      unsigned from;
 
       gcc_checking_assert (node);
       push_cfun (fn);
@@ -1025,7 +1026,33 @@  lto_read_body (struct lto_file_decl_data
       input_cfg (&ib_cfg, fn, node->count_materialization_scale);
 
       /* Set up the struct function.  */
+      from = VEC_length (tree, data_in->reader_cache->nodes);
       input_function (fn_decl, data_in, &ib_main);
+      /* And fixup types we streamed locally.  */
+	{
+	  struct streamer_tree_cache_d *cache = data_in->reader_cache;
+	  unsigned len = VEC_length (tree, cache->nodes);
+	  unsigned i;
+	  for (i = len; i-- > from;)
+	    {
+	      tree t = VEC_index (tree, cache->nodes, i);
+	      if (t == NULL_TREE)
+		continue;
+
+	      if (TYPE_P (t))
+		{
+		  gcc_assert (TYPE_CANONICAL (t) == NULL_TREE);
+		  TYPE_CANONICAL (t) = TYPE_MAIN_VARIANT (t);
+		  if (TYPE_MAIN_VARIANT (t) != t)
+		    {
+		      gcc_assert (TYPE_NEXT_VARIANT (t) == NULL_TREE);
+		      TYPE_NEXT_VARIANT (t)
+			= TYPE_NEXT_VARIANT (TYPE_MAIN_VARIANT (t));
+		      TYPE_NEXT_VARIANT (TYPE_MAIN_VARIANT (t)) = t;
+		    }
+		}
+	    }
+	}
 
       /* We should now be in SSA.  */
       cfun->gimple_df->in_ssa_p = true;