aboutsummaryrefslogtreecommitdiff
path: root/gcc/java/decl.c
diff options
context:
space:
mode:
authorRichard Henderson <rth@redhat.com>2003-09-28 15:18:33 -0700
committerRichard Henderson <rth@gcc.gnu.org>2003-09-28 15:18:33 -0700
commit436fac170ae36308572b273a73510ae5510d1903 (patch)
tree92931566ca86595833d4e800dfd6d8299effef0c /gcc/java/decl.c
parentb2ba71cad84307d8493518fb97e19f367578dc05 (diff)
downloadgcc-436fac170ae36308572b273a73510ae5510d1903.zip
gcc-436fac170ae36308572b273a73510ae5510d1903.tar.gz
gcc-436fac170ae36308572b273a73510ae5510d1903.tar.bz2
c-decl.c (duplicate_decls): Copy DECL_SOURCE_LOCATION, not file and line separately.
* c-decl.c (duplicate_decls): Copy DECL_SOURCE_LOCATION, not file and line separately. f/ * com.c (duplicate_decls): Copy DECL_SOURCE_LOCATION, not file and line separately. java/ * check-init.c (check_init): Save and restore input_location instead of file and line separately. * decl.c (java_expand_body): Likewise. * jcf-write.c (generate_bytecode_insns): Likewise. * parse.y (safe_layout_class): Likewise. * jcf-parse.c (read_class, parse_class_file): Likewise. (java_parse_file): Use %H for warning locator. From-SVN: r71886
Diffstat (limited to 'gcc/java/decl.c')
-rw-r--r--gcc/java/decl.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/gcc/java/decl.c b/gcc/java/decl.c
index 074a093..4e413de 100644
--- a/gcc/java/decl.c
+++ b/gcc/java/decl.c
@@ -1816,12 +1816,10 @@ end_java_method (void)
void
java_expand_body (tree fndecl)
{
- const char *saved_input_filename = input_filename;
- int saved_lineno = input_line;
+ location_t saved_location = input_location;
current_function_decl = fndecl;
- input_filename = DECL_SOURCE_FILE (fndecl);
- input_line = DECL_SOURCE_LINE (fndecl);
+ input_location = DECL_SOURCE_LOCATION (fndecl);
timevar_push (TV_EXPAND);
@@ -1858,8 +1856,7 @@ java_expand_body (tree fndecl)
timevar_pop (TV_EXPAND);
- input_filename = saved_input_filename;
- input_line = saved_lineno;
+ input_location = saved_location;
current_function_decl = NULL_TREE;
}