* config/bfin/bfin-modes.def: New file.

[pf3gnuchains/gcc-fork.git] / gcc / c-objc-common.c

diff --git a/gcc/c-objc-common.c b/gcc/c-objc-common.c
index a4bb683..4b09c3e 100644 (file)
--- a/gcc/c-objc-common.c
+++ b/gcc/c-objc-common.c
@@ -1,5 +1,5 @@
 /* Some code common to C and ObjC front ends.
-   Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
@@ -68,7 +68,6 @@ int
 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)
@@ -78,7 +77,7 @@ c_cannot_inline_tree_fn (tree *fnp)
       && lookup_attribute ("always_inline", DECL_ATTRIBUTES (fn)) == NULL)
     {
       if (do_warning)
-       warning ("%Jfunction '%F' can never be inlined because it "
+       warning ("%Jfunction %qF can never be inlined because it "
                 "is suppressed using -fno-inline", fn, fn);
       goto cannot_inline;
     }
@@ -88,48 +87,19 @@ c_cannot_inline_tree_fn (tree *fnp)
   if (!DECL_DECLARED_INLINE_P (fn) && !targetm.binds_local_p (fn))
     {
       if (do_warning)
-       warning ("%Jfunction '%F' can never be inlined because it might not "
+       warning ("%Jfunction %qF 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))
+  if (!function_attribute_inlinable_p (fn))
     {
       if (do_warning)
-       warning ("%Jfunction '%F' can never be inlined because it uses "
+       warning ("%Jfunction %qF 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.  */
-  if (fn == current_function_decl)
-    {
-      t = get_pending_sizes ();
-      put_pending_sizes (t);
-
-      if (t)
-       {
-         if (do_warning)
-           warning ("%Jfunction '%F' can never be inlined because it has "
-                    "pending sizes", fn, fn);
-         goto cannot_inline;
-       }
-    }
-
-  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)
-       {
-         if (do_warning)
-           warning ("%Jnested function '%F' can never be inlined because it "
-                    "has possibly saved pending sizes", fn, fn);
-         goto cannot_inline;
-       }
-    }
-
   return 0;
 
  cannot_inline:
@@ -187,7 +157,7 @@ c_objc_common_init (void)
    source-level entity onto BUFFER.  The meaning of the format specifiers
    is as follows:
    %D: a general decl,
-   %E: An expression,
+   %E: an identifier or expression,
    %F: a function declaration,
    %T: a type.
 
@@ -207,16 +177,26 @@ c_tree_printer (pretty_printer *pp, text_info *text)
   switch (*text->format_spec)
     {
     case 'D':
+      if (DECL_DEBUG_EXPR (t) && DECL_DEBUG_EXPR_IS_FROM (t))
+       {
+         t = DECL_DEBUG_EXPR (t);
+         if (!DECL_P (t))
+           {
+             pp_c_expression (cpp, t);
+             return true;
+           }
+       }
+      /* FALLTHRU */
+
     case 'F':
       if (DECL_NAME (t))
        n = lang_hooks.decl_printable_name (t, 2);
       break;
 
     case 'T':
-      if (TYPE_P (t))
-       name = TYPE_NAME (t);
-      else
-       abort ();
+      gcc_assert (TYPE_P (t));
+      name = TYPE_NAME (t);
+      
       if (name && TREE_CODE (name) == TYPE_DECL)
        {
          if (DECL_NAME (name))
@@ -236,7 +216,10 @@ c_tree_printer (pretty_printer *pp, text_info *text)
       if (TREE_CODE (t) == IDENTIFIER_NODE)
        n = IDENTIFIER_POINTER (t);
       else
-        return false;
+       {
+         pp_expression (cpp, t);
+         return true;
+       }
       break;
 
     default:
@@ -247,34 +230,6 @@ c_tree_printer (pretty_printer *pp, text_info *text)
   return true;
 }
 
-tree
-c_objc_common_truthvalue_conversion (tree expr)
-{
- retry:
-  switch (TREE_CODE (TREE_TYPE (expr)))
-    {
-    case ARRAY_TYPE:
-      expr = default_conversion (expr);
-      if (TREE_CODE (TREE_TYPE (expr)) != ARRAY_TYPE)
-       goto retry;
-
-      error ("used array that cannot be converted to pointer where scalar is required");
-      return error_mark_node;
-
-    case RECORD_TYPE:
-      error ("used struct type value where scalar is required");
-      return error_mark_node;
-
-    case UNION_TYPE:
-      error ("used union type value where scalar is required");
-      return error_mark_node;
-    default:
-      break;
-    }
-
-  return c_common_truthvalue_conversion (expr);
-}
-
 /* In C and ObjC, all decls have "C" linkage.  */
 bool
 has_c_linkage (tree decl ATTRIBUTE_UNUSED)
@@ -294,3 +249,9 @@ c_initialize_diagnostics (diagnostic_context *context)
   /* It is safe to free this object because it was previously XNEW()'d.  */
   XDELETE (base);
 }
+
+int
+c_types_compatible_p (tree x, tree y)
+{
+    return comptypes (TYPE_MAIN_VARIANT (x), TYPE_MAIN_VARIANT (y));
+}