aboutsummaryrefslogtreecommitdiff
path: root/gcc/java/decl.c
diff options
context:
space:
mode:
Diffstat (limited to 'gcc/java/decl.c')
-rw-r--r--gcc/java/decl.c19
1 files changed, 8 insertions, 11 deletions
diff --git a/gcc/java/decl.c b/gcc/java/decl.c
index 90978e4..7ddf704 100644
--- a/gcc/java/decl.c
+++ b/gcc/java/decl.c
@@ -1019,8 +1019,7 @@ pushdecl (tree x)
/* error_mark_node is 0 for a while during initialization! */
{
t = 0;
- error ("%H'%D' used prior to declaration",
- &DECL_SOURCE_LOCATION (x), x);
+ error ("%J'%D' used prior to declaration", x, x);
}
/* If we're naming a hitherto-unnamed type, set its TYPE_NAME
@@ -1356,14 +1355,12 @@ poplevel (int keep, int reverse, int functionbody)
if (DECL_INITIAL (label) == 0)
{
- error ("%Hlabel '%D' used but not defined",
- &DECL_SOURCE_LOCATION (label), label);
+ error ("%Jlabel '%D' used but not defined", label, label);
/* Avoid crashing later. */
define_label (input_location, DECL_NAME (label));
}
else if (warn_unused[UNUSED_LABEL] && !TREE_USED (label))
- warning ("%Hlabel '%D' defined but not used",
- &DECL_SOURCE_LOCATION (label), label);
+ warning ("%Jlabel '%D' defined but not used", label, label);
IDENTIFIER_LABEL_VALUE (DECL_NAME (label)) = 0;
/* Put the labels into the "variables" of the
@@ -1491,9 +1488,9 @@ force_poplevels (int start_pc)
while (current_binding_level->start_pc > start_pc)
{
if (pedantic && current_binding_level->start_pc > start_pc)
- warning ("%HIn %D: overlapped variable and exception ranges at %d",
- &DECL_SOURCE_LOCATION (current_function_decl),
- current_function_decl, current_binding_level->start_pc);
+ warning ("%JIn %D: overlapped variable and exception ranges at %d",
+ current_function_decl, current_function_decl,
+ current_binding_level->start_pc);
expand_end_bindings (getdecls (), 1, 0);
poplevel (1, 0, 0);
}
@@ -1578,8 +1575,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 ("%Hbad PC range for debug info for local '%D'",
- &DECL_SOURCE_LOCATION (decl), decl);
+ warning ("%Jbad PC range for debug info for local '%D'",
+ decl, decl);
end_pc = DECL_CODE_LENGTH (current_function_decl);
}