aboutsummaryrefslogtreecommitdiff
path: root/gcc/java/expr.c
diff options
context:
space:
mode:
Diffstat (limited to 'gcc/java/expr.c')
-rw-r--r--gcc/java/expr.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/gcc/java/expr.c b/gcc/java/expr.c
index 5cf855c..7710008 100644
--- a/gcc/java/expr.c
+++ b/gcc/java/expr.c
@@ -2334,20 +2334,22 @@ expand_java_field_op (int is_static, int is_putting, int field_ref_index)
if (FIELD_FINAL (field_decl))
{
if (DECL_CONTEXT (field_decl) != current_class)
- error_with_decl (field_decl,
- "assignment to final field `%s' not in field's class");
+ error ("%Hassignment to final field '%D' not in field's class",
+ &DECL_SOURCE_LOCATION (field_decl), field_decl);
else if (FIELD_STATIC (field_decl))
{
if (!DECL_CLINIT_P (current_function_decl))
- warning_with_decl (field_decl,
- "assignment to final static field `%s' not in class initializer");
+ warning ("assignment to final static field `%s' not in "
+ "class initializer",
+ &DECL_SOURCE_LOCATION (field_decl), field_decl);
}
else
{
tree cfndecl_name = DECL_NAME (current_function_decl);
if (! DECL_CONSTRUCTOR_P (current_function_decl)
&& !ID_FINIT_P (cfndecl_name))
- warning_with_decl (field_decl, "assignment to final field `%s' not in constructor");
+ warning ("%Hassignment to final field '%D' not in constructor",
+ &DECL_SOURCE_LOCATION (field_decl), field_decl);
}
}
expand_assignment (field_ref, new_value, 0);