summaryrefslogtreecommitdiffstats
path: root/clang/lib/Parse/ParseDecl.cpp
diff options
context:
space:
mode:
authorDavid Majnemer <david.majnemer@gmail.com>2015-01-12 05:17:40 +0000
committerDavid Majnemer <david.majnemer@gmail.com>2015-01-12 05:17:40 +0000
commit06b7d006b82c4279d603be4daca228d0028d12eb (patch)
tree2659f531d82a8ede610f81270703fd0f01d2a647 /clang/lib/Parse/ParseDecl.cpp
parent06a5dd69e29bc5d75204b141773d1946a4fc007d (diff)
downloadbcm5719-llvm-06b7d006b82c4279d603be4daca228d0028d12eb.tar.gz
bcm5719-llvm-06b7d006b82c4279d603be4daca228d0028d12eb.zip
Parse: Get rid of tok::cxx_defaultarg_end, use EOF instead
I added setEofData/getEofData to solve this sort of problem back in r224505. Use the Param's decl to tell us if this is *our* EOF token. llvm-svn: 225619
Diffstat (limited to 'clang/lib/Parse/ParseDecl.cpp')
-rw-r--r--clang/lib/Parse/ParseDecl.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/Parse/ParseDecl.cpp b/clang/lib/Parse/ParseDecl.cpp
index 7ff39aabeb1..66366d99190 100644
--- a/clang/lib/Parse/ParseDecl.cpp
+++ b/clang/lib/Parse/ParseDecl.cpp
@@ -5631,8 +5631,9 @@ void Parser::ParseParameterDeclarationClause(
// stop when we parse it later on.
Token DefArgEnd;
DefArgEnd.startToken();
- DefArgEnd.setKind(tok::cxx_defaultarg_end);
+ DefArgEnd.setKind(tok::eof);
DefArgEnd.setLocation(Tok.getLocation());
+ DefArgEnd.setEofData(Param);
DefArgToks->push_back(DefArgEnd);
Actions.ActOnParamUnparsedDefaultArgument(Param, EqualLoc,
(*DefArgToks)[1].getLocation());
OpenPOWER on IntegriCloud