diff --git a/clang/lib/Sema/SemaConcept.cpp b/clang/lib/Sema/SemaConcept.cpp --- a/clang/lib/Sema/SemaConcept.cpp +++ b/clang/lib/Sema/SemaConcept.cpp @@ -41,9 +41,12 @@ LHS = BO->getLHS(); RHS = BO->getRHS(); } else if (auto *OO = dyn_cast(E)) { - Op = OO->getOperator(); - LHS = OO->getArg(0); - RHS = OO->getArg(1); + // If OO is not || or && it might not have exactly 2 arguments. + if (OO->getNumArgs() == 2) { + Op = OO->getOperator(); + LHS = OO->getArg(0); + RHS = OO->getArg(1); + } } } diff --git a/clang/lib/Sema/SemaExpr.cpp b/clang/lib/Sema/SemaExpr.cpp --- a/clang/lib/Sema/SemaExpr.cpp +++ b/clang/lib/Sema/SemaExpr.cpp @@ -16657,8 +16657,10 @@ if (!Rec.Lambdas.empty()) { using ExpressionKind = ExpressionEvaluationContextRecord::ExpressionKind; - if (Rec.ExprContext == ExpressionKind::EK_TemplateArgument || Rec.isUnevaluated() || - (Rec.isConstantEvaluated() && !getLangOpts().CPlusPlus17)) { + if (!getLangOpts().CPlusPlus20 && + (Rec.ExprContext == ExpressionKind::EK_TemplateArgument || + Rec.isUnevaluated() || + (Rec.isConstantEvaluated() && !getLangOpts().CPlusPlus17))) { unsigned D; if (Rec.isUnevaluated()) { // C++11 [expr.prim.lambda]p2: diff --git a/clang/test/CXX/expr/expr.prim/expr.prim.lambda/p2-unevaluated.cpp b/clang/test/CXX/expr/expr.prim/expr.prim.lambda/p2-unevaluated.cpp new file mode 100644 --- /dev/null +++ b/clang/test/CXX/expr/expr.prim/expr.prim.lambda/p2-unevaluated.cpp @@ -0,0 +1,31 @@ +// RUN: %clang_cc1 -std=c++20 %s -verify + + +template struct Nothing {}; +Nothing<[]() { return 0; }()> nothing; + +template struct NothingT {}; +Nothing<[]() { return 0; }> nothingT; + +template +concept True = [] { return true; }(); +static_assert(True); + +static_assert(sizeof([] { return 0; })); +static_assert(sizeof([] { return 0; }())); + +void f() noexcept(noexcept([] { return 0; }())); + +using a = decltype([] { return 0; }); +using b = decltype([] { return 0; }()); +using c = decltype([]() noexcept(noexcept([] { return 0; }())) { return 0; }); +using d = decltype(sizeof([] { return 0; })); + +template +int unique_test1(); +static_assert(&unique_test1<[](){}> != &unique_test1<[](){}>); + +template +auto g(T) -> decltype([]() { T::invalid; } ()); +auto e = g(0); // expected-error{{no matching function for call}} +// expected-note@-2 {{substitution failure}} diff --git a/clang/test/SemaCXX/anonymous-struct.cpp b/clang/test/SemaCXX/anonymous-struct.cpp --- a/clang/test/SemaCXX/anonymous-struct.cpp +++ b/clang/test/SemaCXX/anonymous-struct.cpp @@ -49,7 +49,7 @@ : B { // expected-note {{type is not C-compatible due to this base class}} } C; // expected-note {{type is given name 'C' for linkage purposes by this typedef declaration}} -#if __cplusplus > 201703L +#if __cplusplus > 201703L && __cplusplus < 202002L typedef struct { // expected-warning {{anonymous non-C-compatible type given name for linkage purposes by typedef declaration; add a tag name here}} static_assert([]{ return true; }()); // expected-note {{type is not C-compatible due to this lambda expression}} } Lambda1; // expected-note {{type is given name 'Lambda1' for linkage purposes by this typedef declaration}} diff --git a/clang/www/cxx_status.html b/clang/www/cxx_status.html --- a/clang/www/cxx_status.html +++ b/clang/www/cxx_status.html @@ -1011,7 +1011,7 @@ Lambdas in unevaluated contexts P0315R4 - No + Clang 13