2 files changed, 17 insertions, 2 deletions
diff --git a/test/CXX/expr/expr.prim/expr.prim.lambda/p2-template-parameter.cpp b/test/CXX/expr/expr.prim/expr.prim.lambda/p2-template-parameter.cpp
new file mode 100644
index 0000000000000..f120a63badcbe
--- /dev/null
+++ b/test/CXX/expr/expr.prim/expr.prim.lambda/p2-template-parameter.cpp
@@ -0,0 +1,7 @@
+// RUN: %clang_cc1 -std=c++17 %s -verify
+
+template<auto> struct Nothing {};
+
+void pr33696() {
+    Nothing<[]() { return 0; }()> nothing; // expected-error{{a lambda expression cannot appear in this context}}
+}
diff --git a/test/CXX/expr/expr.prim/expr.prim.lambda/p3.cpp b/test/CXX/expr/expr.prim/expr.prim.lambda/p3.cpp
index 80771d7a229a5..db40bd5d1420e 100644
--- a/test/CXX/expr/expr.prim/expr.prim.lambda/p3.cpp
+++ b/test/CXX/expr/expr.prim/expr.prim.lambda/p3.cpp
@@ -1,11 +1,19 @@
 // RUN: %clang_cc1 -fsyntax-only -std=c++11 %s -verify
+// RUN: %clang_cc1 -fsyntax-only -std=c++14 %s -verify
+// RUN: %clang_cc1 -fsyntax-only -std=c++17 %s -verify
 
 void test_nonaggregate(int i) {
   auto lambda = [i]() -> void {}; // expected-note 2{{candidate constructor}}
   decltype(lambda) foo = { 1 }; // expected-error{{no matching constructor}}
-  static_assert(!__is_literal(decltype(lambda)), "");
+  static_assert(__is_literal(decltype(lambda)) == (__cplusplus >= 201703L), "");
 
   auto lambda2 = []{}; // expected-note 2{{candidate constructor}}
   decltype(lambda2) bar = {}; // expected-error{{no matching constructor}}
-  static_assert(!__is_literal(decltype(lambda2)), "");
+  static_assert(__is_literal(decltype(lambda2)) == (__cplusplus >= 201703L), "");
 }
+
+constexpr auto literal = []{};
+#if __cplusplus < 201703L
+// expected-error@-2 {{constexpr variable cannot have non-literal type}}
+// expected-note@-3 {{lambda closure types are non-literal types before C++17}}
+#endif