Commit 38ec83b1 by Richard Henderson Committed by Richard Henderson

c-objc-common.c: Include target.h.

        * c-objc-common.c: Include target.h.
        (c_cannot_inline_tree_fn): Don't auto-inline functions that
        don't bind locally.  Factor setting DECL_UNINLINABLE.
        * Makefile.in (c-objc-common.o): Update.

From-SVN: r56691
parent 03296d1c
2002-08-30 Richard Henderson <rth@redhat.com>
* c-objc-common.c: Include target.h.
(c_cannot_inline_tree_fn): Don't auto-inline functions that
don't bind locally. Factor setting DECL_UNINLINABLE.
* Makefile.in (c-objc-common.o): Update.
2002-08-30 Janis Johnson <janis187@us.ibm.com>
* doc/install.texi (Configuration, Building): Fix a typo and
......
......@@ -1190,7 +1190,7 @@ c-lex.o : c-lex.c $(CONFIG_H) $(SYSTEM_H) $(TREE_H) $(RTL_H) \
c-objc-common.o : c-objc-common.c $(CONFIG_H) $(SYSTEM_H) $(TREE_H) \
$(C_TREE_H) $(RTL_H) insn-config.h integrate.h $(EXPR_H) $(C_TREE_H) \
flags.h toplev.h tree-inline.h diagnostic.h integrate.h $(VARRAY_H) \
langhooks.h $(GGC_H) gt-c-objc-common.h
langhooks.h $(GGC_H) gt-c-objc-common.h $(TARGET_H)
c-aux-info.o : c-aux-info.c $(CONFIG_H) $(SYSTEM_H) $(TREE_H) $(C_TREE_H) \
flags.h toplev.h
c-convert.o : c-convert.c $(CONFIG_H) $(SYSTEM_H) $(TREE_H) flags.h toplev.h \
......
......@@ -34,6 +34,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include "varray.h"
#include "ggc.h"
#include "langhooks.h"
#include "target.h"
static bool c_tree_printer PARAMS ((output_buffer *, text_info *));
static tree inline_forbidden_p PARAMS ((tree *, int *, void *));
......@@ -150,11 +151,13 @@ c_cannot_inline_tree_fn (fnp)
&& lookup_attribute ("always_inline", DECL_ATTRIBUTES (fn)) == NULL)
return 1;
/* Don't auto-inline anything that might not be bound within
this unit of translation. */
if (!DECL_DECLARED_INLINE_P (fn) && !(*targetm.binds_local_p) (fn))
goto cannot_inline;
if (! function_attribute_inlinable_p (fn))
{
DECL_UNINLINABLE (fn) = 1;
return 1;
}
goto cannot_inline;
/* If a function has pending sizes, we must not defer its
compilation, and we can't inline it as a tree. */
......@@ -164,10 +167,7 @@ c_cannot_inline_tree_fn (fnp)
put_pending_sizes (t);
if (t)
{
DECL_UNINLINABLE (fn) = 1;
return 1;
}
goto cannot_inline;
}
if (DECL_CONTEXT (fn))
......@@ -175,10 +175,7 @@ c_cannot_inline_tree_fn (fnp)
/* If a nested function has pending sizes, we may have already
saved them. */
if (DECL_LANG_SPECIFIC (fn)->pending_sizes)
{
DECL_UNINLINABLE (fn) = 1;
return 1;
}
goto cannot_inline;
}
else
{
......@@ -201,12 +198,13 @@ c_cannot_inline_tree_fn (fnp)
}
if (walk_tree (&DECL_SAVED_TREE (fn), inline_forbidden_p, fn, NULL))
{
DECL_UNINLINABLE (fn) = 1;
return 1;
}
goto cannot_inline;
return 0;
cannot_inline:
DECL_UNINLINABLE (fn) = 1;
return 1;
}
/* Called from check_global_declarations. */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment