diff options
| author | Daniel Jacobowitz <dan@codesourcery.com> | 2006-07-24 02:58:08 +0000 |
|---|---|---|
| committer | Daniel Jacobowitz <drow@gcc.gnu.org> | 2006-07-24 02:58:08 +0000 |
| commit | 74b0d490fa7577857b036b8bff7e8a7cfe7d20a8 (patch) | |
| tree | 800860815721c002ba31692db70db7682e9c5a82 | |
| parent | 5b8c001af92306368900d132b18f8583699e5819 (diff) | |
| download | gcc-74b0d490fa7577857b036b8bff7e8a7cfe7d20a8.zip gcc-74b0d490fa7577857b036b8bff7e8a7cfe7d20a8.tar.gz gcc-74b0d490fa7577857b036b8bff7e8a7cfe7d20a8.tar.bz2 | |
re PR c++/28460 (g++ emits bogus namespace DIE)
PR c++/28460
* decl.c (grokvardecl): Use FROB_CONTEXT.
* pt.c (register_specialization): Likewise.
From-SVN: r115703
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 2 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index a5848b8..d0bbac5 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2006-07-23 Daniel Jacobowitz <dan@codesourcery.com> + + PR c++/28460 + * decl.c (grokvardecl): Use FROB_CONTEXT. + * pt.c (register_specialization): Likewise. + 2006-07-23 Mark Mitchell <mark@codesourcery.com> PR c++/28025 diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 1497749..ad35161 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -6289,7 +6289,7 @@ grokvardecl (tree type, if (explicit_scope && TREE_CODE (explicit_scope) == NAMESPACE_DECL) set_decl_namespace (decl, explicit_scope, 0); else - DECL_CONTEXT (decl) = scope; + DECL_CONTEXT (decl) = FROB_CONTEXT (scope); if (declspecs->storage_class == sc_extern) { diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index e76ad2d..0b852fa 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -1224,7 +1224,7 @@ register_specialization (tree spec, tree tmpl, tree args, bool is_friend) template it is specializing. */ if (DECL_TEMPLATE_SPECIALIZATION (spec) && !check_specialization_namespace (tmpl)) - DECL_CONTEXT (spec) = decl_namespace_context (tmpl); + DECL_CONTEXT (spec) = FROB_CONTEXT (decl_namespace_context (tmpl)); if (!optimize_specialization_lookup_p (tmpl)) DECL_TEMPLATE_SPECIALIZATIONS (tmpl) |