diff options
| author | Sebastian Redl <sebastian.redl@getdesigned.at> | 2010-02-08 19:35:18 +0000 |
|---|---|---|
| committer | Sebastian Redl <sebastian.redl@getdesigned.at> | 2010-02-08 19:35:18 +0000 |
| commit | b0e3e1bf67b28fba9c70981ad3a4069440aa1600 (patch) | |
| tree | fdeae4282a112d21544d065622f06213deadc4e2 /clang/lib/Parse/ParseTemplate.cpp | |
| parent | 69f9dbc3e4a4a22b6aea560d386d70cabc885ef8 (diff) | |
| download | bcm5719-llvm-b0e3e1bf67b28fba9c70981ad3a4069440aa1600.tar.gz bcm5719-llvm-b0e3e1bf67b28fba9c70981ad3a4069440aa1600.zip | |
When placing an annotation token over an existing annotation token, make sure that the new token's range extends to the end of the old token. Assert that in AnnotateCachedTokens. Fixes PR6248.
llvm-svn: 95555
Diffstat (limited to 'clang/lib/Parse/ParseTemplate.cpp')
| -rw-r--r-- | clang/lib/Parse/ParseTemplate.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/Parse/ParseTemplate.cpp b/clang/lib/Parse/ParseTemplate.cpp index 797c1dfe3e6..12f26bfcb94 100644 --- a/clang/lib/Parse/ParseTemplate.cpp +++ b/clang/lib/Parse/ParseTemplate.cpp @@ -836,7 +836,7 @@ void Parser::AnnotateTemplateIdTokenAsType(const CXXScopeSpec *SS) { Tok.setAnnotationValue(Type.isInvalid()? 0 : Type.get()); if (SS && SS->isNotEmpty()) // it was a C++ qualified type name. Tok.setLocation(SS->getBeginLoc()); - Tok.setAnnotationEndLoc(TemplateId->TemplateNameLoc); + // End location stays the same // Replace the template-id annotation token, and possible the scope-specifier // that precedes it, with the typename annotation token. |
