diff options
| -rw-r--r-- | gcc/cp/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/cp/parser.c | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/typename17.C | 10 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/typename18.C | 14 |
5 files changed, 42 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index d1205942034..6fcd92a8822 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,10 @@ +2009-03-27 Andrew Pinski <andrew_pinski@playstation.sony.com> + + PR c++/38638 + * parser.c (cp_parser_elaborated_type_specifier): If we have a + typename tag and don't have either a TYPE_DECL or a + TEMPLATE_ID_EXPR, set the type to NULL. + 2009-03-27 Simon Martin <simartin@users.sourceforge.net> PR c++/37647 diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 02a96ccc4a4..63ac0709ebf 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -11588,7 +11588,11 @@ cp_parser_elaborated_type_specifier (cp_parser* parser, type = make_typename_type (parser->scope, decl, typename_type, /*complain=*/tf_error); - else + /* If the `typename' keyword is in effect and DECL is not a type + decl. Then type is non existant. */ + else if (tag_type == typename_type && TREE_CODE (decl) != TYPE_DECL) + type = NULL_TREE; + else type = TREE_TYPE (decl); } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 1a3843e3707..c5e9545d13b 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,11 @@ 2009-03-27 Andrew Pinski <andrew_pinski@playstation.sony.com> + PR c++/38638 + * g++.dg/template/typename17.C: New testcase. + * g++.dg/template/typename18.C: New testcase. + +2009-03-27 Andrew Pinski <andrew_pinski@playstation.sony.com> + PR c++/36799 * g++.dg/other/var_copy-1.C: New test. diff --git a/gcc/testsuite/g++.dg/template/typename17.C b/gcc/testsuite/g++.dg/template/typename17.C new file mode 100644 index 00000000000..748b1f7ab18 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/typename17.C @@ -0,0 +1,10 @@ +// { dg-do compile } + +// This should fail as A::foo<0> is not a typename at all. +struct A +{ + template<int> void foo(int i) + { + typename A::foo<0>(i1); // { dg-error "" } + } +}; diff --git a/gcc/testsuite/g++.dg/template/typename18.C b/gcc/testsuite/g++.dg/template/typename18.C new file mode 100644 index 00000000000..4134ef6f64b --- /dev/null +++ b/gcc/testsuite/g++.dg/template/typename18.C @@ -0,0 +1,14 @@ +// { dg-do compile } + +// These typename should work as they are types. +struct A +{ + typedef int a; + template <int> + struct f {}; + template<int> void foo(int i) + { + typename A::a(i1); + typename A::f<0>(i2); + } +}; |