PR middle-end/20225

	* cgraph.c (cgraph_mark_reachable_node): Assert that it is not called
	too late.
	* varasm.c (find_decl_and_mark_needed): Mark needed only when not
	called too late.


git-svn-id: https://gcc.gnu.org/svn/gcc/branches/gcc-4_0-branch@96693 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 15 insertions, 10 deletions

diff --git a/gcc/varasm.c b/gcc/varasm.c
index 953d54a7dd5..5ad57649b8a 100644
--- a/gcc/varasm.c
+++ b/gcc/varasm.c
@@ -4378,17 +4378,22 @@ find_decl_and_mark_needed (tree decl, tree target)
   struct cgraph_node *fnode = NULL;
   struct cgraph_varpool_node *vnode = NULL;
 
-  if (TREE_CODE (decl) == FUNCTION_DECL)
+  /* C++ thunk emitting code produces aliases late in the game.
+     Avoid confusing cgraph code in that case.  */
+  if (!cgraph_global_info_ready)
     {
-      fnode = cgraph_node_for_asm (target);
-      if (fnode == NULL)
-	vnode = cgraph_varpool_node_for_asm (target);
-    }
-  else
-    {
-      vnode = cgraph_varpool_node_for_asm (target);
-      if (vnode == NULL)
-	fnode = cgraph_node_for_asm (target);
+      if (TREE_CODE (decl) == FUNCTION_DECL)
+	{
+	  fnode = cgraph_node_for_asm (target);
+	  if (fnode == NULL)
+	    vnode = cgraph_varpool_node_for_asm (target);
+	}
+      else
+	{
+	  vnode = cgraph_varpool_node_for_asm (target);
+	  if (vnode == NULL)
+	    fnode = cgraph_node_for_asm (target);
+	}
     }
 
   if (fnode)