diff options
| author | Richard Henderson <rth@redhat.com> | 2003-09-28 15:18:33 -0700 |
|---|---|---|
| committer | Richard Henderson <rth@gcc.gnu.org> | 2003-09-28 15:18:33 -0700 |
| commit | 436fac170ae36308572b273a73510ae5510d1903 (patch) | |
| tree | 92931566ca86595833d4e800dfd6d8299effef0c /gcc/java/jcf-write.c | |
| parent | b2ba71cad84307d8493518fb97e19f367578dc05 (diff) | |
| download | gcc-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/jcf-write.c')
| -rw-r--r-- | gcc/java/jcf-write.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/gcc/java/jcf-write.c b/gcc/java/jcf-write.c index aed6eb97..b4a9e1b 100644 --- a/gcc/java/jcf-write.c +++ b/gcc/java/jcf-write.c @@ -1417,9 +1417,8 @@ generate_bytecode_insns (tree exp, int target, struct jcf_partial *state) break; case EXPR_WITH_FILE_LOCATION: { - const char *saved_input_filename = input_filename; + location_t saved_location = input_location; tree body = EXPR_WFL_NODE (exp); - int saved_lineno = input_line; if (body == empty_stmt_node) break; input_filename = EXPR_WFL_FILENAME (exp); @@ -1428,8 +1427,7 @@ generate_bytecode_insns (tree exp, int target, struct jcf_partial *state) && debug_info_level > DINFO_LEVEL_NONE) put_linenumber (input_line, state); generate_bytecode_insns (body, target, state); - input_filename = saved_input_filename; - input_line = saved_lineno; + input_location = saved_location; } break; case INTEGER_CST: |