cgraph.h (cgraph_remove_edge): Declare.

	* cgraph.h (cgraph_remove_edge): Declare.
	* cgraph.c (cgraph_remove_edge): Make extern.
	* cgraphunit.c (cgraph_finalize_function): Call cgraph_remove_edge
	instead of cgraph_remove_call.

From-SVN: r71784

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d630c6e0c9f0d14dea24023fdd849bb7cdf8c6d8..aeb10ca77276ecd7e25b9bdf73a1150633afe8f1 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2003-09-25  Richard Sandiford  <rsandifo@redhat.com>
+
+       * cgraph.h (cgraph_remove_edge): Declare.
+       * cgraph.c (cgraph_remove_edge): Make extern.
+       * cgraphunit.c (cgraph_finalize_function): Call cgraph_remove_edge
+       instead of cgraph_remove_call.
+
 2003-09-25  Ulrich Weigand  <uweigand@de.ibm.com>
 
        * objc/objc-act.c (gen_declaration_1): Fix printf format.

diff --git a/gcc/cgraph.c b/gcc/cgraph.c
index 43238e58ecdbae4cf3e3226a30f95a0d3c39d221..8471a725154f29f4b98b9d96864982fa67f9b54e 100644 (file)
--- a/gcc/cgraph.c
+++ b/gcc/cgraph.c
@@ -68,7 +68,6 @@ static GTY(())  struct cgraph_varpool_node *cgraph_varpool_nodes;
 
 static struct cgraph_edge *create_edge (struct cgraph_node *,
                                        struct cgraph_node *);
-static void cgraph_remove_edge (struct cgraph_node *, struct cgraph_node *);
 static hashval_t hash_node (const void *);
 static int eq_node (const void *, const void *);
 
@@ -180,7 +179,7 @@ create_edge (struct cgraph_node *caller, struct cgraph_node *callee)
 
 /* Remove the edge from CALLER to CALLEE in the cgraph.  */
 
-static void
+void
 cgraph_remove_edge (struct cgraph_node *caller, struct cgraph_node *callee)
 {
   struct cgraph_edge **edge, **edge2;

diff --git a/gcc/cgraph.h b/gcc/cgraph.h
index eb747d57d374d4d372f92f1a4e8639494c9ee848..9bdbfdc0cf78af9cb2d9f46910664a1b31ec5f2d 100644 (file)
--- a/gcc/cgraph.h
+++ b/gcc/cgraph.h
@@ -150,6 +150,7 @@ extern GTY(()) struct cgraph_varpool_node *cgraph_varpool_nodes_queue;
 
 /* In cgraph.c  */
 void dump_cgraph (FILE *);
+void cgraph_remove_edge (struct cgraph_node *, struct cgraph_node *);
 void cgraph_remove_call (tree, tree);
 void cgraph_remove_node (struct cgraph_node *);
 struct cgraph_edge *cgraph_record_call (tree, tree);

diff --git a/gcc/cgraphunit.c b/gcc/cgraphunit.c
index 4ed3f7013c9005add3202dd00eb8566c6cc1322c..ded2f1980e31d1956bbf37c85a6db729db3d9f61 100644 (file)
--- a/gcc/cgraphunit.c
+++ b/gcc/cgraphunit.c
@@ -183,7 +183,7 @@ cgraph_finalize_function (tree decl, bool nested)
       memset (&node->rtl, 0, sizeof (node->rtl));
       node->analyzed = false;
       while (node->callees)
-       cgraph_remove_call (node->decl, node->callees->callee->decl);
+       cgraph_remove_edge (node, node->callees->callee);
 
       /* We may need to re-queue the node for assembling in case
          we already proceeded it and ignored as not needed.  */