From f44703b57513db0c6a4ce3ca3fe0ab3ea07bd83d Mon Sep 17 00:00:00 2001 From: Andrew Pinski Date: Sat, 19 Jun 2004 16:16:59 +0000 Subject: [PATCH] re PR c++/15721 (template instantation omits static data members) 2004-06-19 Andrew Pinski PR c++/15721 * toplev.c (wrapup_global_declarations): Do not check TREE_SYMBOL_REFERENCED of the DECL_ASSEMBLER_NAME but check cgraph_varpool_node's needed field. From-SVN: r83386 --- gcc/ChangeLog | 7 +++++++ gcc/toplev.c | 7 ++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 2b7258649b7..4d2160b9eb7 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2004-06-19 Andrew Pinski + + PR c++/15721 + * toplev.c (wrapup_global_declarations): Do not check + TREE_SYMBOL_REFERENCED of the DECL_ASSEMBLER_NAME but check + cgraph_varpool_node's needed field. + 2004-06-19 Jan Hubicka Steven Bosscher diff --git a/gcc/toplev.c b/gcc/toplev.c index 16b45d74ced..b2990bcae77 100644 --- a/gcc/toplev.c +++ b/gcc/toplev.c @@ -762,16 +762,17 @@ wrapup_global_declarations (tree *vec, int len) if (TREE_CODE (decl) == VAR_DECL && TREE_STATIC (decl)) { + struct cgraph_varpool_node *node; bool needed = 1; + node = cgraph_varpool_node (decl); - if (flag_unit_at_a_time - && cgraph_varpool_node (decl)->finalized) + if (flag_unit_at_a_time && node->finalized) needed = 0; else if ((flag_unit_at_a_time && !cgraph_global_info_ready) && (TREE_USED (decl) || TREE_USED (DECL_ASSEMBLER_NAME (decl)))) /* needed */; - else if (TREE_SYMBOL_REFERENCED (DECL_ASSEMBLER_NAME (decl))) + else if (node->needed) /* needed */; else if (DECL_COMDAT (decl)) needed = 0; -- 2.30.2