This fixes some minor ugliness I noticed while looking at this code. It
renames a poorly named global variable (shadowed by some function args
in the same file), replaces a cast of an integer value to a pointer, and
removes an undocumented and unused return value.
Bootstrapped and tested on x86_64-linux, ok?
Bernd
* cgraphunit.c (symtab_terminator): New variable.
(queued_nodes): Renamed from first. Use symtab_terminator as
initializer.
(analyze_functions): Adjust accordingly.
(cgraph_process_new_functions): Return void.
* cgraph.h (cgraph_process_new_functions): Adjust declaration.
diff --git a/gcc/cgraph.h b/gcc/cgraph.h
index 1ac6dfb..0d59a7a 100644
--- a/gcc/cgraph.h
+++ b/gcc/cgraph.h
@@ -737,7 +737,7 @@ void cgraph_finalize_function (tree, bool);
void finalize_compilation_unit (void);
void compile (void);
void init_cgraph (void);
-bool cgraph_process_new_functions (void);
+void cgraph_process_new_functions (void);
void cgraph_process_same_body_aliases (void);
void fixup_same_cpp_alias_visibility (symtab_node *, symtab_node *target, tree);
/* Initialize datastructures so DECL is a function in lowered gimple form.
diff --git a/gcc/cgraphunit.c b/gcc/cgraphunit.c
index 8ab274b..50bc7d3 100644
--- a/gcc/cgraphunit.c
+++ b/gcc/cgraphunit.c
@@ -264,11 +264,13 @@ decide_is_symbol_needed (symtab_node *node)
return false;
}
-/* Head of the queue of nodes to be processed while building callgraph */
+/* Head and terminator of the queue of nodes to be processed while building
+ callgraph. */
-static symtab_node *first = (symtab_node *)(void *)1;
+static symtab_node symtab_terminator;
+static symtab_node *queued_nodes = &symtab_terminator;
-/* Add NODE to queue starting at FIRST.
+/* Add NODE to queue starting at QUEUED_NODES.
The queue is linked via AUX pointers and terminated by pointer to 1. */
static void
@@ -276,25 +278,24 @@ enqueue_node (symtab_node *node)
{
if (node->aux)
return;
- gcc_checking_assert (first);
- node->aux = first;
- first = node;
+ gcc_checking_assert (queued_nodes);
+ node->aux = queued_nodes;
+ queued_nodes = node;
}
/* Process CGRAPH_NEW_FUNCTIONS and perform actions necessary to add these
functions into callgraph in a way so they look like ordinary reachable
functions inserted into callgraph already at construction time. */
-bool
+void
cgraph_process_new_functions (void)
{
- bool output = false;
tree fndecl;
struct cgraph_node *node;
cgraph_node_set_iterator csi;
if (!cgraph_new_nodes)
- return false;
+ return;
handle_alias_pairs ();
/* Note that this queue may grow as its being processed, as the new
functions may generate new ones. */
@@ -309,7 +310,6 @@ cgraph_process_new_functions (void)
it into reachable functions list. */
cgraph_finalize_function (fndecl, false);
- output = true;
cgraph_call_function_insertion_hooks (node);
enqueue_node (node);
break;
@@ -350,7 +350,6 @@ cgraph_process_new_functions (void)
}
free_cgraph_node_set (cgraph_new_nodes);
cgraph_new_nodes = NULL;
- return output;
}
/* As an GCC extension we allow redefinition of the function. The
@@ -980,11 +979,11 @@ analyze_functions (void)
/* Lower representation, build callgraph edges and references for all trivially
needed symbols and all symbols referred by them. */
- while (first != (symtab_node *)(void *)1)
+ while (queued_nodes != &symtab_terminator)
{
changed = true;
- node = first;
- first = (symtab_node *)first->aux;
+ node = queued_nodes;
+ queued_nodes = (symtab_node *)queued_nodes->aux;
cgraph_node *cnode = dyn_cast <cgraph_node> (node);
if (cnode && cnode->definition)
{
