    }
  }
  
-@@ -1499,12 +1497,10 @@ void Sema::markKnownEmitted(
+@@ -1499,12 +1487,10 @@ void Sema::markKnownEmitted(
    }
  }
  

 
   def error_inoutput_conflict_with_clobber : Error<
diff --git a/include/clang/Sema/Sema.h b/include/clang/Sema/Sema.h
index f6eee838..669cabb9 100644
--- a/include/clang/Sema/Sema.h
+++ b/include/clang/Sema/Sema.h
@@ -3935,6 +3935,7 @@ public:

-// expected-note@78 {{called by 'm'}}
-// expected-note@79 {{called by 'm'}}
-#endif
diff --git a/test/SemaCUDA/vla.cu b/test/SemaCUDA/vla.cu
index cf3054cd..b65ae5e5 100644
--- a/test/SemaCUDA/vla.cu
+++ b/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) {
