diff options
| author | Saar Raz <saar@raz.email> | 2020-01-19 00:45:25 +0200 |
|---|---|---|
| committer | Saar Raz <saar@raz.email> | 2020-01-24 02:28:23 +0200 |
| commit | fe039ecc2d7467ee02a30a9b32d99256e468a671 (patch) | |
| tree | ce6ee4e97d76555c757dd4bab3f82bacf44e65c2 | |
| parent | c96ef5118857ff938aa6d304ccf7c0f9b81bc5ba (diff) | |
| download | bcm5719-llvm-fe039ecc2d7467ee02a30a9b32d99256e468a671.tar.gz bcm5719-llvm-fe039ecc2d7467ee02a30a9b32d99256e468a671.zip | |
[Concepts] Fix name-type conflict compilation issues
D50360 caused some platforms to not compile due to a parameter with the name of a type.
Rename the parameter.
(cherry picked from commit e68c1e00eba4ae64d38e62eebebd581e3d3d6bd4)
| -rw-r--r-- | clang/lib/Parse/ParseDecl.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/clang/lib/Parse/ParseDecl.cpp b/clang/lib/Parse/ParseDecl.cpp index 178cb1b661c..065a82b9298 100644 --- a/clang/lib/Parse/ParseDecl.cpp +++ b/clang/lib/Parse/ParseDecl.cpp @@ -6612,7 +6612,7 @@ void Parser::ParseFunctionDeclaratorIdentifierList( /// [C++11] attribute-specifier-seq parameter-declaration /// void Parser::ParseParameterDeclarationClause( - DeclaratorContext DeclaratorContext, + DeclaratorContext DeclaratorCtx, ParsedAttributes &FirstArgAttrs, SmallVectorImpl<DeclaratorChunk::ParamInfo> &ParamInfo, SourceLocation &EllipsisLoc) { @@ -6661,9 +6661,9 @@ void Parser::ParseParameterDeclarationClause( // "LambdaExprParameterContext", because we must accept either // 'declarator' or 'abstract-declarator' here. Declarator ParmDeclarator( - DS, DeclaratorContext == DeclaratorContext::RequiresExprContext + DS, DeclaratorCtx == DeclaratorContext::RequiresExprContext ? DeclaratorContext::RequiresExprContext - : DeclaratorContext == DeclaratorContext::LambdaExprContext + : DeclaratorCtx == DeclaratorContext::LambdaExprContext ? DeclaratorContext::LambdaExprParameterContext : DeclaratorContext::PrototypeContext); ParseDeclarator(ParmDeclarator); @@ -6719,7 +6719,7 @@ void Parser::ParseParameterDeclarationClause( SourceLocation EqualLoc = Tok.getLocation(); // Parse the default argument - if (DeclaratorContext == DeclaratorContext::MemberContext) { + if (DeclaratorCtx == DeclaratorContext::MemberContext) { // If we're inside a class definition, cache the tokens // corresponding to the default argument. We'll actually parse // them when we see the end of the class definition. |
