diff options
| author | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-08-15 09:06:42 +0000 |
|---|---|---|
| committer | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-08-15 09:06:42 +0000 |
| commit | 0bea21dbe53764aae7587a534c160786a7cfabdd (patch) | |
| tree | 83024b563f80accaef141bf03538e0b646a6b8c0 /gcc/cp | |
| parent | d1e7f33afc1565bc4c0e28ef52276ef264a92140 (diff) | |
| download | ppe42-gcc-0bea21dbe53764aae7587a534c160786a7cfabdd.tar.gz ppe42-gcc-0bea21dbe53764aae7587a534c160786a7cfabdd.zip | |
/cp
2007-08-15 Paolo Carlini <pcarlini@suse.de>
PR c++/33035
* pt.c (push_template_decl_real): Depending on TYPE_P
use either TYPE_CONTEXT or DECL_CONTEXT.
/testsuite
2007-08-15 Paolo Carlini <pcarlini@suse.de>
PR c++/33035
* g++.dg/template/crash68.C: New.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@127508 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index e632aacedc1..892e8a6ef87 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2007-08-15 Paolo Carlini <pcarlini@suse.de> + + PR c++/33035 + * pt.c (push_template_decl_real): Depending on TYPE_P + use either TYPE_CONTEXT or DECL_CONTEXT. + 2007-08-14 Mark Mitchell <mark@codesourcery.com> * semantics.c (finish_omp_clauses): Strip a NOP_EXPR if diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 5a0bd7170ba..f414bc3521f 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -3913,7 +3913,9 @@ push_template_decl_real (tree decl, bool is_friend) if (current == decl) current = ctx; else - current = TYPE_CONTEXT (current); + current = (TYPE_P (current) + ? TYPE_CONTEXT (current) + : DECL_CONTEXT (current)); } } |
