cgraph.h (struct cgraph_node): Remove inline_decl member.

2009-05-21  Richard Guenther  <rguenther@suse.de>

	* cgraph.h (struct cgraph_node): Remove inline_decl member.
	* ipa-inline.c (cgraph_mark_inline_edge): Do not check it.
	(cgraph_default_inline_p): Likewise.
	(cgraph_decide_inlining_incrementally): Likewise.

From-SVN: r147776

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c15abbe..a06f118 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2009-05-21  Richard Guenther  <rguenther@suse.de>
+
+       * cgraph.h (struct cgraph_node): Remove inline_decl member.
+       * ipa-inline.c (cgraph_mark_inline_edge): Do not check it.
+       (cgraph_default_inline_p): Likewise.
+       (cgraph_decide_inlining_incrementally): Likewise.
+
 2009-05-21  H.J. Lu  <hongjiu.lu@intel.com>
            Uros Bizjak  <ubizjak@gmail.com>
 

diff --git a/gcc/cgraph.h b/gcc/cgraph.h
index 6f1e052..d391202 100644 (file)
--- a/gcc/cgraph.h
+++ b/gcc/cgraph.h
@@ -213,11 +213,6 @@ struct GTY((chain_next ("%h.next"), chain_prev ("%h.previous"))) cgraph_node {
   unsigned alias : 1;
   /* Set for nodes that was constructed and finalized by frontend.  */
   unsigned finalized_by_frontend : 1;
-
-  /* In non-unit-at-a-time mode the function body of inline candidates is saved
-     into clone before compiling so the function in original form can be
-     inlined later.  This pointer points to the clone.  */
-  tree inline_decl;
 };
 
 typedef struct cgraph_node *cgraph_node_ptr;

diff --git a/gcc/ipa-inline.c b/gcc/ipa-inline.c
index 18eed57..4f37ff3 100644 (file)
--- a/gcc/ipa-inline.c
+++ b/gcc/ipa-inline.c
@@ -258,9 +258,6 @@ cgraph_mark_inline_edge (struct cgraph_edge *e, bool update_original,
   struct cgraph_node *to = NULL, *what;
   struct cgraph_edge *curr = e;
 
-  if (e->callee->inline_decl)
-    cgraph_redirect_edge_callee (e, cgraph_node (e->callee->inline_decl));
-
   gcc_assert (e->inline_failed);
   e->inline_failed = CIF_OK;
 
@@ -425,8 +422,6 @@ cgraph_default_inline_p (struct cgraph_node *n, cgraph_inline_failed_t *reason)
 {
   tree decl = n->decl;
 
-  if (n->inline_decl)
-    decl = n->inline_decl;
   if (!flag_inline_small_functions && !DECL_DECLARED_INLINE_P (decl))
     {
       if (reason)
@@ -1417,7 +1412,7 @@ cgraph_decide_inlining_incrementally (struct cgraph_node *node,
              }
            continue;
          }
-       if (!e->callee->analyzed && !e->callee->inline_decl)
+       if (!e->callee->analyzed)
          {
            if (dump_file)
              {
@@ -1493,7 +1488,7 @@ cgraph_decide_inlining_incrementally (struct cgraph_node *node,
              }
            continue;
          }
-       if (!e->callee->analyzed && !e->callee->inline_decl)
+       if (!e->callee->analyzed)
          {
            if (dump_file)
              {