Skip to content

[SYCL][NFC] Avoid nullptr dereferencing of YDimExpr and ZDimExpr #4367

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 10 commits into from
Sep 8, 2021
Merged

[SYCL][NFC] Avoid nullptr dereferencing of YDimExpr and ZDimExpr #4367

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
adf91fa
[SYCL] Avoid nullptr dereferencing of YDimExpr and ZDimExpr
schittir Aug 18, 2021
e9f8624
Assert that YDimExpr and ZDimExpr can't practically be nullptr
schittir Aug 24, 2021
5dbf9d5
Remove local variable E; return literal directly
schittir Aug 24, 2021
690d6ce
Fix parenthesis
schittir Aug 24, 2021
11f0a79
Assert that YDimExpr or ZDimExpr cannot be null at a different place
schittir Sep 2, 2021
3d4000a
Remove whitespace
schittir Sep 2, 2021
7f49a73
Remove the ability of SetDefaultValue lambda to return nullptr
schittir Sep 7, 2021
4e4008a
Merge remote-tracking branch 'intel_llvm_remote/sycl' into YDimExpr_Z…
schittir Sep 7, 2021
5ae220f
Rebase and remove checks for intel::reqd_work_group_size spelling
schittir Sep 7, 2021
e114ef6
Remove extra `//`
schittir Sep 8, 2021
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
41 changes: 18 additions & 23 deletions clang/lib/Sema/SemaDeclAttr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3141,29 +3141,6 @@ static void handleWorkGroupSize(Sema &S, Decl *D, const ParsedAttr &AL) {
return;

S.CheckDeprecatedSYCLAttributeSpelling(AL);

Expr *XDimExpr = AL.getArgAsExpr(0);

// If no attribute argument is specified, set the second and third argument
// to the default value 1, but only if the sycl:: or intel::
// reqd_work_group_size spelling was used.
auto SetDefaultValue = [](Sema &S, const ParsedAttr &AL, SourceLocation loc) {
Expr *E =
(AL.getKind() == ParsedAttr::AT_ReqdWorkGroupSize && AL.hasScope() &&
(AL.getScopeName()->isStr("sycl") ||
AL.getScopeName()->isStr("intel")))
? IntegerLiteral::Create(S.Context, llvm::APInt(32, 1),
S.Context.IntTy, AL.getLoc())
: nullptr;
return E;
};

Expr *YDimExpr = AL.isArgExpr(1) ? AL.getArgAsExpr(1)
: SetDefaultValue(S, AL, AL.getLoc());

Expr *ZDimExpr = AL.isArgExpr(2) ? AL.getArgAsExpr(2)
: SetDefaultValue(S, AL, AL.getLoc());

// __attribute__((reqd_work_group_size)), [[cl::reqd_work_group_size]], and
// [[intel::max_work_group_size]] all require exactly three arguments.
if ((AL.getKind() == ParsedAttr::AT_ReqdWorkGroupSize &&
Expand All @@ -3175,6 +3152,24 @@ static void handleWorkGroupSize(Sema &S, Decl *D, const ParsedAttr &AL) {
return;
}

Expr *XDimExpr = AL.getArgAsExpr(0);

// If no attribute argument is specified, set the second and third argument
// to the default value 1, but only if the sycl::reqd_work_group_size
// spelling was used.
auto SetDefaultValue = [](Sema &S, const ParsedAttr &AL) {
assert(AL.getKind() == ParsedAttr::AT_ReqdWorkGroupSize && AL.hasScope() &&
AL.getScopeName()->isStr("sycl"));
return IntegerLiteral::Create(S.Context, llvm::APInt(32, 1),
S.Context.IntTy, AL.getLoc());
};

Expr *YDimExpr =
AL.isArgExpr(1) ? AL.getArgAsExpr(1) : SetDefaultValue(S, AL);

Expr *ZDimExpr =
AL.isArgExpr(2) ? AL.getArgAsExpr(2) : SetDefaultValue(S, AL);

ASTContext &Ctx = S.getASTContext();

if (!XDimExpr->isValueDependent() && !YDimExpr->isValueDependent() &&
Expand Down