3 files changed, 28 insertions, 0 deletions
diff --git a/compiler-rt/lib/ubsan/lit_tests/Misc/vla.c b/compiler-rt/lib/ubsan/lit_tests/Misc/vla.c
new file mode 100644
index 00000000000..4137e804e8d
--- /dev/null
+++ b/compiler-rt/lib/ubsan/lit_tests/Misc/vla.c
@@ -0,0 +1,11 @@
+// RUN: %clang -fcatch-undefined-behavior %s -O3 -o %t
+// RUN: %t 2>&1 | FileCheck %s --check-prefix=CHECK-MINUS-ONE
+// RUN: %t a 2>&1 | FileCheck %s --check-prefix=CHECK-ZERO
+// RUN: %t a b
+
+int main(int argc, char **argv) {
+  // CHECK-MINUS-ONE: vla.c:9:11: fatal error: variable length array bound evaluates to non-positive value -1
+  // CHECK-ZERO: vla.c:9:11: fatal error: variable length array bound evaluates to non-positive value 0
+  int arr[argc - 2];
+  return 0;
+}
diff --git a/compiler-rt/lib/ubsan/ubsan_handlers.cc b/compiler-rt/lib/ubsan/ubsan_handlers.cc
index 8aec335b875..fa3c1e0fc34 100644
--- a/compiler-rt/lib/ubsan/ubsan_handlers.cc
+++ b/compiler-rt/lib/ubsan/ubsan_handlers.cc
@@ -126,3 +126,11 @@ void __ubsan::__ubsan_handle_missing_return(UnreachableData *Data) {
                   "without returning a value");
   Die();
 }
+
+void __ubsan::__ubsan_handle_vla_bound_not_positive(VLABoundData *Data,
+                                                    ValueHandle Bound) {
+  Diag(Data->Loc, "variable length array bound evaluates to "
+                  "non-positive value %0")
+    << Value(Data->Type, Bound);
+  Die();
+}
diff --git a/compiler-rt/lib/ubsan/ubsan_handlers.h b/compiler-rt/lib/ubsan/ubsan_handlers.h
index 8b12bd8454b..484ffa5170c 100644
--- a/compiler-rt/lib/ubsan/ubsan_handlers.h
+++ b/compiler-rt/lib/ubsan/ubsan_handlers.h
@@ -76,6 +76,15 @@ extern "C" void __ubsan_handle_builtin_unreachable(UnreachableData *Data);
 /// \brief Handle reaching the end of a value-returning function.
 extern "C" void __ubsan_handle_missing_return(UnreachableData *Data);
 
+struct VLABoundData {
+  SourceLocation Loc;
+  const TypeDescriptor &Type;
+};
+
+/// \brief Handle a VLA with a non-positive bound.
+extern "C" void __ubsan_handle_vla_bound_not_positive(VLABoundData *Data,
+                                                      ValueHandle Bound);
+
 }
 
 #endif // UBSAN_HANDLERS_H