diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/g++.old-deja/g++.pt/extern1.C | 13 |
3 files changed, 18 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index f07c715..c78735e 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +1999-11-29 Mark Mitchell <mark@codesourcery.com> + + * pt.c (tsubst_decl): Robustify. + 1999-11-27 Mark Mitchell <mark@codesourcery.com> * decl2.c (finish_file): Call expand_body for inline functions diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index dde6562..ed9e848 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -5863,7 +5863,7 @@ tsubst_decl (t, args, type, in_decl) my_friendly_assert (DECL_LANG_SPECIFIC (t) && DECL_TEMPLATE_INFO (t) != NULL_TREE, 0); - if (TYPE_P (DECL_CONTEXT (t))) + if (TYPE_P (CP_DECL_CONTEXT (t))) ctx = tsubst_aggr_type (DECL_CONTEXT (t), args, /*complain=*/1, in_decl, /*entering_scope=*/1); diff --git a/gcc/testsuite/g++.old-deja/g++.pt/extern1.C b/gcc/testsuite/g++.old-deja/g++.pt/extern1.C new file mode 100644 index 0000000..1d4ebb8 --- /dev/null +++ b/gcc/testsuite/g++.old-deja/g++.pt/extern1.C @@ -0,0 +1,13 @@ +// Build don't link: +// Origin: Mark Mitchell <mark@codesourcery.com> + +template <class T> +void f () +{ + extern int i; + extern T j; + + i = j; +} + +template void f<int>(); |