* lto-symtab.c (lto_symtab_merge_cgraph_nodes_1): Rename to ...

	(lto_symtab_merge_symbols_1): ... this one.
	(lto_symtab_merge_cgraph_nodes): Rename to ...
	(lto_symtab_merge_symbols): ... this one; simplify.
	* cgraph.c (same_body_aliases_done): Rename to ...
	(cpp_implicit_aliases_done): ... this one.
	(cgraph_create_function_alias): Update.
	(cgraph_same_body_alias): Update.
	(dump_cgraph_node): Remove alias dumping; simplify
	thunk dumping.
	(verify_edge_corresponds_to_fndecl): Simplify.
	* cgraph.h (symtab_node_base): Add cpp_implicit_alias,
	alias_target.
	(cgraph_node): Remove same_body_alias.
	(varpool_node): Remove alias_of and extra_name_alias.
	(same_body_aliases_done): Rename to ..
	(cpp_implicit_aliases_done): ... this one.
	(symtab_alias_ultimate_target): Add default parameter.
	(symtab_resolve_alias): New function.
	(fixup_same_cpp_alias_visibility): Declare.
	(cgraph_function_node): Add default parameter.
	(cgraph_node_asm_name): Likewise.
	(cgraph_function_or_thunk_node): Add default parameter; do
	not ICE when it is NULL.
	(varpool_variable_node): Likewise.
	* tree-emutls.c (create_emultls_var): Update.
	(ipa_lower_emutls): Update.
	* cgraphunit.c (cgraph_decide_is_function_needed): Update.
	(cgraph_reset_node): Reset alias info.
	(cgraph_finalize_function): Update.
	(fixup_same_cpp_alias_visibility): Move to symtab.c.
	(analyze_function): Simplify.
	(cgraph_process_same_body_aliases): Simplify.
	(analyze_functions): Fixup same body aliases.
	(handle_alias_pairs): Simplify.
	(assemble_thunk): Update.
	(assemble_thunks_and_aliases): Update.
	(output_weakrefs): Rewrite.
	* lto-cgraph.c (lto_output_node): Rewrite alias handling.
	(lto_output_varpool_node): Likewise.
	(compute_ltrans_boundary): Remve assert.
	(get_alias_symbol): New functoin.
	(input_node): Rewrite alias handling.
	(input_varpool_node): Likewise.
	* ipa-pure-const.c (propagate_pure_const): Fix formating.
	* ipa.c (process_references): Handle weakrefs correctly.
	(symtab_remove_unreachable_nodes): Likewise.
	* trans-mem.c (get_cg_data): Update.
	(ipa_tm_create_version_alias): Update.
	(ipa_tm_execute): Update.
	* symtab.c (dump_symtab_base): Dump aliases.
	(verify_symtab_base): Verify aliases.
	(symtab_node_availability): New function.
	(symtab_alias_ultimate_target): Simplify.
	(fixup_same_cpp_alias_visibility): Move here from cgraphunit.c;
	handle all the fixup cases.
	(symtab_resolve_alias): New function.
	* passes.c (ipa_write_summaries): Handle weakrefs.
	* varpool.c (varpool_analyze_node): Simplify.
	(assemble_aliases): Update.
	(varpool_create_variable_alias): Simplify.
	(varpool_extra_name_alias): Simplify.
	* lto-streamer.h (lto_symtab_merge_cgraph_nodes): Rename to...
	(lto_symtab_merge_symbols): ... this one.

	* decl2.c (cp_write_global_declarations): Replace same_body_alias
	by symbol.cpp_implicit_alias.

	* lto.c (read_cgraph_and_symbols): Simplify dumping; Replace
	lto_symtab_merge_cgraph_nodes by lto_symtab_merge_symbols.
	(do_whole_program_analysis): Update dumping.


git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@199577 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 18 insertions, 74 deletions

diff --git a/gcc/lto-symtab.c b/gcc/lto-symtab.c
index 6c433f42731..2b41933c67e 100644
--- a/gcc/lto-symtab.c
+++ b/gcc/lto-symtab.c
@@ -542,7 +542,7 @@ lto_symtab_merge_decls (void)
 /* Helper to process the decl chain for the symbol table entry *SLOT.  */
 
 static void
-lto_symtab_merge_cgraph_nodes_1 (symtab_node prevailing)
+lto_symtab_merge_symbols_1 (symtab_node prevailing)
 {
   symtab_node e, next;
 
@@ -568,88 +568,32 @@ lto_symtab_merge_cgraph_nodes_1 (symtab_node prevailing)
    lto_symtab_merge_decls.  */
 
 void
-lto_symtab_merge_cgraph_nodes (void)
+lto_symtab_merge_symbols (void)
 {
-  struct cgraph_node *cnode;
-  struct varpool_node *vnode;
   symtab_node node;
 
-  /* Populate assembler name hash.   */
-  symtab_initialize_asm_name_hash ();
-
   if (!flag_ltrans)
-    FOR_EACH_SYMBOL (node)
-      if (lto_symtab_symbol_p (node)
-	  && node->symbol.next_sharing_asm_name
-	  && !node->symbol.previous_sharing_asm_name)
-        lto_symtab_merge_cgraph_nodes_1 (node);
-
-  FOR_EACH_FUNCTION (cnode)
-    {
-      /* Resolve weakrefs to symbol defined in other unit.  */
-      if (!cnode->symbol.analyzed && cnode->thunk.alias && !DECL_P (cnode->thunk.alias))
-	{
-	  symtab_node node = symtab_node_for_asm (cnode->thunk.alias);
-	  if (node && is_a <cgraph_node> (node))
-	    {
-	      struct cgraph_node *n;
-
-	      for (n = cgraph (node); n && n->symbol.alias;
-		   n = n->symbol.analyzed ? cgraph_alias_target (n) : NULL)
-		if (n == cnode)
-		  {
-		    error ("function %q+D part of alias cycle", cnode->symbol.decl);
-		    cnode->symbol.alias = false;
-		    break;
-		  }
-	      if (cnode->symbol.alias)
-		{
-		  cgraph_create_function_alias (cnode->symbol.decl, node->symbol.decl);
-		  ipa_record_reference ((symtab_node)cnode, (symtab_node)node,
-					IPA_REF_ALIAS, NULL);
-		  cnode->symbol.analyzed = true;
-		}
-	    }
-	  else if (node)
-	    error ("%q+D alias in between function and variable is not supported", cnode->symbol.decl);
-	}
-      if ((cnode->thunk.thunk_p || cnode->symbol.alias)
-	  && cnode->thunk.alias && DECL_P (cnode->thunk.alias))
-        cnode->thunk.alias = lto_symtab_prevailing_decl (cnode->thunk.alias);
-      cnode->symbol.aux = NULL;
-    }
-  FOR_EACH_VARIABLE (vnode)
     {
-      /* Resolve weakrefs to symbol defined in other unit.  */
-      if (!vnode->symbol.analyzed && vnode->alias_of && !DECL_P (vnode->alias_of))
+      symtab_initialize_asm_name_hash ();
+
+      /* Do the actual merging.  */
+      FOR_EACH_SYMBOL (node)
+	if (lto_symtab_symbol_p (node)
+	    && node->symbol.next_sharing_asm_name
+	    && !node->symbol.previous_sharing_asm_name)
+	  lto_symtab_merge_symbols_1 (node);
+
+      /* Resolve weakref aliases whose target are now in the compilation unit.  */
+      FOR_EACH_SYMBOL (node)
 	{
-	  symtab_node node = symtab_node_for_asm (vnode->alias_of);
-	  if (node && is_a <cgraph_node> (node))
+	  if (!node->symbol.analyzed && node->symbol.alias_target)
 	    {
-	      struct varpool_node *n;
-
-	      for (n = varpool (node); n && n->symbol.alias;
-		   n = n->symbol.analyzed ? varpool_alias_target (n) : NULL)
-		if (n == vnode)
-		  {
-		    error ("function %q+D part of alias cycle", vnode->symbol.decl);
-		    vnode->symbol.alias = false;
-		    break;
-		  }
-	      if (vnode->symbol.alias)
-		{
-		  varpool_create_variable_alias (vnode->symbol.decl, node->symbol.decl);
-		  ipa_record_reference ((symtab_node)vnode, (symtab_node)node,
-					IPA_REF_ALIAS, NULL);
-		  vnode->symbol.analyzed = true;
-		}
+	      symtab_node tgt = symtab_node_for_asm (node->symbol.alias_target);
+	      if (tgt)
+		symtab_resolve_alias (node, tgt);
 	    }
-	  else if (node)
-	    error ("%q+D alias in between function and variable is not supported", vnode->symbol.decl);
+	  node->symbol.aux = NULL;
 	}
-      if (vnode->symbol.alias && DECL_P (vnode->alias_of))
-        vnode->alias_of = lto_symtab_prevailing_decl (vnode->alias_of);
-      vnode->symbol.aux = NULL;
     }
 }