Skip to content

Commit

Permalink
[Concepts] Fix name-type conflict compilation issues
Browse files Browse the repository at this point in the history
D50360 caused some platforms to not compile due to a parameter with the name of a type.

Rename the parameter.

(cherry picked from commit e68c1e0)
  • Loading branch information
saarraz committed Jan 24, 2020
1 parent c96ef51 commit fe039ec
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions clang/lib/Parse/ParseDecl.cpp
Expand Up @@ -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) {
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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.
Expand Down

0 comments on commit fe039ec

Please sign in to comment.