tree.h (DECL_SOURCE_FILE): Improve documentation.

	* tree.h (DECL_SOURCE_FILE): Improve documentation.
	(DECL_SOURCE_LINE): Likewise.

	* decl.c (duplicate_decls): Update source position information
	when a template function is defined.

From-SVN: r42993

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ba914495614bb66b7a545239b8cc223256e3431f..6634e5b73de8a3989e51b86ff1a5f884a00e408b 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-07  Mark Mitchell  <mark@codesourcery.com>
+
+       * tree.h (DECL_SOURCE_FILE): Improve documentation.
+       (DECL_SOURCE_LINE): Likewise.
+
 2001-06-07  Loren J. Rittle  <ljrittle@acm.org>
 
        * config/alpha/elf.h (MAKE_DECL_ONE_ONLY): Copy definition

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 8be3d79c91da41499186b5ed1041293e65ed1e2a..fb986e5be3c2827cde6ae737c5f9c21ccf10bb9b 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-07  Mark Mitchell  <mark@codesourcery.com>
+
+       * decl.c (duplicate_decls): Update source position information
+       when a template function is defined.
+
 2001-06-07  Phil Edwards  <pme@sources.redhat.com>
 
        * lang-specs.h:  Move -D_GNU_SOURCE to config/linux.h.

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 22fb9ef7974fb9ac68c1b26c45dfb61da9b80983..5acf62206497415ec6739d092a4978bf3fe0b332 100644 (file)
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -3499,6 +3499,19 @@ duplicate_decls (newdecl, olddecl)
        = chainon (DECL_TEMPLATE_SPECIALIZATIONS (olddecl),
                   DECL_TEMPLATE_SPECIALIZATIONS (newdecl));
 
+      /* If the new declaration is a definition, update the file and
+        line information on the declaration.  */
+      if (DECL_INITIAL (DECL_RESULT (olddecl)) == NULL_TREE
+         && DECL_INITIAL (DECL_RESULT (newdecl)) != NULL_TREE)
+       {
+         DECL_SOURCE_LINE (olddecl) 
+           = DECL_SOURCE_LINE (DECL_RESULT (olddecl))
+           = DECL_SOURCE_LINE (newdecl);
+         DECL_SOURCE_FILE (olddecl) 
+           = DECL_SOURCE_FILE (DECL_RESULT (olddecl))
+           = DECL_SOURCE_FILE (newdecl);
+       }
+
       return 1;
     }
 

diff --git a/gcc/tree.h b/gcc/tree.h
index 8634acb6617a7e50d34d9176c1ce1452063ed2fa..8f29728849b8c1f98e9cf1719a0913fcdba202b3 100644 (file)
--- a/gcc/tree.h
+++ b/gcc/tree.h
@@ -1347,7 +1347,10 @@ struct tree_type
 /* For a FIELD_DECL in a QUAL_UNION_TYPE, records the expression, which
    if nonzero, indicates that the field occupies the type.  */
 #define DECL_QUALIFIER(NODE) (FIELD_DECL_CHECK (NODE)->decl.initial)
-/* These two fields describe where in the source code the declaration was.  */
+/* These two fields describe where in the source code the declaration
+   was.  If the declaration appears in several places (as for a C
+   function that is declared first and then defined later), this
+   information should refer to the definition.  */
 #define DECL_SOURCE_FILE(NODE) (DECL_CHECK (NODE)->decl.filename)
 #define DECL_SOURCE_LINE(NODE) (DECL_CHECK (NODE)->decl.linenum)
 /* Holds the size of the datum, in bits, as a tree expression.