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/c-decl.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/c-decl.c')
-rw-r--r-- | gcc/c-decl.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/gcc/c-decl.c b/gcc/c-decl.c index 31cb223..69110ef 100644 --- a/gcc/c-decl.c +++ b/gcc/c-decl.c @@ -1305,10 +1305,7 @@ duplicate_decls (tree newdecl, tree olddecl, int different_binding_level, information so that meaningful diagnostics can be given. */ if (DECL_INITIAL (newdecl) == 0 && DECL_INITIAL (olddecl) != 0 && ! different_binding_level) - { - DECL_SOURCE_LINE (newdecl) = DECL_SOURCE_LINE (olddecl); - DECL_SOURCE_FILE (newdecl) = DECL_SOURCE_FILE (olddecl); - } + DECL_SOURCE_LOCATION (newdecl) = DECL_SOURCE_LOCATION (olddecl); /* Merge the unused-warning information. */ if (DECL_IN_SYSTEM_HEADER (olddecl)) |