lto-cgraph.c (input_cgraph_1): Don't break existing instrumentation clone references.

	* lto-cgraph.c (input_cgraph_1): Don't break existing
	instrumentation clone references.
	* lto/lto-symtab.c (lto_cgraph_replace_node): Redirect
	instrumented_version references appropriately.

From-SVN: r218507

gcc/ChangeLog

 2014-12-09  Ilya Enkovich  <ilya.enkovich@intel.com>
 
+	* lto-cgraph.c (input_cgraph_1): Don't break existing
+	instrumentation clone references.
+	* lto/lto-symtab.c (lto_cgraph_replace_node): Redirect
+	instrumented_version references appropriately.
+
+2014-12-09  Ilya Enkovich  <ilya.enkovich@intel.com>
+
 	PR bootstrap/63995
 	* tree-chkp.c (chkp_make_static_bounds): Share bounds var
 	between nodes sharing assembler name.

gcc/lto-cgraph.c

@@ -1562,7 +1562,18 @@ input_cgraph_1 (struct lto_file_decl_data *file_data,
 
 	      cnode->instrumented_version = cgraph_node::get (cnode->orig_decl);
 	      if (cnode->instrumented_version)
-		cnode->instrumented_version->instrumented_version = cnode;
+		{
+		  /* We may have multiple nodes for a single function which
+		     will be merged later.  To have a proper merge we need
+		     to keep instrumentation_version reference between nodes
+		     consistent: each instrumented_version reference should
+		     have proper reverse reference.  Thus don't break existing
+		     instrumented_version reference if it already exists.  */
+		  if (cnode->instrumented_version->instrumented_version)
+		    cnode->instrumented_version = NULL;
+		  else
+		    cnode->instrumented_version->instrumented_version = cnode;
+		}
 
 	      /* Restore decl names reference.  */
 	      if (IDENTIFIER_TRANSPARENT_ALIAS (DECL_ASSEMBLER_NAME (cnode->decl))

gcc/lto/lto-symtab.c

@@ -99,6 +99,20 @@ lto_cgraph_replace_node (struct cgraph_node *node,
   /* Redirect incomming references.  */
   prevailing_node->clone_referring (node);
 
+  /* Fix instrumentation references.  */
+  if (node->instrumented_version)
+    {
+      gcc_assert (node->instrumentation_clone
+		  == prevailing_node->instrumentation_clone);
+      node->instrumented_version->instrumented_version = prevailing_node;
+      if (!prevailing_node->instrumented_version)
+	prevailing_node->instrumented_version = node->instrumented_version;
+      /* Need to reset node->instrumented_version to NULL,
+	 otherwise node removal code would reset
+	 node->instrumented_version->instrumented_version.  */
+      node->instrumented_version = NULL;
+    }
+
   ipa_merge_profiles (prevailing_node, node);
   lto_free_function_in_decl_state_for_node (node);