diff options
| -rw-r--r-- | lib/Parse/ParseExpr.cpp | 8 | ||||
| -rw-r--r-- | test/SemaCXX/typename-expression.cpp | 19 |
2 files changed, 26 insertions, 1 deletions
diff --git a/lib/Parse/ParseExpr.cpp b/lib/Parse/ParseExpr.cpp index cd62c64276..3fee78bb71 100644 --- a/lib/Parse/ParseExpr.cpp +++ b/lib/Parse/ParseExpr.cpp @@ -749,7 +749,13 @@ Parser::OwningExprResult Parser::ParseCastExpression(bool isUnaryExpression, Diag(Tok, diag::err_expected_expression); return ExprError(); } - + + if (SavedKind == tok::kw_typename) { + // postfix-expression: typename-specifier '(' expression-list[opt] ')' + if (!TryAnnotateTypeOrScopeToken()) + return ExprError(); + } + // postfix-expression: simple-type-specifier '(' expression-list[opt] ')' // DeclSpec DS; diff --git a/test/SemaCXX/typename-expression.cpp b/test/SemaCXX/typename-expression.cpp new file mode 100644 index 0000000000..8dde6095e5 --- /dev/null +++ b/test/SemaCXX/typename-expression.cpp @@ -0,0 +1,19 @@ +// RUN: clang-cc -fsyntax-only -verify %s + +// PR4364 +template<class T> struct a { + T b() { + return typename T::x(); + } +}; +struct B { + typedef B x; +}; +B c() { + a<B> x; + return x.b(); +} + +// Some extra tests for invalid cases +template<class T> struct test2 { T b() { return typename T::a; } }; // expected-error{{expected '(' for function-style cast or type construction}} +template<class T> struct test3 { T b() { return typename a; } }; // expected-error{{expected a qualified name after 'typename'}} |