PR rtl-optimization/27477

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

diff --git a/gcc/c-objc-common.c b/gcc/c-objc-common.c
index 50bb0fc..8fcee73 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.
 
@@ -15,8 +15,8 @@ for more details.
 
 You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING.  If not, write to the Free
-Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.  */
+Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301, USA.  */
 
 #include "config.h"
 #include "system.h"
@@ -40,7 +40,8 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include "target.h"
 #include "c-objc-common.h"
 
-static bool c_tree_printer (pretty_printer *, text_info *);
+static bool c_tree_printer (pretty_printer *, text_info *, const char *,
+                           int, bool, bool, bool);
 
 bool
 c_missing_noreturn_ok_p (tree decl)
@@ -77,8 +78,8 @@ c_cannot_inline_tree_fn (tree *fnp)
       && lookup_attribute ("always_inline", DECL_ATTRIBUTES (fn)) == NULL)
     {
       if (do_warning)
-       warning ("%Jfunction %qF can never be inlined because it "
-                "is suppressed using -fno-inline", fn, fn);
+       warning (OPT_Winline, "function %q+F can never be inlined because it "
+                "is suppressed using -fno-inline", fn);
       goto cannot_inline;
     }
 
@@ -87,16 +88,16 @@ c_cannot_inline_tree_fn (tree *fnp)
   if (!DECL_DECLARED_INLINE_P (fn) && !targetm.binds_local_p (fn))
     {
       if (do_warning)
-       warning ("%Jfunction %qF can never be inlined because it might not "
-                "be bound within this unit of translation", fn, fn);
+       warning (OPT_Winline, "function %q+F can never be inlined because it "
+                "might not be bound within this unit of translation", fn);
       goto cannot_inline;
     }
 
   if (!function_attribute_inlinable_p (fn))
     {
       if (do_warning)
-       warning ("%Jfunction %qF can never be inlined because it uses "
-                "attributes conflicting with inlining", fn, fn);
+       warning (OPT_Winline, "function %q+F can never be inlined because it "
+                "uses attributes conflicting with inlining", fn);
       goto cannot_inline;
     }
 
@@ -124,12 +125,6 @@ c_warn_unused_global_decl (tree decl)
 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 ();
 
   if (c_common_init () == false)
@@ -166,7 +161,8 @@ c_objc_common_init (void)
    Please notice when called, the `%' part was already skipped by the
    diagnostic machinery.  */
 static bool
-c_tree_printer (pretty_printer *pp, text_info *text)
+c_tree_printer (pretty_printer *pp, text_info *text, const char *spec,
+               int precision, bool wide, bool set_locus, bool hash)
 {
   tree t = va_arg (*text->args_ptr, tree);
   tree name;
@@ -174,10 +170,16 @@ c_tree_printer (pretty_printer *pp, text_info *text)
   c_pretty_printer *cpp = (c_pretty_printer *) pp;
   pp->padding = pp_none;
 
-  switch (*text->format_spec)
+  if (precision != 0 || wide || hash)
+    return false;
+
+  if (set_locus && text->locus)
+    *text->locus = DECL_SOURCE_LOCATION (t);
+
+  switch (*spec)
     {
     case 'D':
-      if (DECL_DEBUG_EXPR (t) && DECL_DEBUG_EXPR_IS_FROM (t))
+      if (DECL_DEBUG_EXPR_IS_FROM (t) && DECL_DEBUG_EXPR (t))
        {
          t = DECL_DEBUG_EXPR (t);
          if (!DECL_P (t))
@@ -230,34 +232,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)