decl.c (expand_static_init): Call build2 and build3 instead of build.

	* decl.c (expand_static_init): Call build2 and build3 instead
	of build.

From-SVN: r98318

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index e26a979..7faf22c 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-18  Kazu Hirata  <kazu@cs.umass.edu>
+
+       * decl.c (expand_static_init): Call build2 and build3 instead
+       of build.
+
 2005-04-17  Ian Lance Taylor  <ian@airs.com>
 
        * cp-tree.def: Add SIZEOF_EXPR, ARROW_EXPR and ALIGNOF_EXPR.

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index c39ed7b..4fa6b02 100644 (file)
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -5292,15 +5292,15 @@ expand_static_init (tree decl, tree init)
          flag = TARGET_EXPR_SLOT (begin);
 
          TARGET_EXPR_CLEANUP (begin)
-           = build (COND_EXPR, void_type_node, flag,
-                    void_zero_node,
-                    build_call (abort_fn, guard_addr_list));
+           = build3 (COND_EXPR, void_type_node, flag,
+                     void_zero_node,
+                     build_call (abort_fn, guard_addr_list));
          CLEANUP_EH_ONLY (begin) = 1;
 
          /* Do the initialization itself.  */
          init = add_stmt_to_compound (begin, init);
          init = add_stmt_to_compound
-           (init, build (MODIFY_EXPR, void_type_node, flag, boolean_true_node));
+           (init, build2 (MODIFY_EXPR, void_type_node, flag, boolean_true_node));
          init = add_stmt_to_compound
            (init, build_call (release_fn, guard_addr_list));
        }