diff options
| author | Jason Merrill <jason@yorick.cygnus.com> | 1998-08-13 17:02:00 +0000 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 1998-08-13 13:02:00 -0400 |
| commit | db04386fd134ed6619ea9acf279ee245afd440a3 (patch) | |
| tree | bd0b68783fd9c04d0d44c54d2aa3fa4fc398d983 | |
| parent | af79bb862a1182bd01038e0bc333c7229e359465 (diff) | |
| download | gcc-db04386fd134ed6619ea9acf279ee245afd440a3.zip gcc-db04386fd134ed6619ea9acf279ee245afd440a3.tar.gz gcc-db04386fd134ed6619ea9acf279ee245afd440a3.tar.bz2 | |
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
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 2 | ||||
| -rw-r--r-- | gcc/cp/rtti.c | 6 |
3 files changed, 11 insertions, 3 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index cee17fd..b99f23b 100644 --- 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 319941f..7bdd03c 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 0750fa3..a86d6ed 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); |