cgraph.c (cgraph_function_possibly_inlined_p): Do not rely on DECL_INLINE.

	* cgraph.c (cgraph_function_possibly_inlined_p): Do not rely on DECL_INLINE.
	* cgraphunit.c (record_cdtor_fn): Do not initialize DECL_INLINE
	(cgraph_preserve_function_body_p): Do not rely on DECL_INLINE.
	* dojump.c (clear_pending_stack_adjust): Likewise.
	* print-tree.c (print_node): Ignore DECL_INLINE.
	* tree-inline.c (inlinable_function_p): Likewise.

From-SVN: r138165

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ed4a31c36be78b64dd17a357b06061c80bda4520..a461d7b1c3c6415156daf8fda2cb155ebea2360f 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2008-07-25  Jan Hubicka  <jh@suse.cz>
+
+       * cgraph.c (cgraph_function_possibly_inlined_p): Do not rely on DECL_INLINE.
+       * cgraphunit.c (record_cdtor_fn): Do not initialize DECL_INLINE
+       (cgraph_preserve_function_body_p): Do not rely on DECL_INLINE.
+       * dojump.c (clear_pending_stack_adjust): Likewise.
+       * print-tree.c (print_node): Ignore DECL_INLINE.
+       * tree-inline.c (inlinable_function_p): Likewise.
+       
 2008-07-25  Michael Meissner  <gnu@the-meissners.org>
 
        * doc/extend.texi (hot attribute): Document that the hot attribute

diff --git a/gcc/cgraph.c b/gcc/cgraph.c
index c4ad33ef4b5d9c939409940cd8600760ab34f191..b88ab68f05601d26e28de5cb1e6a8cf09b684fbe 100644 (file)
--- a/gcc/cgraph.c
+++ b/gcc/cgraph.c
@@ -1140,7 +1140,7 @@ bool
 cgraph_function_possibly_inlined_p (tree decl)
 {
   if (!cgraph_global_info_ready)
-    return (DECL_INLINE (decl) && !flag_really_no_inline);
+    return !DECL_UNINLINABLE (decl) && !flag_really_no_inline;
   return DECL_POSSIBLY_INLINED (decl);
 }
 

diff --git a/gcc/cgraphunit.c b/gcc/cgraphunit.c
index 674d6da012fd31282c0efdbe03d88036852b1983..9f4f87c2451b76d68a075f90940099dd523523b4 100644 (file)
--- a/gcc/cgraphunit.c
+++ b/gcc/cgraphunit.c
@@ -172,7 +172,6 @@ record_cdtor_fn (tree fndecl)
       VEC_safe_push (tree, gc, static_dtors, fndecl);
       DECL_STATIC_DESTRUCTOR (fndecl) = 0;
     }
-  DECL_INLINE (fndecl) = 1;
   node = cgraph_node (fndecl);
   node->local.disregard_inline_limits = 1;
   cgraph_mark_reachable_node (node);
@@ -1211,10 +1210,8 @@ bool
 cgraph_preserve_function_body_p (tree decl)
 {
   struct cgraph_node *node;
-  if (!cgraph_global_info_ready)
-    return (flag_really_no_inline
-           ? DECL_DISREGARD_INLINE_LIMITS (decl)
-           : DECL_INLINE (decl));
+
+  gcc_assert (cgraph_global_info_ready);
   /* Look if there is any clone around.  */
   for (node = cgraph_node (decl); node; node = node->next_clone)
     if (node->global.inlined_to)

diff --git a/gcc/dojump.c b/gcc/dojump.c
index 4337348195533fb4c5804cc869f0bc5ed01e608f..fb8d139b11168c34853dd2f1d932a07c200892b1 100644 (file)
--- a/gcc/dojump.c
+++ b/gcc/dojump.c
@@ -71,8 +71,7 @@ clear_pending_stack_adjust (void)
 {
   if (optimize > 0
       && (! flag_omit_frame_pointer || cfun->calls_alloca)
-      && EXIT_IGNORE_STACK
-      && ! (DECL_INLINE (current_function_decl) && ! flag_no_inline))
+      && EXIT_IGNORE_STACK)
     discard_pending_stack_adjust ();
 }
 

diff --git a/gcc/print-tree.c b/gcc/print-tree.c
index 09ca2849a7ee19142311f577c12e05c600ab93f2..ed31861624a7f1f816935e1f15bd0a6f515f89c0 100644 (file)
--- a/gcc/print-tree.c
+++ b/gcc/print-tree.c
@@ -375,8 +375,8 @@ print_node (FILE *file, const char *prefix, tree node, int indent)
       if (TREE_CODE (node) == FUNCTION_DECL
          && DECL_FUNCTION_SPECIFIC_OPTIMIZATION (node))
        fputs (" function-specific-opt", file);
-      if (TREE_CODE (node) == FUNCTION_DECL && DECL_INLINE (node))
-       fputs (DECL_DECLARED_INLINE_P (node) ? " inline" : " autoinline", file);
+      if (TREE_CODE (node) == FUNCTION_DECL && DECL_DECLARED_INLINE_P (node))
+       fputs (" autoinline", file);
       if (TREE_CODE (node) == FUNCTION_DECL && DECL_BUILT_IN (node))
        fputs (" built-in", file);
       if (TREE_CODE (node) == FUNCTION_DECL && DECL_NO_STATIC_CHAIN (node))

diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c
index 5eff3caaa18ec885d5379fac835b3395bf0d69a0..103f504c2d9e5fb92d4c56a53209d30297a42e79 100644 (file)
--- a/gcc/tree-inline.c
+++ b/gcc/tree-inline.c
@@ -2058,7 +2058,6 @@ inlinable_function_p (tree fn)
 
   /* We only warn for functions declared `inline' by the user.  */
   do_warning = (warn_inline
-               && DECL_INLINE (fn)
                && DECL_DECLARED_INLINE_P (fn)
                && !DECL_IN_SYSTEM_HEADER (fn));