* c-common.c, c-common.h, c-decl.c, c-lex.c, c-parse.in,

[pf3gnuchains/gcc-fork.git] / gcc / java / builtins.c

diff --git a/gcc/java/builtins.c b/gcc/java/builtins.c
index 2449859..832e643 100644 (file)
--- a/gcc/java/builtins.c
+++ b/gcc/java/builtins.c
@@ -181,7 +181,7 @@ sqrt_builtin (method_return_type, method_arguments)
      tree method_return_type, method_arguments;
 {
   /* FIXME: this assumes that jdouble and double are the same.  */
-  tree fn = built_in_decls[BUILT_IN_SQRTF];
+  tree fn = built_in_decls[BUILT_IN_SQRT];
   if (fn == NULL_TREE)
     return NULL_TREE;
   return build_function_call_expr (fn, method_arguments);
@@ -281,11 +281,8 @@ initialize_builtins ()
 
   /* Work around C-specific junk in builtin-types.def.  */
 #define intmax_type_node NULL_TREE
-#define traditional_ptr_type_node NULL_TREE
-#define traditional_cptr_type_node NULL_TREE
 #define c_size_type_node NULL_TREE
 #define const_string_type_node NULL_TREE
-#define traditional_len_type_node NULL_TREE
 #define va_list_ref_type_node NULL_TREE
 #define va_list_arg_type_node NULL_TREE
 #define flag_isoc99 0
@@ -324,42 +321,30 @@ initialize_builtins ()
 #include "builtins.def"
 }
 
-/* Generate a method call.  If the call matches a builtin, return the
+/* If the call matches a builtin, return the
    appropriate builtin expression instead.  */
 tree
-build_call_or_builtin (method, func, method_arguments)
-     tree method, func, method_arguments;
+check_for_builtin (method, call)
+     tree method;
+     tree call;
 {
-  tree method_class = DECL_NAME (TYPE_NAME (DECL_CONTEXT (method)));
-  tree method_name = DECL_NAME (method);
-  tree method_return_type = TREE_TYPE (TREE_TYPE (method));
-  tree call = NULL_TREE;
-
-  /* Only look if we're generating object code and optimizing.  */
-  if (! flag_emit_class_files && optimize)
+  if (! flag_emit_class_files && optimize && TREE_CODE (call) == CALL_EXPR)
     {
       int i;
+      tree method_arguments = TREE_OPERAND (call, 1);
+      tree method_class = DECL_NAME (TYPE_NAME (DECL_CONTEXT (method)));
+      tree method_name = DECL_NAME (method);
+      tree method_return_type = TREE_TYPE (TREE_TYPE (method));
 
       for (i = 0; java_builtins[i].creator != NULL; ++i)
        {
          if (method_class == java_builtins[i].class_name.t
              && method_name == java_builtins[i].method_name.t)
            {
-             call = (*java_builtins[i].creator) (method_return_type,
+             return (*java_builtins[i].creator) (method_return_type,
                                                  method_arguments);
-             break;
            }
        }
     }
-
-  if (call == NULL_TREE)
-    {
-      /* Either nothing matched, or the creator function decided not
-        to inline.  In either case, emit a call.  */
-      call = build (CALL_EXPR, method_return_type, func, method_arguments,
-                   NULL_TREE);
-      TREE_SIDE_EFFECTS (call) = 1;
-    }
-
   return call;
 }