@@ -3451,13 +3451,13 @@ static void handleWorkGroupSizeHint(Sema &S, Decl *D, const ParsedAttr &AL) {
3451
3451
}
3452
3452
3453
3453
// Handles max_work_group_size attribute.
3454
- // Returns a OneArgResult value; EqualToOne means all argument values are
3454
+ // Returns a AttrArgResult value; EqualToOne means all argument values are
3455
3455
// equal to one, NotEqualToOne means at least one argument value is not
3456
3456
// equal to one, and Unknown means that at least one of the argument values
3457
3457
// could not be determined.
3458
3458
enum class AttrArgResult { Unknown, EqualToOne, NotEqualToOne };
3459
3459
static AttrArgResult AreAllAttrArgsOne (const Expr *E, const Expr *E1 ,
3460
- const Expr *E2 , const Expr *E3 ) {
3460
+ const Expr *E2 , const Expr *E3 ) {
3461
3461
// If any of the operand is still value dependent, we can't test anything.
3462
3462
const auto *CE = dyn_cast<ConstantExpr>(E);
3463
3463
const auto *CE1 = dyn_cast<ConstantExpr>(E1 );
@@ -3467,10 +3467,9 @@ static AttrArgResult AreAllAttrArgsOne(const Expr *E, const Expr *E1,
3467
3467
if (!CE || !CE1 || !CE2 || !CE3)
3468
3468
return AttrArgResult::Unknown;
3469
3469
3470
- // Otherwise, test that the values.
3470
+ // Otherwise, test that the attribute values.
3471
3471
if (CE->getResultAsAPSInt () == 0 &&
3472
- (CE1->getResultAsAPSInt () != 1 ||
3473
- CE2->getResultAsAPSInt () != 1 ||
3472
+ (CE1->getResultAsAPSInt () != 1 || CE2->getResultAsAPSInt () != 1 ||
3474
3473
CE3->getResultAsAPSInt () != 1 )) {
3475
3474
return AttrArgResult::NotEqualToOne;
3476
3475
}
@@ -3585,9 +3584,8 @@ SYCLIntelMaxWorkGroupSizeAttr *Sema::MergeSYCLIntelMaxWorkGroupSizeAttr(
3585
3584
// (1, 1, 1) in case the value of SYCLIntelMaxGlobalWorkDimAttr
3586
3585
// equals to 0.
3587
3586
if (const auto *DeclAttr = D->getAttr <SYCLIntelMaxGlobalWorkDimAttr>()) {
3588
- AttrArgResult Results[] = {
3589
- AreAllAttrArgsOne (DeclAttr->getValue (), A.getXDim (), A.getYDim (),
3590
- A.getZDim ())};
3587
+ AttrArgResult Results[] = {AreAllAttrArgsOne (
3588
+ DeclAttr->getValue (), A.getXDim (), A.getYDim (), A.getZDim ())};
3591
3589
3592
3590
if (llvm::is_contained (Results, AttrArgResult::NotEqualToOne)) {
3593
3591
Diag (A.getLoc (), diag::err_sycl_x_y_z_arguments_must_be_one)
0 commit comments