Fix tests after https://reviews.llvm.org/D114080

err_typecheck_zero_array_size now accepts an argument, the error message
has changed.
Remove asserts from SemaSYCL since deferred diagnostics happen after it.

Author: Fznamznon

clang/lib/Sema/SemaSYCL.cpp

@@ -444,7 +444,8 @@ static void checkSYCLType(Sema &S, QualType Ty, SourceRange Loc,
 
   // zero length arrays
   if (isZeroSizedArray(Ty)) {
-    S.SYCLDiagIfDeviceCode(Loc.getBegin(), diag::err_typecheck_zero_array_size);
+    S.SYCLDiagIfDeviceCode(Loc.getBegin(), diag::err_typecheck_zero_array_size)
+        << 1;
     Emitting = true;
   }
 
@@ -1274,7 +1275,6 @@ class KernelObjVisitor {
     assert(CAT && "Should only be called on constant-size array.");
     QualType ET = CAT->getElementType();
     uint64_t ElemCount = CAT->getSize().getZExtValue();
-    assert(ElemCount > 0 && "SYCL prohibits 0 sized arrays");
 
     (void)std::initializer_list<int>{
         (Handlers.enterArray(Field, ArrayTy, ET), 0)...};
@@ -3072,10 +3072,6 @@ class SyclKernelBodyCreator : public SyclKernelFieldHandler {
     CollectionInitExprs.pop_back();
     ArrayInfos.pop_back();
 
-    assert(
-        !SemaRef.getASTContext().getAsConstantArrayType(ArrayType)->getSize() ==
-            0 &&
-        "Constant arrays must have at least 1 element");
     // Remove the IndexExpr.
     MemberExprBases.pop_back();
 

clang/test/SemaSYCL/deferred-diagnostics-emit.cpp

@@ -21,7 +21,7 @@ void variadic(int, ...) {}
 
 // there are more types like this checked in sycl-restrict.cpp
 int calledFromKernel(int a) {
-  // expected-error@+1 {{zero-length arrays are not permitted in C++}}
+  // expected-error@+1 {{zero-length arrays are not permitted in SYCL device code}}
   int MalArray[0];
 
   // expected-error@+1 {{'__float128' is not supported on this target}}
@@ -67,9 +67,9 @@ void setup_sycl_operation(const T VA[]) {
     // expected-note@#KernelSingleTaskKernelFuncCall {{called by 'kernel_single_task<AName, (lambda}}
     h.single_task<class AName>([]() {
       // ======= Zero Length Arrays Not Allowed in Kernel ==========
-      // expected-error@+1 {{zero-length arrays are not permitted in C++}}
+      // expected-error@+1 {{zero-length arrays are not permitted in SYCL device code}}
       int MalArray[0];
-      // expected-error@+1 {{zero-length arrays are not permitted in C++}}
+      // expected-error@+1 {{zero-length arrays are not permitted in SYCL device code}}
       intDef MalArrayDef[0];
       // ---- false positive tests. These should not generate any errors.
       foo<int[0]>();
@@ -170,7 +170,7 @@ int main(int argc, char **argv) {
   deviceQueue.submit([&](sycl::handler &h) {
     // expected-note@#KernelSingleTaskKernelFuncCall 8 {{called by 'kernel_single_task<AName, (lambda}}
     h.single_task<class AName>([]() {
-      // expected-error@+1 {{zero-length arrays are not permitted in C++}}
+      // expected-error@+1 {{zero-length arrays are not permitted in SYCL device code}}
       int BadArray[0];
 
       // expected-error@+1 {{'__float128' is not supported on this target}}

clang/test/SemaSYCL/sycl-restrict.cpp

@@ -167,7 +167,7 @@ using safealias_t = int;
 
 //struct
 struct frankenStruct {
-  // expected-error@+1 {{zero-length arrays are not permitted in C++}}
+  // expected-error@+1 {{zero-length arrays are not permitted in SYCL device code}}
   int mosterArr[0];
   // expected-error@+1 {{'__float128' is not supported on this target}}
   __float128 scaryQuad;
@@ -302,9 +302,9 @@ void usage(myFuncDef functionPtr) {
   safealias_t<long double> notALD = 55;
 
   // ======= Zero Length Arrays Not Allowed in Kernel ==========
-  // expected-error@+1 {{zero-length arrays are not permitted in C++}}
+  // expected-error@+1 {{zero-length arrays are not permitted in SYCL device code}}
   int MalArray[0];
-  // expected-error@+1 {{zero-length arrays are not permitted in C++}}
+  // expected-error@+1 {{zero-length arrays are not permitted in SYCL device code}}
   intDef MalArrayDef[0];
   // ---- false positive tests. These should not generate any errors.
   foo<int[0]>();