java-gimplify.c (java_gimplify_labeled_block_expr): Use buildN instead of build.

2005-12-02  Richard Guenther  <rguenther@suse.de>

	* java-gimplify.c (java_gimplify_labeled_block_expr): Use
	buildN instead of build.
	* class.c (finish_class): Likewise.
	* expr.c (java_create_object): Likewise.

From-SVN: r107904

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index a8309728abc3f5b40366732ccec359ca0b2338a5..d7b9c977604bfd40b3ed23f45236f31ddd7edc16 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,10 @@
+2005-12-02  Richard Guenther  <rguenther@suse.de>
+
+       * java-gimplify.c (java_gimplify_labeled_block_expr): Use
+       buildN instead of build.
+       * class.c (finish_class): Likewise.
+       * expr.c (java_create_object): Likewise.
+
 2005-11-28  Tom Tromey  <tromey@redhat.com>
 
        PR java/18278:

diff --git a/gcc/java/class.c b/gcc/java/class.c
index eb9ea71fdb5cb67728ac190fcefedcf64d9bc651..6f724f4f0d2b7635bfc422a756e80b98dff666fc 100644 (file)
--- a/gcc/java/class.c
+++ b/gcc/java/class.c
@@ -1917,7 +1917,7 @@ finish_class (void)
       tree verify_method = TYPE_VERIFY_METHOD (output_class);
       DECL_SAVED_TREE (verify_method) 
        = add_stmt_to_compound (DECL_SAVED_TREE (verify_method), void_type_node,
-                               build (RETURN_EXPR, void_type_node, NULL));
+                               build1 (RETURN_EXPR, void_type_node, NULL));
       java_genericize (verify_method);
       cgraph_finalize_function (verify_method, false);
       TYPE_ASSERTIONS (current_class) = NULL;

diff --git a/gcc/java/expr.c b/gcc/java/expr.c
index 4c2f3f48b896fcf34bb0359e152e35dcb47a2f31..81bd6fac18045a13804148b1d46226a4bdf645be 100644 (file)
--- a/gcc/java/expr.c
+++ b/gcc/java/expr.c
@@ -1312,10 +1312,10 @@ java_create_object (tree type)
                     ? alloc_object_node
                     : alloc_no_finalizer_node);
   
-  return build (CALL_EXPR, promote_type (type),
-               build_address_of (alloc_node),
-               build_tree_list (NULL_TREE, build_class_ref (type)),
-               NULL_TREE);
+  return build3 (CALL_EXPR, promote_type (type),
+                build_address_of (alloc_node),
+                build_tree_list (NULL_TREE, build_class_ref (type)),
+                NULL_TREE);
 }
 
 static void

diff --git a/gcc/java/java-gimplify.c b/gcc/java/java-gimplify.c
index e5d7a4377d922a3062b23a415b789e2deb8e2418..6c1a366698f4bf0eaeb1f8602c642b40b5c08a41 100644 (file)
--- a/gcc/java/java-gimplify.c
+++ b/gcc/java/java-gimplify.c
@@ -186,9 +186,9 @@ java_gimplify_labeled_block_expr (tree expr)
   tree t;
 
   DECL_CONTEXT (label) = current_function_decl;
-  t = build (LABEL_EXPR, void_type_node, label);
+  t = build1 (LABEL_EXPR, void_type_node, label);
   if (body != NULL_TREE)
-    t = build (COMPOUND_EXPR, void_type_node, body, t);
+    t = build2 (COMPOUND_EXPR, void_type_node, body, t);
   return t;
 }