aboutsummaryrefslogtreecommitdiff
path: root/gcc/java
diff options
context:
space:
mode:
authorTom Tromey <tromey@redhat.com>2004-12-02 16:37:41 +0000
committerTom Tromey <tromey@gcc.gnu.org>2004-12-02 16:37:41 +0000
commitea7b59ba6966af16b8b026b501e9941c54c7346a (patch)
tree33941ecbc16e2852cf4ace9fd499c2ff2c106877 /gcc/java
parentb28fb6a10c1206454e1aef9bcc980a88b5431d19 (diff)
downloadgcc-ea7b59ba6966af16b8b026b501e9941c54c7346a.zip
gcc-ea7b59ba6966af16b8b026b501e9941c54c7346a.tar.gz
gcc-ea7b59ba6966af16b8b026b501e9941c54c7346a.tar.bz2
re PR java/18741 (ICE tree check: expected class 'expression', have 'declaration' (var_decl))
PR java/18741: * java-gimplify.c (java_gimplify_expr): Don't call SET_EXPR_LOCATION unless wrapped tree is an expression. From-SVN: r91645
Diffstat (limited to 'gcc/java')
-rw-r--r--gcc/java/ChangeLog6
-rw-r--r--gcc/java/java-gimplify.c3
2 files changed, 8 insertions, 1 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index c79a758..88117f5 100644
--- 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 51fbb84..90d1d61 100644
--- 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: