1 files changed, 102 insertions, 202 deletions

diff --git a/contrib/gcc/c-objc-common.c b/contrib/gcc/c-objc-common.c
index db3e758..fe0c0d5 100644
--- a/contrib/gcc/c-objc-common.c
+++ b/contrib/gcc/c-objc-common.c
@@ -1,5 +1,5 @@
 /* Some code common to C and ObjC front ends.
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
@@ -20,6 +20,8 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 #include "config.h"
 #include "system.h"
+#include "coretypes.h"
+#include "tm.h"
 #include "tree.h"
 #include "rtl.h"
 #include "insn-config.h"
@@ -35,18 +37,14 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include "ggc.h"
 #include "langhooks.h"
 #include "target.h"
+#include "cgraph.h"
 
-static bool c_tree_printer PARAMS ((output_buffer *, text_info *));
-static tree inline_forbidden_p PARAMS ((tree *, int *, void *));
-static void expand_deferred_fns PARAMS ((void));
-static tree start_cdtor	PARAMS ((int));
-static void finish_cdtor PARAMS ((tree));
-
-static GTY(()) varray_type deferred_fns;
+static bool c_tree_printer (pretty_printer *, text_info *);
+static tree start_cdtor (int);
+static void finish_cdtor (tree);
 
 int
-c_missing_noreturn_ok_p (decl)
-     tree decl;
+c_missing_noreturn_ok_p (tree decl)
 {
   /* A missing noreturn is not ok for freestanding implementations and
      ok for the `main' function in hosted implementations.  */
@@ -58,124 +56,51 @@ c_missing_noreturn_ok_p (decl)
    such functions always being inlined when optimizing.  */
 
 int
-c_disregard_inline_limits (fn)
-     tree fn;
+c_disregard_inline_limits (tree fn)
 {
   if (lookup_attribute ("always_inline", DECL_ATTRIBUTES (fn)) != NULL)
     return 1;
 
-  return DECL_DECLARED_INLINE_P (fn) && DECL_EXTERNAL (fn);
-}
-
-static tree
-inline_forbidden_p (nodep, walk_subtrees, fn)
-     tree *nodep;
-     int *walk_subtrees ATTRIBUTE_UNUSED;
-     void *fn;
-{
-  tree node = *nodep;
-  tree t;
-
-  switch (TREE_CODE (node))
-    {
-    case CALL_EXPR:
-      t = get_callee_fndecl (node);
-
-      if (! t)
-	break;
-
-      /* We cannot inline functions that call setjmp.  */
-      if (setjmp_call_p (t))
-	return node;
-
-      switch (DECL_FUNCTION_CODE (t))
-	{
-	  /* We cannot inline functions that take a variable number of
-	     arguments.  */
-	case BUILT_IN_VA_START:
-	case BUILT_IN_STDARG_START:
-	case BUILT_IN_NEXT_ARG:
-	case BUILT_IN_VA_END:
-#if 0
-	  /* Functions that need information about the address of the
-             caller can't (shouldn't?) be inlined.  */
-	case BUILT_IN_RETURN_ADDRESS:
-#endif
-	  return node;
-
-	default:
-	  break;
-	}
-
-      break;
-
-    case DECL_STMT:
-      /* We cannot inline functions that contain other functions.  */
-      if (TREE_CODE (TREE_OPERAND (node, 0)) == FUNCTION_DECL
-	  && DECL_INITIAL (TREE_OPERAND (node, 0)))
-	return node;
-      break;
-
-    case GOTO_STMT:
-    case GOTO_EXPR:
-      t = TREE_OPERAND (node, 0);
-
-      /* We will not inline a function which uses computed goto.  The
-	 addresses of its local labels, which may be tucked into
-	 global storage, are of course not constant across
-	 instantiations, which causes unexpected behavior.  */
-      if (TREE_CODE (t) != LABEL_DECL)
-	return node;
-
-      /* We cannot inline a nested function that jumps to a nonlocal
-         label.  */
-      if (TREE_CODE (t) == LABEL_DECL
-	  && DECL_CONTEXT (t) && DECL_CONTEXT (t) != fn)
-	return node;
-
-      break;
-
-    case RECORD_TYPE:
-    case UNION_TYPE:
-      /* We cannot inline a function of the form
-
-	   void F (int i) { struct S { int ar[i]; } s; }
-
-	 Attempting to do so produces a catch-22 in tree-inline.c.
-	 If walk_tree examines the TYPE_FIELDS chain of RECORD_TYPE/
-	 UNION_TYPE nodes, then it goes into infinite recursion on a
-	 structure containing a pointer to its own type.  If it doesn't,
-	 then the type node for S doesn't get adjusted properly when
-	 F is inlined, and we abort in find_function_data.  */
-      for (t = TYPE_FIELDS (node); t; t = TREE_CHAIN (t))
-	if (variably_modified_type_p (TREE_TYPE (t)))
-	  return node;
-
-    default:
-      break;
-    }
-
-  return NULL_TREE;
+  return (!flag_really_no_inline && DECL_DECLARED_INLINE_P (fn)
+	  && DECL_EXTERNAL (fn));
 }
 
 int
-c_cannot_inline_tree_fn (fnp)
-     tree *fnp;
+c_cannot_inline_tree_fn (tree *fnp)
 {
   tree fn = *fnp;
   tree t;
+  bool do_warning = (warn_inline
+		     && DECL_INLINE (fn)
+		     && DECL_DECLARED_INLINE_P (fn)
+		     && !DECL_IN_SYSTEM_HEADER (fn));
 
   if (flag_really_no_inline
       && lookup_attribute ("always_inline", DECL_ATTRIBUTES (fn)) == NULL)
-    return 1;
+    {
+      if (do_warning)
+	warning ("%Jfunction '%F' can never be inlined because it "
+		 "is suppressed using -fno-inline", fn, fn);
+      goto cannot_inline;
+    }
 
-  /* Don't auto-inline anything that might not be bound within 
+  /* 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 (do_warning)
+	warning ("%Jfunction '%F' can never be inlined because it might not "
+		 "be bound within this unit of translation", fn, fn);
+      goto cannot_inline;
+    }
 
   if (! function_attribute_inlinable_p (fn))
-    goto cannot_inline;
+    {
+      if (do_warning)
+	warning ("%Jfunction '%F' can never be inlined because it uses "
+		 "attributes conflicting with inlining", fn, fn);
+      goto cannot_inline;
+    }
 
   /* If a function has pending sizes, we must not defer its
      compilation, and we can't inline it as a tree.  */
@@ -185,39 +110,26 @@ c_cannot_inline_tree_fn (fnp)
       put_pending_sizes (t);
 
       if (t)
-	goto cannot_inline;
+	{
+	  if (do_warning)
+	    warning ("%Jfunction '%F' can never be inlined because it has "
+		     "pending sizes", fn, fn);
+	  goto cannot_inline;
+	}
     }
 
-  if (DECL_CONTEXT (fn))
+  if (! DECL_FILE_SCOPE_P (fn))
     {
       /* If a nested function has pending sizes, we may have already
          saved them.  */
       if (DECL_LANG_SPECIFIC (fn)->pending_sizes)
-	goto cannot_inline;
-    }
-  else
-    {
-      /* We rely on the fact that this function is called upfront,
-	 just before we start expanding a function.  If FN is active
-	 (i.e., it's the current_function_decl or a parent thereof),
-	 we have to walk FN's saved tree.  Otherwise, we can safely
-	 assume we have done it before and, if we didn't mark it as
-	 uninlinable (in which case we wouldn't have been called), it
-	 is inlinable.  Unfortunately, this strategy doesn't work for
-	 nested functions, because they're only expanded as part of
-	 their enclosing functions, so the inlinability test comes in
-	 late.  */
-      t = current_function_decl;
-
-      while (t && t != fn)
-	t = DECL_CONTEXT (t);
-      if (! t)
-	return 0;
+	{
+	  if (do_warning)
+	    warning ("%Jnested function '%F' can never be inlined because it "
+		     "has possibly saved pending sizes", fn, fn);
+	  goto cannot_inline;
+	}
     }
-    
-  if (walk_tree_without_duplicates
-	(&DECL_SAVED_TREE (fn), inline_forbidden_p, fn))
-    goto cannot_inline;
 
   return 0;
 
@@ -229,8 +141,7 @@ c_cannot_inline_tree_fn (fnp)
 /* Called from check_global_declarations.  */
 
 bool
-c_warn_unused_global_decl (decl)
-     tree decl;
+c_warn_unused_global_decl (tree decl)
 {
   if (TREE_CODE (decl) == FUNCTION_DECL && DECL_DECLARED_INLINE_P (decl))
     return false;
@@ -241,15 +152,19 @@ c_warn_unused_global_decl (decl)
 }
 
 /* Initialization common to C and Objective-C front ends.  */
-const char *
-c_objc_common_init (filename)
-     const char *filename;
+bool
+c_objc_common_init (void)
 {
+  static const enum tree_code stmt_codes[] = {
+    c_common_stmt_codes
+  };
+
+  INIT_STATEMENT_CODES (stmt_codes);
+
   c_init_decl_processing ();
 
-  filename = c_common_init (filename);
-  if (filename == NULL)
-    return NULL;
+  if (c_common_init () == false)
+    return false;
 
   lang_expand_decl_stmt = c_expand_decl_stmt;
 
@@ -269,50 +184,11 @@ c_objc_common_init (filename)
 	mesg_implicit_function_declaration = 0;
     }
 
-  VARRAY_TREE_INIT (deferred_fns, 32, "deferred_fns");
-
-  return filename;
-}
-
-/* Register a function tree, so that its optimization and conversion
-   to RTL is only done at the end of the compilation.  */
-
-int
-defer_fn (fn)
-     tree fn;
-{
-  VARRAY_PUSH_TREE (deferred_fns, fn);
-
-  return 1;
-}
-
-/* Expand deferred functions for C and ObjC.  */
-
-static void
-expand_deferred_fns ()
-{
-  unsigned int i;
-
-  for (i = 0; i < VARRAY_ACTIVE_SIZE (deferred_fns); i++)
-    {
-      tree decl = VARRAY_TREE (deferred_fns, i);
-
-      if (! TREE_ASM_WRITTEN (decl))
-	{
-	  /* For static inline functions, delay the decision whether to
-	     emit them or not until wrapup_global_declarations.  */
-	  if (! TREE_PUBLIC (decl))
-	    DECL_DEFER_OUTPUT (decl) = 1;
-	  c_expand_deferred_function (decl);
-	}
-    }
-
-  deferred_fns = 0;
+  return true;
 }
 
 static tree
-start_cdtor (method_type)
-     int method_type;
+start_cdtor (int method_type)
 {
   tree fnname = get_file_function_name (method_type);
   tree void_list_node_1 = build_tree_list (NULL_TREE, void_type_node);
@@ -338,8 +214,7 @@ start_cdtor (method_type)
 }
 
 static void
-finish_cdtor (body)
-     tree body;
+finish_cdtor (tree body)
 {
   tree scope;
   tree block;
@@ -351,15 +226,23 @@ finish_cdtor (body)
 
   RECHAIN_STMTS (body, COMPOUND_BODY (body));
 
-  finish_function (0, 0);
+  finish_function ();
 }
 
 /* Called at end of parsing, but before end-of-file processing.  */
 
 void
-c_objc_common_finish_file ()
+c_objc_common_finish_file (void)
 {
-  expand_deferred_fns ();
+  if (pch_file)
+    c_common_write_pch ();
+
+  /* If multiple translation units were built, copy information between
+     them based on linkage rules.  */
+  merge_translation_unit_decls ();
+
+  cgraph_finalize_compilation_unit ();
+  cgraph_optimize ();
 
   if (static_ctors)
     {
@@ -399,6 +282,7 @@ c_objc_common_finish_file ()
    source-level entity onto BUFFER.  The meaning of the format specifiers
    is as follows:
    %D: a general decl,
+   %E: An expression,
    %F: a function declaration,
    %T: a type.
 
@@ -407,28 +291,44 @@ c_objc_common_finish_file ()
    Please notice when called, the `%' part was already skipped by the
    diagnostic machinery.  */
 static bool
-c_tree_printer (buffer, text)
-     output_buffer *buffer;
-     text_info *text;
+c_tree_printer (pretty_printer *pp, text_info *text)
 {
   tree t = va_arg (*text->args_ptr, tree);
+  const char *n = "({anonymous})";
 
   switch (*text->format_spec)
     {
     case 'D':
     case 'F':
+      if (DECL_NAME (t))
+	n = (*lang_hooks.decl_printable_name) (t, 2);
+      break;
+
     case 'T':
-      {
-        const char *n = DECL_NAME (t)
-          ? (*lang_hooks.decl_printable_name) (t, 2)
-          : "({anonymous})";
-        output_add_string (buffer, n);
-      }
-      return true;
+      if (TREE_CODE (t) == TYPE_DECL)
+	{
+	  if (DECL_NAME (t))
+	    n = (*lang_hooks.decl_printable_name) (t, 2);
+	}
+      else
+	{
+	  t = TYPE_NAME (t);
+	  if (t)
+	    n = IDENTIFIER_POINTER (t);
+	}
+      break;
+
+    case 'E':
+      if (TREE_CODE (t) == IDENTIFIER_NODE)
+	n = IDENTIFIER_POINTER (t);
+      else
+        return false;
+      break;
 
     default:
       return false;
     }
-}
 
-#include "gt-c-objc-common.h"
+  pp_string (pp, n);
+  return true;
+}