diff options
| author | Douglas Gregor <dgregor@apple.com> | 2009-04-01 21:51:26 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2009-04-01 21:51:26 +0000 |
| commit | 31a19b6989bbf326d2de5ae12e712e2a65ca9c34 (patch) | |
| tree | e79ad32f23a5f590558c274cf11b000f10b04042 /lib/Parse/ParseExprCXX.cpp | |
| parent | faa435a326a694e0517d035376e616ff82655fe5 (diff) | |
Make parsing a semantic analysis a little more robust following Sema
failures that involve malformed types, e.g., "typename X::foo" where
"foo" isn't a type, or "std::vector<void>" that doens't instantiate
properly.
Similarly, be a bit smarter in our handling of ambiguities that occur
in Sema::getTypeName, to eliminate duplicate error messages about
ambiguous name lookup.
This eliminates two XFAILs in test/SemaCXX, one of which was crying
out to us, trying to tell us that we were producing repeated error
messages.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@68251 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Parse/ParseExprCXX.cpp')
| -rw-r--r-- | lib/Parse/ParseExprCXX.cpp | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/lib/Parse/ParseExprCXX.cpp b/lib/Parse/ParseExprCXX.cpp index 2c6963a05f..5865771f60 100644 --- a/lib/Parse/ParseExprCXX.cpp +++ b/lib/Parse/ParseExprCXX.cpp @@ -148,12 +148,11 @@ bool Parser::ParseOptionalCXXScopeSpecifier(CXXScopeSpec &SS) { if (TemplateId->Kind == TNK_Type_template || TemplateId->Kind == TNK_Dependent_template_name) { - if (AnnotateTemplateIdTokenAsType(&SS)) - SS.clear(); + AnnotateTemplateIdTokenAsType(&SS); + SS.clear(); assert(Tok.is(tok::annot_typename) && "AnnotateTemplateIdTokenAsType isn't working"); - Token TypeToken = Tok; ConsumeToken(); assert(Tok.is(tok::coloncolon) && "NextToken() not working properly!"); @@ -163,12 +162,15 @@ bool Parser::ParseOptionalCXXScopeSpecifier(CXXScopeSpec &SS) { SS.setBeginLoc(TypeToken.getLocation()); HasScopeSpecifier = true; } - - SS.setScopeRep( - Actions.ActOnCXXNestedNameSpecifier(CurScope, SS, - TypeToken.getAnnotationValue(), - TypeToken.getAnnotationRange(), - CCLoc)); + + if (TypeToken.getAnnotationValue()) + SS.setScopeRep( + Actions.ActOnCXXNestedNameSpecifier(CurScope, SS, + TypeToken.getAnnotationValue(), + TypeToken.getAnnotationRange(), + CCLoc)); + else + SS.setScopeRep(0); SS.setEndLoc(CCLoc); continue; } else |