Revert "[OPENMP] Delayed diagnostics for VLA support."

This reverts commit r354679 to fix the problem with the Windows
buildbots

llvm-svn: 354680

2 files changed, 3 insertions, 13 deletions

diff --git a/clang/test/OpenMP/target_vla_messages.cpp b/clang/test/OpenMP/target_vla_messages.cpp
index 30a27517242..b744081e983 100644
--- a/clang/test/OpenMP/target_vla_messages.cpp
+++ b/clang/test/OpenMP/target_vla_messages.cpp
@@ -47,7 +47,7 @@ void target_template(int arg) {
 #pragma omp target
   {
 #ifdef NO_VLA
-    // expected-error@+2 2 {{variable length arrays are not supported for the current target}}
+    // expected-error@+2 {{variable length arrays are not supported for the current target}}
 #endif
     T vla[arg];
   }
@@ -73,9 +73,6 @@ void target(int arg) {
     }
   }
 
-#ifdef NO_VLA
-    // expected-note@+2 {{in instantiation of function template specialization 'target_template<long>' requested here}}
-#endif
   target_template<long>(arg);
 }
 
diff --git a/clang/test/SemaCUDA/vla.cu b/clang/test/SemaCUDA/vla.cu
index cf3054cd8e9..b65ae5e5fe2 100644
--- a/clang/test/SemaCUDA/vla.cu
+++ b/clang/test/SemaCUDA/vla.cu
@@ -1,9 +1,5 @@
 // RUN: %clang_cc1 -triple nvptx64-nvidia-cuda -fcuda-is-device -verify %s
-// RUN: %clang_cc1 -triple x86_64-unknown-linux -verify -DHOST %s
-
-#ifndef __CUDA_ARCH__
-// expected-no-diagnostics
-#endif
+// RUN: %clang_cc1 -triple nvptx64-nvidia-cuda -verify -DHOST %s
 
 #include "Inputs/cuda.h"
 
@@ -12,10 +8,7 @@ void host(int n) {
 }
 
 __device__ void device(int n) {
-  int x[n];
-#ifdef __CUDA_ARCH__
-  // expected-error@-2 {{cannot use variable-length arrays in __device__ functions}}
-#endif
+  int x[n];  // expected-error {{cannot use variable-length arrays in __device__ functions}}
 }
 
 __host__ __device__ void hd(int n) {