From f31686a322301454c5ea5b997997aa7c84c57781 Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Sun, 21 Sep 2003 22:09:32 -0700 Subject: Revert DECL_SOURCE_LOCATION -> TREE_LOCUS change. From-SVN: r71641 --- gcc/f/com.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gcc/f/com.c') 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; -- cgit v1.1