From 45676d2b6ca5a09e21e51a0527c3381fcb161cde Mon Sep 17 00:00:00 2001 From: Jan Hubicka Date: Fri, 18 Mar 2005 15:57:10 +0100 Subject: [PATCH] re PR middle-end/20225 (ICE during GC) 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. From-SVN: r96685 --- gcc/ChangeLog | 8 ++++++++ gcc/cgraph.c | 1 + gcc/varasm.c | 25 +++++++++++++++---------- 3 files changed, 24 insertions(+), 10 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index a4a37854763..acc6a133857 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2005-03-18 Jan Hubicka + + 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. + 2005-03-18 Kazu Hirata * tree-into-ssa.c (find_idf): Use VEC_quick_push instead of diff --git a/gcc/cgraph.c b/gcc/cgraph.c index dacc70dfb30..c7475c18eb3 100644 --- a/gcc/cgraph.c +++ b/gcc/cgraph.c @@ -469,6 +469,7 @@ cgraph_mark_reachable_node (struct cgraph_node *node) { notice_global_symbol (node->decl); node->reachable = 1; + gcc_assert (!cgraph_global_info_ready); node->next_needed = cgraph_nodes_queue; cgraph_nodes_queue = node; diff --git a/gcc/varasm.c b/gcc/varasm.c index 2f16f7e6057..5392dae3a5e 100644 --- a/gcc/varasm.c +++ b/gcc/varasm.c @@ -4360,17 +4360,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) -- 2.30.2