From ea7b59ba6966af16b8b026b501e9941c54c7346a Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Thu, 2 Dec 2004 16:37:41 +0000 Subject: 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 --- gcc/java/ChangeLog | 6 ++++++ gcc/java/java-gimplify.c | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'gcc/java') 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 + + 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 * 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: -- cgit v1.1