diff options
| author | Richard Henderson <rth@redhat.com> | 2003-09-21 22:09:32 -0700 |
|---|---|---|
| committer | Richard Henderson <rth@gcc.gnu.org> | 2003-09-21 22:09:32 -0700 |
| commit | f31686a322301454c5ea5b997997aa7c84c57781 (patch) | |
| tree | d942bc168b4a8f91e17acf863e1d2091ff773b6c /gcc/f | |
| parent | 0f7fcd6a40a237b634e0f93f1206724add7354d3 (diff) | |
| download | gcc-f31686a322301454c5ea5b997997aa7c84c57781.zip gcc-f31686a322301454c5ea5b997997aa7c84c57781.tar.gz gcc-f31686a322301454c5ea5b997997aa7c84c57781.tar.bz2 | |
Revert DECL_SOURCE_LOCATION -> TREE_LOCUS change.
From-SVN: r71641
Diffstat (limited to 'gcc/f')
| -rw-r--r-- | gcc/f/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/f/com.c | 7 | ||||
| -rw-r--r-- | gcc/f/ste.c | 4 |
3 files changed, 10 insertions, 5 deletions
diff --git a/gcc/f/ChangeLog b/gcc/f/ChangeLog index 5d588e9..8ab5c2c 100644 --- a/gcc/f/ChangeLog +++ b/gcc/f/ChangeLog @@ -1,5 +1,9 @@ 2003-09-21 Richard Henderson <rth@redhat.com> + * com.c, ste.c: Revert. + +2003-09-21 Richard Henderson <rth@redhat.com> + * com.c, ste.c: Update for DECL_SOURCE_LOCATION rename and change to const. diff --git a/gcc/f/com.c b/gcc/f/com.c index 9658a54..a5100d9 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 - && !TREE_LOCUS_SET_P (olddecl)) + && DECL_SOURCE_LINE (olddecl) == 0) { /* A function declaration for a predeclared function that isn't actually built in. */ @@ -13297,7 +13297,8 @@ duplicate_decls (tree newdecl, tree olddecl) if ((DECL_INITIAL (newdecl) == 0 && DECL_INITIAL (olddecl) != 0) || (DECL_CONTEXT (newdecl) != 0 && DECL_CONTEXT (olddecl) == 0)) { - copy_tree_locus (newdecl, olddecl); + DECL_SOURCE_LINE (newdecl) = DECL_SOURCE_LINE (olddecl); + DECL_SOURCE_FILE (newdecl) = DECL_SOURCE_FILE (olddecl); if (DECL_CONTEXT (olddecl) == 0 && TREE_CODE (newdecl) != FUNCTION_DECL) @@ -14534,7 +14535,7 @@ pushdecl (tree x) if (TREE_CODE (x) == TYPE_DECL) { - if (!TREE_LOCUS_SET_P (x)) + if (DECL_SOURCE_LINE (x) == 0) { 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 dc0d27e..82435bc 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; - set_tree_file_line (glabel, ffelab_definition_filename (label), - ffelab_definition_filelinenum (label)); + DECL_SOURCE_FILE (glabel) = ffelab_definition_filename (label); + DECL_SOURCE_LINE (glabel) = ffelab_definition_filelinenum (label); emit_nop (); |