2007-02-15 Sandra Loosemore <sandra@codesourcery.com>

[pf3gnuchains/gcc-fork.git] / gcc / java / java-tree.h

diff --git a/gcc/java/java-tree.h b/gcc/java/java-tree.h
index 732e0cd..4a41371 100644 (file)
--- a/gcc/java/java-tree.h
+++ b/gcc/java/java-tree.h
@@ -1626,20 +1626,18 @@ extern tree *type_map;
 
 #define BUILD_MONITOR_ENTER(WHERE, ARG)                                        \
   {                                                                    \
-    (WHERE) = build3 (CALL_EXPR, int_type_node,                                \
-                     build_address_of (soft_monitorenter_node),        \
-                     build_tree_list (NULL_TREE, (ARG)),               \
-                     NULL_TREE);                                       \
+    (WHERE) = build_call_nary (int_type_node,                          \
+                              build_address_of (soft_monitorenter_node), \
+                              1, (ARG));                               \
     TREE_SIDE_EFFECTS (WHERE) = 1;                                     \
   }
 
-#define BUILD_MONITOR_EXIT(WHERE, ARG)                         \
-  {                                                            \
-    (WHERE) = build3 (CALL_EXPR, int_type_node,                        \
-                     build_address_of (soft_monitorexit_node), \
-                     build_tree_list (NULL_TREE, (ARG)),       \
-                     NULL_TREE);                               \
-    TREE_SIDE_EFFECTS (WHERE) = 1;                             \
+#define BUILD_MONITOR_EXIT(WHERE, ARG)                                 \
+  {                                                                    \
+    (WHERE) = build_call_nary (int_type_node,                          \
+                              build_address_of (soft_monitorexit_node), \
+                              1, (ARG));                               \
+    TREE_SIDE_EFFECTS (WHERE) = 1;                                     \
   }
 
 /* True when we can perform static class initialization optimization */