From db04386fd134ed6619ea9acf279ee245afd440a3 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Thu, 13 Aug 1998 17:02:00 +0000 Subject: [PATCH] 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 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/pt.c | 2 +- gcc/cp/rtti.c | 6 ++++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index cee17fd299e..b99f23b236b 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +1998-08-13 Jason Merrill + + * pt.c (tsubst_copy): Hush warning. + + * rtti.c (get_tinfo_fn): Also set DECL_IGNORED_P. + 1998-08-12 Mark Mitchell * pt.c (print_template_context): Don't abort when instantiating a diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 319941f5e5c..7bdd03c9d87 100644 --- 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 0750fa3649b..a86d6ed3a78 100644 --- 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); -- 2.30.2