Merge tree-ssa-20020619-branch into mainline.

[thirdparty/gcc.git] / gcc / java / check-init.c

diff --git a/gcc/java/check-init.c b/gcc/java/check-init.c
index c4e394844100835bcb87f9752f63d61cf947c0db..f325c4e80abe3c43305b6d98ce58da3a4abcaa10 100644 (file)
--- a/gcc/java/check-init.c
+++ b/gcc/java/check-init.c
@@ -770,7 +770,7 @@ check_init (tree exp, words before)
       break;
 
     case NOP_EXPR:
-      if (exp == empty_stmt_node)
+      if (IS_EMPTY_STMT (exp))
        break;
       /* ... else fall through ... */
     case UNARY_PLUS_EXPR:
@@ -889,7 +889,7 @@ check_init (tree exp, words before)
        location_t saved_location = input_location;
        tree saved_wfl = wfl;
        tree body = EXPR_WFL_NODE (exp);
-       if (body == empty_stmt_node)
+       if (IS_EMPTY_STMT (body))
          break;
        wfl = exp;
        input_filename = EXPR_WFL_FILENAME (exp);