* expr.c (java_check_reference): Use the semantics of COND_EXPRs

	with void-type branches instead of using a COMPOUND_EXPR.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@71883 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 2 insertions, 4 deletions

diff --git a/gcc/java/expr.c b/gcc/java/expr.c
index 272cb351e78..994a8c52ed3 100644
--- a/gcc/java/expr.c
+++ b/gcc/java/expr.c
@@ -695,15 +695,13 @@ java_check_reference (tree expr, int check)
 {
   if (!flag_syntax_only && check)
     {
-      tree cond;
       expr = save_expr (expr);
-      cond = build (COND_EXPR, void_type_node,
+      expr = build (COND_EXPR, TREE_TYPE (expr),
 		    build (EQ_EXPR, boolean_type_node, expr, null_pointer_node),
 		    build (CALL_EXPR, void_type_node, 
 			   build_address_of (soft_nullpointer_node),
 			   NULL_TREE, NULL_TREE),
-		    empty_stmt_node);
-      expr = build (COMPOUND_EXPR, TREE_TYPE (expr), cond, expr);
+		    expr);
     }
 
   return expr;