[SYCL][TEST] Fix variable length array warning/notes

This also reverts commit e8bb014.

Author: jsji

clang/test/SemaSYCL/sycl-restrict.cpp

@@ -1,11 +1,11 @@
-// RUN: %clang_cc1 -Wno-vla -fsycl-is-device -fcxx-exceptions -triple spir64 \
+// RUN: %clang_cc1 -fsycl-is-device -fcxx-exceptions -triple spir64 \
 // RUN:  -aux-triple x86_64-unknown-linux-gnu -Wno-return-type -verify     \
 // RUN:  -Wno-sycl-2017-compat -fsyntax-only -std=c++17 %s
-// RUN: %clang_cc1 -Wno-vla -fsycl-is-device -fcxx-exceptions -triple spir64 \
+// RUN: %clang_cc1 -fsycl-is-device -fcxx-exceptions -triple spir64 \
 // RUN:  -aux-triple x86_64-unknown-linux-gnu -fno-sycl-allow-func-ptr     \
 // RUN:  -Wno-return-type -verify -Wno-sycl-2017-compat -fsyntax-only      \
 // RUN:  -std=c++17 %s
-// RUN: %clang_cc1 -Wno-vla -fsycl-is-device -fcxx-exceptions -triple spir64 \
+// RUN: %clang_cc1 -fsycl-is-device -fcxx-exceptions -triple spir64 \
 // RUN:  -aux-triple x86_64-unknown-linux-gnu -DALLOW_FP=1                 \
 // RUN:  -fsycl-allow-func-ptr -Wno-return-type -verify                    \
 // RUN:  -Wno-sycl-2017-compat -fsyntax-only -std=c++17 %s
@@ -40,10 +40,12 @@ bool operator==(const Fraction &lhs, const Fraction &rhs) {
 } // namespace Check_User_Operators
 
 namespace Check_VLA_Restriction {
-void no_restriction(int p) {
+void no_restriction(int p) { // expected-note {{declared here}}
+  // expected-note@+2 {{function parameter 'p' with unknown value cannot be used in a constant expression}}
+  // expected-warning@+1 {{variable length arrays in C++ are a Clang extension}}
   int index[p + 2];
 }
-void restriction(int p) {
+void restriction(int p) { // expected-note {{declared here}}
   // This particular violation is nested under two kernels with intermediate function calls.
   // e.g. main -> 1stkernel -> usage -> 2ndkernel -> isa_B -> restriction -> !!
   // Because the error is in two different kernels, we are given helpful notes for the origination of the error, twice.
@@ -52,6 +54,8 @@ void restriction(int p) {
   // expected-note@#call_isa_B 2{{called by 'operator()'}}
   // expected-note@#rtti_kernel 2{{called by 'kernel1<kernel_name, (lambda at }}
   // expected-note@#call_vla {{called by 'isa_B'}}
+  // expected-note@+2 {{function parameter 'p' with unknown value cannot be used in a constant expression}}
+  // expected-warning@+1 {{variable length arrays in C++ are a Clang extension}}
   int index[p + 2]; // expected-error {{variable length arrays are not supported for the current target}}
 }
 } // namespace Check_VLA_Restriction