diff options
| author | Douglas Gregor <dgregor@apple.com> | 2009-08-26 18:27:52 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2009-08-26 18:27:52 +0000 |
| commit | 42c39f39184c5ce9d7f489e5dcb7eec770728a9a (patch) | |
| tree | 8b08d164d5ed39d1c44a77b26f63963274bf98ac /lib/Parse | |
| parent | 8f28f99019e86ae2841d17668811c6a94f5c44f8 (diff) | |
When we know that we are parsing a class-name, implicitly construct a
TypenameType if getTypeName is looking at a member of an unknown
specialization. This allows us to properly parse class templates that
derived from type that could only otherwise be described by a typename type,
e.g.,
template<class T> struct X {};
template<typename T> struct Y : public X<T>::X { };
Fixes PR4381.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@80123 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Parse')
| -rw-r--r-- | lib/Parse/MinimalAction.cpp | 3 | ||||
| -rw-r--r-- | lib/Parse/ParseDecl.cpp | 2 | ||||
| -rw-r--r-- | lib/Parse/ParseDeclCXX.cpp | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/lib/Parse/MinimalAction.cpp b/lib/Parse/MinimalAction.cpp index 6c8d75c2d6..4e32de34b7 100644 --- a/lib/Parse/MinimalAction.cpp +++ b/lib/Parse/MinimalAction.cpp @@ -143,7 +143,8 @@ void MinimalAction::ActOnTranslationUnitScope(SourceLocation Loc, Scope *S) { /// FIXME: Use the passed CXXScopeSpec for accurate C++ type checking. Action::TypeTy * MinimalAction::getTypeName(IdentifierInfo &II, SourceLocation Loc, - Scope *S, const CXXScopeSpec *SS) { + Scope *S, const CXXScopeSpec *SS, + bool isClassName) { if (TypeNameInfo *TI = II.getFETokenInfo<TypeNameInfo>()) if (TI->isTypeName) return TI; diff --git a/lib/Parse/ParseDecl.cpp b/lib/Parse/ParseDecl.cpp index c29f601f29..25bed0937b 100644 --- a/lib/Parse/ParseDecl.cpp +++ b/lib/Parse/ParseDecl.cpp @@ -2248,7 +2248,7 @@ void Parser::ParseDirectDeclarator(Declarator &D) { } else if (Tok.is(tok::tilde)) { // This should be a C++ destructor. SourceLocation TildeLoc = ConsumeToken(); - if (Tok.is(tok::identifier)) { + if (Tok.is(tok::identifier) || Tok.is(tok::annot_template_id)) { // FIXME: Inaccurate. SourceLocation NameLoc = Tok.getLocation(); SourceLocation EndLoc; diff --git a/lib/Parse/ParseDeclCXX.cpp b/lib/Parse/ParseDeclCXX.cpp index 3a82868d5a..0a97825fd9 100644 --- a/lib/Parse/ParseDeclCXX.cpp +++ b/lib/Parse/ParseDeclCXX.cpp @@ -457,7 +457,8 @@ Parser::TypeResult Parser::ParseClassName(SourceLocation &EndLocation, // We have an identifier; check whether it is actually a type. TypeTy *Type = Actions.getTypeName(*Tok.getIdentifierInfo(), - Tok.getLocation(), CurScope, SS); + Tok.getLocation(), CurScope, SS, + true); if (!Type) { Diag(Tok, DestrExpected ? diag::err_destructor_class_name : diag::err_expected_class_name); |