Author: Saar Raz Date: 2020-01-19T00:45:25+02:00 New Revision: e68c1e00eba4ae64d38e62eebebd581e3d3d6bd4
URL: https://github.com/llvm/llvm-project/commit/e68c1e00eba4ae64d38e62eebebd581e3d3d6bd4 DIFF: https://github.com/llvm/llvm-project/commit/e68c1e00eba4ae64d38e62eebebd581e3d3d6bd4.diff LOG: [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. Added: Modified: clang/lib/Parse/ParseDecl.cpp Removed: ################################################################################ diff --git a/clang/lib/Parse/ParseDecl.cpp b/clang/lib/Parse/ParseDecl.cpp index 178cb1b661c7..065a82b9298a 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. _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits