re PR java/18741 (ICE tree check: expected class 'expression', have 'declaration...

	PR java/18741:
	* java-gimplify.c (java_gimplify_expr): Don't call
	SET_EXPR_LOCATION unless wrapped tree is an expression.

From-SVN: r91645

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index c79a7584f62fc9533eaeadebeca0c23ff62ac838..88117f5edc459d5860fda6691dea47aec0ccfe89 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,9 @@
+2004-12-02  Tom Tromey  <tromey@redhat.com>
+
+       PR java/18741:
+       * java-gimplify.c (java_gimplify_expr): Don't call
+       SET_EXPR_LOCATION unless wrapped tree is an expression.
+
 2004-11-27  Per Bothner  <per@bothner.com>
 
        * jcf-parse.c (set_source_filename):  Improvement to Andrew's fix:

diff --git a/gcc/java/java-gimplify.c b/gcc/java/java-gimplify.c
index 51fbb84656d7a6bda26a390a2c6c226a8659b28b..90d1d6113c2086239610186261f64f4cd4b55dce 100644 (file)
--- a/gcc/java/java-gimplify.c
+++ b/gcc/java/java-gimplify.c
@@ -78,7 +78,8 @@ java_gimplify_expr (tree *expr_p, tree *pre_p ATTRIBUTE_UNUSED,
       input_location.line = EXPR_WFL_LINENO (*expr_p);
 #endif
       *expr_p = EXPR_WFL_NODE (*expr_p);
-      SET_EXPR_LOCATION (*expr_p, input_location);
+      if (EXPR_P (*expr_p))
+       SET_EXPR_LOCATION (*expr_p, input_location);
       break;
 
     case LABELED_BLOCK_EXPR: