diff options
Diffstat (limited to 'gcc/java/decl.c')
| -rw-r--r-- | gcc/java/decl.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/gcc/java/decl.c b/gcc/java/decl.c index 2737463..d1c5b5c 100644 --- a/gcc/java/decl.c +++ b/gcc/java/decl.c @@ -1022,7 +1022,8 @@ pushdecl (tree x) /* error_mark_node is 0 for a while during initialization! */ { t = 0; - error_with_decl (x, "`%s' used prior to declaration"); + error ("%H'%D' used prior to declaration", + &DECL_SOURCE_LOCATION (x), x); } if (t != 0) @@ -1364,12 +1365,14 @@ poplevel (int keep, int reverse, int functionbody) if (DECL_INITIAL (label) == 0) { - error_with_decl (label, "label `%s' used but not defined"); + error ("%Hlabel '%D' used but not defined", + &DECL_SOURCE_LOCATION (label), label); /* Avoid crashing later. */ define_label (input_location, DECL_NAME (label)); } else if (warn_unused[UNUSED_LABEL] && !TREE_USED (label)) - warning_with_decl (label, "label `%s' defined but not used"); + warning ("%Hlabel '%D' defined but not used", + &DECL_SOURCE_LOCATION (label), label); IDENTIFIER_LABEL_VALUE (DECL_NAME (label)) = 0; /* Put the labels into the "variables" of the @@ -1497,9 +1500,10 @@ force_poplevels (int start_pc) while (current_binding_level->start_pc > start_pc) { if (pedantic && current_binding_level->start_pc > start_pc) - warning_with_decl (current_function_decl, - "In %s: overlapped variable and exception ranges at %d", - current_binding_level->start_pc); + warning (current_function_decl, + "%HIn %D: overlapped variable and exception ranges at %d", + &DECL_SOURCE_LOCATION (current_function_decl), + current_function_decl, current_binding_level->start_pc); expand_end_bindings (getdecls (), 1, 0); poplevel (1, 0, 0); } @@ -1584,8 +1588,8 @@ give_name_to_locals (JCF *jcf) tree decl = build_decl (VAR_DECL, name, type); if (end_pc > DECL_CODE_LENGTH (current_function_decl)) { - warning_with_decl (decl, - "bad PC range for debug info for local `%s'"); + warning ("%Hbad PC range for debug info for local '%D'", + &DECL_SOURCE_LOCATION (decl), decl); end_pc = DECL_CODE_LENGTH (current_function_decl); } |