aboutsummaryrefslogtreecommitdiff
path: root/gcc/f
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/f
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/f')
-rw-r--r--gcc/f/ChangeLog5
-rw-r--r--gcc/f/com.c3
2 files changed, 6 insertions, 2 deletions
diff --git a/gcc/f/ChangeLog b/gcc/f/ChangeLog
index 8ab5c2c..e97a710 100644
--- a/gcc/f/ChangeLog
+++ b/gcc/f/ChangeLog
@@ -1,3 +1,8 @@
+2003-09-28 Richard Henderson <rth@redhat.com>
+
+ * com.c (duplicate_decls): Copy DECL_SOURCE_LOCATION, not
+ file and line separately.
+
2003-09-21 Richard Henderson <rth@redhat.com>
* com.c, ste.c: Revert.
diff --git a/gcc/f/com.c b/gcc/f/com.c
index a5100d9..e992cb90 100644
--- a/gcc/f/com.c
+++ b/gcc/f/com.c
@@ -13297,8 +13297,7 @@ duplicate_decls (tree newdecl, tree olddecl)
if ((DECL_INITIAL (newdecl) == 0 && DECL_INITIAL (olddecl) != 0)
|| (DECL_CONTEXT (newdecl) != 0 && DECL_CONTEXT (olddecl) == 0))
{
- DECL_SOURCE_LINE (newdecl) = DECL_SOURCE_LINE (olddecl);
- DECL_SOURCE_FILE (newdecl) = DECL_SOURCE_FILE (olddecl);
+ DECL_SOURCE_LOCATION (newdecl) = DECL_SOURCE_LOCATION (olddecl);
if (DECL_CONTEXT (olddecl) == 0
&& TREE_CODE (newdecl) != FUNCTION_DECL)