Assert that YDimExpr and ZDimExpr can't practically be nullptr

Author: schittir

clang/lib/Sema/SemaDeclAttr.cpp

@@ -3148,13 +3148,13 @@ static void handleWorkGroupSize(Sema &S, Decl *D, const ParsedAttr &AL) {
   // 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;
+    assert((AL.getKind() == ParsedAttr::AT_ReqdWorkGroupSize && AL.hasScope() &&
+            (AL.getScopeName()->isStr("sycl") ||
+             AL.getScopeName()->isStr("intel"))) &&
+           "Attribute does not exist in sycl:: or intel:: scope");
+
+    Expr *E = IntegerLiteral::Create(S.Context, llvm::APInt(32, 1),
+                                     S.Context.IntTy, AL.getLoc());
     return E;
   };
 
@@ -3176,33 +3176,25 @@ static void handleWorkGroupSize(Sema &S, Decl *D, const ParsedAttr &AL) {
   }
 
   ASTContext &Ctx = S.getASTContext();
-
-  bool YDimExprIsDereferencable = YDimExpr && (!YDimExpr->isValueDependent());
-  bool ZDimExprIsDereferencable = ZDimExpr && (!ZDimExpr->isValueDependent());
-
-  llvm::APSInt XDimVal, YDimVal, ZDimVal;
-  if (!XDimExpr->isValueDependent()) {
+  if (!XDimExpr->isValueDependent() && !YDimExpr->isValueDependent() &&
+      !ZDimExpr->isValueDependent()) {
+    llvm::APSInt XDimVal, YDimVal, ZDimVal;
     ExprResult XDim = S.VerifyIntegerConstantExpression(XDimExpr, &XDimVal);
+    ExprResult YDim = S.VerifyIntegerConstantExpression(YDimExpr, &YDimVal);
+    ExprResult ZDim = S.VerifyIntegerConstantExpression(ZDimExpr, &ZDimVal);
+
     if (XDim.isInvalid())
       return;
     XDimExpr = XDim.get();
-  }
 
-  if (YDimExprIsDereferencable) {
-    ExprResult YDim = S.VerifyIntegerConstantExpression(YDimExpr, &YDimVal);
     if (YDim.isInvalid())
       return;
     YDimExpr = YDim.get();
-  }
 
-  if (ZDimExprIsDereferencable) {
-    ExprResult ZDim = S.VerifyIntegerConstantExpression(ZDimExpr, &ZDimVal);
     if (ZDim.isInvalid())
       return;
     ZDimExpr = ZDim.get();
-  }
 
-  if ((XDimVal >= 1) && (YDimVal >= 1) && (ZDimVal >= 1)) {
     // If the num_simd_work_items attribute is specified on a declaration it
     // must evenly divide the index that increments fastest in the
     // reqd_work_group_size attribute. In OpenCL, the first argument increments