Skip to content

[Clang][NFC] Consolidate the parameter check for the requires expression parameter. #110773

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 2, 2024
Merged

[Clang][NFC] Consolidate the parameter check for the requires expression parameter. #110773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
59c8706
this diagose
c8ef Oct 2, 2024
52d5668
this diagose loc
c8ef Oct 2, 2024
a2577cd
Merge branch 'main' into require
c8ef Oct 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 1 addition & 14 deletions clang/lib/Parse/ParseDecl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7950,21 +7950,8 @@ void Parser::ParseParameterDeclarationClause(
// Parse a C++23 Explicit Object Parameter
// We do that in all language modes to produce a better diagnostic.
SourceLocation ThisLoc;
if (getLangOpts().CPlusPlus && Tok.is(tok::kw_this)) {
if (getLangOpts().CPlusPlus && Tok.is(tok::kw_this))
ThisLoc = ConsumeToken();
// C++23 [dcl.fct]p6:
// An explicit-object-parameter-declaration is a parameter-declaration
// with a this specifier. An explicit-object-parameter-declaration
// shall appear only as the first parameter-declaration of a
// parameter-declaration-list of either:
// - a member-declarator that declares a member function, or
// - a lambda-declarator.
//
// The parameter-declaration-list of a requires-expression is not such
// a context.
if (DeclaratorCtx == DeclaratorContext::RequiresExpr)
Diag(ThisLoc, diag::err_requires_expr_explicit_object_parameter);
}

ParsedTemplateInfo TemplateInfo;
ParseDeclarationSpecifiers(DS, TemplateInfo, AS_none,
Expand Down
21 changes: 17 additions & 4 deletions clang/lib/Sema/SemaExprCXX.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9519,15 +9519,28 @@ Sema::ActOnStartRequiresExpr(SourceLocation RequiresKWLoc,
} else if (Param->getType().hasQualifiers()) {
Diag(Param->getBeginLoc(), diag::err_void_param_qualified);
}
}

if (Param->hasDefaultArg())
} else if (Param->hasDefaultArg()) {
// C++2a [expr.prim.req] p4
// [...] A local parameter of a requires-expression shall not have a
// default argument. [...]
Diag(Param->getDefaultArgRange().getBegin(),
diag::err_requires_expr_local_parameter_default_argument);
// Ignore default argument and move on
// Ignore default argument and move on
} else if (Param->isExplicitObjectParameter()) {
// C++23 [dcl.fct]p6:
// An explicit-object-parameter-declaration is a parameter-declaration
// with a this specifier. An explicit-object-parameter-declaration
// shall appear only as the first parameter-declaration of a
// parameter-declaration-list of either:
// - a member-declarator that declares a member function, or
// - a lambda-declarator.
//
// The parameter-declaration-list of a requires-expression is not such
// a context.
Diag(Param->getExplicitObjectParamThisLoc(),
diag::err_requires_expr_explicit_object_parameter);
Param->setExplicitObjectParameterLoc(SourceLocation());
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why clear the source location? Wouldn't it somehow break the source fidelity?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

llvm-project/clang/lib/Sema/SemaType.cpp

Lines 5175 to 5179 in e379094

if (Param->isExplicitObjectParameter()) {
S.Diag(Param->getLocation(),
diag::err_void_explicit_object_param);
Param->setExplicitObjectParameterLoc(SourceLocation());
}

I'm not entirely sure, but the check in function parameters do indeed perform this action.

}

Param->setDeclContext(Body);
// If this has an identifier, add it to the scope stack.
Expand Down
Loading