cp-tree.h: Include cgraph.h

2004-06-02  Andrew Pinski  <pinskia@physics.uc.edu>

        * cp-tree.h: Include cgraph.h
        (DECL_NEEDED_P): Use cgraph_*node on the decl instead of
        TREE_SYMBOL_REFERENCED on the DECL_ASSEMBLER_NAME of the decl.

From-SVN: r82575

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index c5ea71e..1615c2d 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2004-06-02  Andrew Pinski  <pinskia@physics.uc.edu>
+
+       * cp-tree.h: Include cgraph.h
+       (DECL_NEEDED_P): Use cgraph_*node on the decl instead of
+       TREE_SYMBOL_REFERENCED on the DECL_ASSEMBLER_NAME of the decl.
+
 2004-06-01  Jason Merrill  <jason@redhat.com>
 
        PR c++/15142

diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index 086090c..84d3d47 100644 (file)
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -28,6 +28,7 @@ Boston, MA 02111-1307, USA.  */
 #include "hashtab.h"
 #include "splay-tree.h"
 #include "varray.h"
+#include "cgraph.h"
 
 #include "c-common.h"
 #include "name-lookup.h"
@@ -1710,8 +1711,10 @@ struct lang_decl GTY(())
    not something is comdat until end-of-file.  */
 #define DECL_NEEDED_P(DECL)                                    \
   ((at_eof && TREE_PUBLIC (DECL) && !DECL_COMDAT (DECL))       \
-   || (DECL_ASSEMBLER_NAME_SET_P (DECL)                                \
-       && TREE_SYMBOL_REFERENCED (DECL_ASSEMBLER_NAME (DECL))) \
+   || (DECL_P                                                  \
+       && (TREE_CODE (DECL) == FUNCTION_DECL                   \
+          ? cgraph_node (DECL)->needed                         \
+          : cgraph_varpool_node (DECL)->needed))               \
    || (((flag_syntax_only || flag_unit_at_a_time) && TREE_USED (DECL))))
 
 /* For a FUNCTION_DECL or a VAR_DECL, the language linkage for the