From 50efcce1d5ea69be69e39048d9649264ddcd7361 Mon Sep 17 00:00:00 2001 From: Jan Hubicka Date: Tue, 27 May 2014 06:18:38 +0200 Subject: [PATCH] tree.h (decl_comdat_group): Declare. * tree.h (decl_comdat_group): Declare. * cgraph.h (symtab_in_same_comdat_p): Move offline to ... * tree.c (decl_comdat_group): Here. From-SVN: r210956 --- gcc/ChangeLog | 6 ++++++ gcc/cgraph.h | 10 ---------- gcc/tree.c | 10 ++++++++++ gcc/tree.h | 1 + 4 files changed, 17 insertions(+), 10 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 9d5ae9263203..61b5a44112ff 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2014-05-26 Jan Hubicka + + * tree.h (decl_comdat_group): Declare. + * cgraph.h (symtab_in_same_comdat_p): Move offline to ... + * tree.c (decl_comdat_group): Here. + 2014-05-26 Richard Sandiford PR rtl-optimization/61222 diff --git a/gcc/cgraph.h b/gcc/cgraph.h index 91bcc000369a..8556e2d1774b 100644 --- a/gcc/cgraph.h +++ b/gcc/cgraph.h @@ -1621,14 +1621,4 @@ symtab_in_same_comdat_p (symtab_node *one, symtab_node *two) return one->get_comdat_group () == two->get_comdat_group (); } - -/* Return comdat group of DECL. */ -static inline tree -decl_comdat_group (tree node) -{ - struct symtab_node *snode = symtab_get_node (node); - if (!snode) - return NULL; - return snode->get_comdat_group (); -} #endif /* GCC_CGRAPH_H */ diff --git a/gcc/tree.c b/gcc/tree.c index bfdfebdf2de6..394a821c01aa 100644 --- a/gcc/tree.c +++ b/gcc/tree.c @@ -603,6 +603,16 @@ decl_assembler_name (tree decl) return DECL_WITH_VIS_CHECK (decl)->decl_with_vis.assembler_name; } +/* Return comdat group of DECL. */ +tree +decl_comdat_group (tree node) +{ + struct symtab_node *snode = symtab_get_node (node); + if (!snode) + return NULL; + return snode->get_comdat_group (); +} + /* Compute the number of bytes occupied by a tree with code CODE. This function cannot be used for nodes that have variable sizes, including TREE_VEC, INTEGER_CST, STRING_CST, and CALL_EXPR. */ diff --git a/gcc/tree.h b/gcc/tree.h index 1382c78bb317..de2b5c84f36d 100644 --- a/gcc/tree.h +++ b/gcc/tree.h @@ -3431,6 +3431,7 @@ tree_operand_check_code (const_tree __t, enum tree_code __code, int __i, || ((NODE) && TREE_TYPE ((NODE)) == error_mark_node)) extern tree decl_assembler_name (tree); +extern tree decl_comdat_group (tree); /* Compute the number of bytes occupied by 'node'. This routine only looks at TREE_CODE and, if the code is TREE_VEC, TREE_VEC_LENGTH. */ -- 2.47.3