pt.c (tsubst_copy): Hush warning.

	* pt.c (tsubst_copy): Hush warning.
	* rtti.c (get_tinfo_fn): Also set DECL_IGNORED_P.

From-SVN: r21700

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index cee17fd299e50c4b675e961187448e2555852961..b99f23b236be43f904cd8bcb97eebb4b03973493 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+1998-08-13  Jason Merrill  <jason@yorick.cygnus.com>
+
+       * pt.c (tsubst_copy): Hush warning.
+
+       * rtti.c (get_tinfo_fn): Also set DECL_IGNORED_P.
+
 1998-08-12  Mark Mitchell  <mark@markmitchell.com>
 
        * pt.c (print_template_context): Don't abort when instantiating a

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 319941f5e5c680e4b19af1efba55ec42122e69dd..7bdd03c9d8754046a8c376978b645a69f5f19641 100644 (file)
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -5649,7 +5649,7 @@ tsubst_copy (t, args, in_decl)
             should find it again here during instantiation.  */
        my_friendly_abort (0);
       }
-      break;
+      return t;
 
     case FIELD_DECL:
       if (DECL_CONTEXT (t))

diff --git a/gcc/cp/rtti.c b/gcc/cp/rtti.c
index 0750fa3649bf32ee36479caca2da9e3da2c45167..a86d6ed3a7818cf4a27c12a6571d0ec2a0783cc7 100644 (file)
--- a/gcc/cp/rtti.c
+++ b/gcc/cp/rtti.c
@@ -371,12 +371,14 @@ get_tinfo_fn (type)
 
   /* We set DECL_CONTEXT for the benefit of backend stuff that wants to
      know what type this artificial function is associated with.  dllexport
-     handling, for instance.  This is a kludge, and the DECL_NO_STATIC_CHAIN
-     bit is necessary to keep local classes from breaking.  */
+     handling, for instance.  This is a kludge, and the
+     DECL_NO_STATIC_CHAIN bit is necessary to keep local classes from
+     breaking.  The DECL_IGNORED_P bit keeps dwarf2 from breaking.  */
   if (IS_AGGR_TYPE (type))
     {
       DECL_CONTEXT (d) = type;
       DECL_NO_STATIC_CHAIN (d) = 1;
+      DECL_IGNORED_P (d) = 1;
     }
 
   pushdecl_top_level (d);