diff options
| author | Richard Henderson <rth@redhat.com> | 2003-09-21 16:39:40 -0700 |
|---|---|---|
| committer | Richard Henderson <rth@gcc.gnu.org> | 2003-09-21 16:39:40 -0700 |
| commit | 7e2af53a14ce4710e1dca754acf603db0f9d8802 (patch) | |
| tree | d04ef32430711aab636f45451f9e7a3ad34ab36f /gcc/f | |
| parent | d6a1d39a7dbf00f373ace14470d5edb5cc4337be (diff) | |
| download | gcc-7e2af53a14ce4710e1dca754acf603db0f9d8802.zip gcc-7e2af53a14ce4710e1dca754acf603db0f9d8802.tar.gz gcc-7e2af53a14ce4710e1dca754acf603db0f9d8802.tar.bz2 | |
tree.h (TREE_LOCUS): Rename from DECL_SOURCE_LOCATION; make const.
* tree.h (TREE_LOCUS): Rename from DECL_SOURCE_LOCATION; make const.
(TREE_FILENAME, TREE_LINENO): Likewise.
(set_tree_locus, copy_tree_locus, set_tree_file_line): New.
(TREE_LOCUS_SET_P): New.
* c-aux-info.c, c-decl.c, c-parse.in, coverage.c, dbxout.c,
diagnostic.c, dwarf2out.c, dwarfout.c, function.c, integrate.c,
print-tree.c, stmt.c, toplev.c, tree-dump.c, tree-inline.c,
tree-optimize.c, tree.c, tree.def, xcoffout.c, config/alpha/alpha.c,
config/mips/mips.c, doc/c-tree.texi, objc/objc-act.c: Update to match.
ada/
* trans.c, utils.c: Update for DECL_SOURCE_LOCATION rename and
change to const.
cp/
* class.c, cp-tree.h, decl.c, decl2.c, error.c, init.c,
method.c, optimize.c, pt.c, semantics.c, tree.c: Update for
DECL_SOURCE_LOCATION rename and change to const.
f/
* com.c, ste.c: Update for DECL_SOURCE_LOCATION rename and
change to const.
java/
* class.c, decl.c, jcf-parse.c, jcf-write.c, parse.y,
resource.c: Update for DECL_SOURCE_LOCATION rename and change to const.
treelang/
* treetree.c: Update for DECL_SOURCE_LOCATION rename and
change to const.
From-SVN: r71636
Diffstat (limited to 'gcc/f')
| -rw-r--r-- | gcc/f/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/f/com.c | 7 | ||||
| -rw-r--r-- | gcc/f/ste.c | 4 |
3 files changed, 10 insertions, 6 deletions
diff --git a/gcc/f/ChangeLog b/gcc/f/ChangeLog index e985070..5d588e9 100644 --- a/gcc/f/ChangeLog +++ b/gcc/f/ChangeLog @@ -1,3 +1,8 @@ +2003-09-21 Richard Henderson <rth@redhat.com> + + * com.c, ste.c: Update for DECL_SOURCE_LOCATION rename and + change to const. + 2003-09-21 Toon Moene <toon@moene.indiv.nluug.nl> * news.texi: Update with fixed PR's. diff --git a/gcc/f/com.c b/gcc/f/com.c index a5100d9..9658a54 100644 --- a/gcc/f/com.c +++ b/gcc/f/com.c @@ -13227,7 +13227,7 @@ duplicate_decls (tree newdecl, tree olddecl) return 0; } else if (TREE_CODE (olddecl) == FUNCTION_DECL - && DECL_SOURCE_LINE (olddecl) == 0) + && !TREE_LOCUS_SET_P (olddecl)) { /* A function declaration for a predeclared function that isn't actually built in. */ @@ -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); + copy_tree_locus (newdecl, olddecl); if (DECL_CONTEXT (olddecl) == 0 && TREE_CODE (newdecl) != FUNCTION_DECL) @@ -14535,7 +14534,7 @@ pushdecl (tree x) if (TREE_CODE (x) == TYPE_DECL) { - if (DECL_SOURCE_LINE (x) == 0) + if (!TREE_LOCUS_SET_P (x)) { if (TYPE_NAME (TREE_TYPE (x)) == 0) TYPE_NAME (TREE_TYPE (x)) = x; diff --git a/gcc/f/ste.c b/gcc/f/ste.c index 82435bc..dc0d27e 100644 --- a/gcc/f/ste.c +++ b/gcc/f/ste.c @@ -2392,8 +2392,8 @@ ffeste_labeldef_branch (ffelab label) assert (DECL_INITIAL (glabel) == NULL_TREE); DECL_INITIAL (glabel) = error_mark_node; - DECL_SOURCE_FILE (glabel) = ffelab_definition_filename (label); - DECL_SOURCE_LINE (glabel) = ffelab_definition_filelinenum (label); + set_tree_file_line (glabel, ffelab_definition_filename (label), + ffelab_definition_filelinenum (label)); emit_nop (); |