[PATCH] D132945: [clang] Skip re-building lambda expressions in parameters to consteval fns.
This revision was landed with ongoing or failed builds.
This revision was automatically updated to reflect the committed changes.
Closed by commit rGe7eec3824656: [clang] Skip re-building lambda expressions in
parameters to consteval fns. (authored by usaxena95).
Changed prior to commit:
https://reviews.llvm.org/D132945?vs=457546=457555#toc
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D132945/new/
https://reviews.llvm.org/D132945
Files:
clang/docs/ReleaseNotes.rst
clang/lib/Sema/SemaExpr.cpp
clang/test/SemaCXX/cxx2a-consteval.cpp
Index: clang/test/SemaCXX/cxx2a-consteval.cpp
===
--- clang/test/SemaCXX/cxx2a-consteval.cpp
+++ clang/test/SemaCXX/cxx2a-consteval.cpp
@@ -939,3 +939,82 @@
static_assert(max(1,2)==2);
static_assert(mid(1,2,3)==2);
} // namespace GH51182
+
+// https://github.com/llvm/llvm-project/issues/56183
+namespace GH56183 {
+consteval auto Foo(auto c) { return c; }
+consteval auto Bar(auto f) { return f(); }
+void test() {
+ constexpr auto x = Foo(Bar([] { return 'a'; }));
+ static_assert(x == 'a');
+}
+} // namespace GH56183
+
+// https://github.com/llvm/llvm-project/issues/51695
+namespace GH51695 {
+// Original
+template
+struct type_t {};
+
+template
+struct list_t {};
+
+template
+consteval auto pop_front(list_t) -> auto {
+ return list_t{};
+}
+
+template
+consteval auto apply(list_t, F fn) -> auto {
+ return fn(type_t{}...);
+}
+
+void test1() {
+ constexpr auto x = apply(pop_front(list_t{}),
+[](type_t...) { return 42; });
+ static_assert(x == 42);
+}
+// Reduced 1
+consteval bool zero() { return false; }
+
+template
+consteval bool foo(bool, F f) {
+ return f();
+}
+
+void test2() {
+ constexpr auto x = foo(zero(), []() { return true; });
+ static_assert(x);
+}
+
+// Reduced 2
+template
+consteval auto bar(F f) { return f;}
+
+void test3() {
+ constexpr auto t1 = bar(bar(bar(bar([]() { return true; }();
+ static_assert(t1);
+
+ int a = 1; // expected-note {{declared here}}
+ auto t2 = bar(bar(bar(bar([=]() { return a; }(); // expected-error-re {{call to consteval function 'GH51695::bar<(lambda at {{.*}})>' is not a constant expression}}
+ // expected-note@-1 {{read of non-const variable 'a' is not allowed in a constant expression}}
+
+ constexpr auto t3 = bar(bar([x=bar(42)]() { return x; }))();
+ static_assert(t3==42);
+ constexpr auto t4 = bar(bar([x=bar(42)]() consteval { return x; }))();
+ static_assert(t4==42);
+}
+
+} // namespace GH51695
+
+// https://github.com/llvm/llvm-project/issues/50455
+namespace GH50455 {
+void f() {
+ []() consteval { int i{}; }();
+ []() consteval { int i{}; ++i; }();
+}
+void g() {
+ (void)[](int i) consteval { return i; }(0);
+ (void)[](int i) consteval { return i; }(0);
+}
+} // namespace GH50455
Index: clang/lib/Sema/SemaExpr.cpp
===
--- clang/lib/Sema/SemaExpr.cpp
+++ clang/lib/Sema/SemaExpr.cpp
@@ -17598,6 +17598,11 @@
DRSet.erase(E);
return E;
}
+ExprResult TransformLambdaExpr(LambdaExpr *E) {
+ // Do not rebuild lambdas to avoid creating a new type.
+ // Lambdas have already been processed inside their eval context.
+ return E;
+}
bool AlwaysRebuild() { return false; }
bool ReplacingOriginal() { return true; }
bool AllowSkippingCXXConstructExpr() {
Index: clang/docs/ReleaseNotes.rst
===
--- clang/docs/ReleaseNotes.rst
+++ clang/docs/ReleaseNotes.rst
@@ -211,9 +211,16 @@
- Correctly set expression evaluation context as 'immediate function context' in
consteval functions.
This fixes `GH51182 `
+
- Fixes an assert crash caused by looking up missing vtable information on ``consteval``
virtual functions. Fixes `GH55065 `_.
+- Skip rebuilding lambda expressions in arguments of immediate invocations.
+ This fixes `GH56183 `_,
+ `GH51695 `_,
+ `GH50455 `_,
+ `GH54872 `_,
+ `GH54587 `_.
C++2b Feature Support
^
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D132945: [clang] Skip re-building lambda expressions in parameters to consteval fns.
usaxena95 updated this revision to Diff 457546.
usaxena95 marked 2 inline comments as done.
usaxena95 added a comment.
Addressed comments and added more tests.
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D132945/new/
https://reviews.llvm.org/D132945
Files:
clang/docs/ReleaseNotes.rst
clang/lib/Sema/SemaExpr.cpp
clang/test/SemaCXX/cxx2a-consteval.cpp
Index: clang/test/SemaCXX/cxx2a-consteval.cpp
===
--- clang/test/SemaCXX/cxx2a-consteval.cpp
+++ clang/test/SemaCXX/cxx2a-consteval.cpp
@@ -939,3 +939,82 @@
static_assert(max(1,2)==2);
static_assert(mid(1,2,3)==2);
} // namespace GH51182
+
+// https://github.com/llvm/llvm-project/issues/56183
+namespace GH56183 {
+consteval auto Foo(auto c) { return c; }
+consteval auto Bar(auto f) { return f(); }
+void test() {
+ constexpr auto x = Foo(Bar([] { return 'a'; }));
+ static_assert(x == 'a');
+}
+} // namespace GH56183
+
+// https://github.com/llvm/llvm-project/issues/51695
+namespace GH51695 {
+// Original
+template
+struct type_t {};
+
+template
+struct list_t {};
+
+template
+consteval auto pop_front(list_t) -> auto {
+ return list_t{};
+}
+
+template
+consteval auto apply(list_t, F fn) -> auto {
+ return fn(type_t{}...);
+}
+
+void test1() {
+ constexpr auto x = apply(pop_front(list_t{}),
+[](type_t...) { return 42; });
+ static_assert(x == 42);
+}
+// Reduced 1
+consteval bool zero() { return false; }
+
+template
+consteval bool foo(bool, F f) {
+ return f();
+}
+
+void test2() {
+ constexpr auto x = foo(zero(), []() { return true; });
+ static_assert(x);
+}
+
+// Reduced 2
+template
+consteval auto bar(F f) { return f;}
+
+void test3() {
+ constexpr auto t1 = bar(bar(bar(bar([]() { return true; }();
+ static_assert(t1);
+
+ int a = 1; // expected-note {{declared here}}
+ auto t2 = bar(bar(bar(bar([=]() { return a; }(); // expected-error-re {{call to consteval function 'GH51695::bar<(lambda at {{.*}})>' is not a constant expression}}
+ // expected-note@-1 {{read of non-const variable 'a' is not allowed in a constant expression}}
+
+ constexpr auto t3 = bar(bar([x=bar(42)]() { return x; }))();
+ static_assert(t3==42);
+ constexpr auto t4 = bar(bar([x=bar(42)]() consteval { return x; }))();
+ static_assert(t4==42);
+}
+
+} // namespace GH51695
+
+// https://github.com/llvm/llvm-project/issues/50455
+namespace GH50455 {
+void f() {
+ []() consteval { int i{}; }();
+ []() consteval { int i{}; ++i; }();
+}
+void g() {
+ (void)[](int i) consteval { return i; }(0);
+ (void)[](int i) consteval { return i; }(0);
+}
+} // namespace GH50455
Index: clang/lib/Sema/SemaExpr.cpp
===
--- clang/lib/Sema/SemaExpr.cpp
+++ clang/lib/Sema/SemaExpr.cpp
@@ -17598,6 +17598,11 @@
DRSet.erase(E);
return E;
}
+ExprResult TransformLambdaExpr(LambdaExpr *E) {
+ // Do not rebuild lambdas to avoid creating a new type.
+ // Lambdas have already been processed inside their eval context.
+ return E;
+}
bool AlwaysRebuild() { return false; }
bool ReplacingOriginal() { return true; }
bool AllowSkippingCXXConstructExpr() {
Index: clang/docs/ReleaseNotes.rst
===
--- clang/docs/ReleaseNotes.rst
+++ clang/docs/ReleaseNotes.rst
@@ -191,8 +191,14 @@
- Correctly set expression evaluation context as 'immediate function context' in
consteval functions.
- This fixes `GH51182 `
-
+ This fixes `GH51182 `_.
+
+- Skip rebuilding lambda expressions in arguments of immediate invocations.
+ This fixes `GH56183 `_,
+ `GH51695 `_,
+ `GH50455 `_,
+ `GH54872 `_,
+ `GH54587 `_.
C++2b Feature Support
^
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D132945: [clang] Skip re-building lambda expressions in parameters to consteval fns.
ilya-biryukov accepted this revision.
ilya-biryukov added a comment.
This revision is now accepted and ready to land.
Thanks, that's a nice find!
Could you also add a test that mentions uses `consteval` functions in lambda
captures inside immediate invocations?
Something like `consteval_foo([x = consteval_foo(1)]() consteval { return x;
})` and maybe also without `consteval` on lambda parameter list.
I suspect this should work as expected, just wanted to make sure we capture
this in tests
Comment at: clang/docs/ReleaseNotes.rst:196
+
+- Skip re-building lambda expressions when they appear as parameters to an
immediate invocation.
+ This fixes `GH56183 `_,
NIT
Comment at: clang/lib/Sema/SemaExpr.cpp:17601-17605
+ExprResult TransformLambdaExpr(LambdaExpr *E) {
+ // Lambdas must be built already. They must not be re-built as it always
+ // creates new types.
+ return E;
+}
NIT: I tried to expand the meaning of term 'built' to make the comment a bit
clearer.
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D132945/new/
https://reviews.llvm.org/D132945
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D132945: [clang] Skip re-building lambda expressions in parameters to consteval fns.
usaxena95 added a comment. Gentle ping for review. Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D132945/new/ https://reviews.llvm.org/D132945 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D132945: [clang] Skip re-building lambda expressions in parameters to consteval fns.
usaxena95 updated this revision to Diff 456745.
usaxena95 added a comment.
This actually fixes two more issues.
Update release notes and add more documentation.
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D132945/new/
https://reviews.llvm.org/D132945
Files:
clang/docs/ReleaseNotes.rst
clang/lib/Sema/SemaExpr.cpp
clang/test/SemaCXX/cxx2a-consteval.cpp
Index: clang/test/SemaCXX/cxx2a-consteval.cpp
===
--- clang/test/SemaCXX/cxx2a-consteval.cpp
+++ clang/test/SemaCXX/cxx2a-consteval.cpp
@@ -939,3 +939,77 @@
static_assert(max(1,2)==2);
static_assert(mid(1,2,3)==2);
} // namespace GH51182
+
+// https://github.com/llvm/llvm-project/issues/56183
+namespace GH56183 {
+consteval auto Foo(auto c) { return c; }
+consteval auto Bar(auto f) { return f(); }
+void test() {
+ constexpr auto x = Foo(Bar([] { return 'a'; }));
+ static_assert(x == 'a');
+}
+} // namespace GH56183
+
+// https://github.com/llvm/llvm-project/issues/51695
+namespace GH51695 {
+// Original
+template
+struct type_t {};
+
+template
+struct list_t {};
+
+template
+consteval auto pop_front(list_t) -> auto {
+ return list_t{};
+}
+
+template
+consteval auto apply(list_t, F fn) -> auto {
+ return fn(type_t{}...);
+}
+
+void test1() {
+ constexpr auto x = apply(pop_front(list_t{}),
+[](type_t...) { return 42; });
+ static_assert(x == 42);
+}
+// Reduced 1
+consteval bool zero() { return false; }
+
+template
+consteval bool foo(bool, F f) {
+ return f();
+}
+
+void test2() {
+ constexpr auto x = foo(zero(), []() { return true; });
+ static_assert(x);
+}
+
+// Reduced 2
+template
+consteval auto bar(F f) { return f;}
+
+void test3() {
+ constexpr auto x = bar(bar(bar(bar([]() { return true; }();
+ static_assert(x);
+
+ int a = 1; // expected-note {{declared here}}
+ auto y = bar(bar(bar(bar([=]() { return a; }(); // expected-error-re {{call to consteval function 'GH51695::bar<(lambda at {{.*}})>' is not a constant expression}}
+ // expected-note@-1 {{read of non-const variable 'a' is not allowed in a constant expression}}
+}
+
+} // namespace GH51695
+
+// https://github.com/llvm/llvm-project/issues/50455
+namespace GH50455 {
+void f() {
+ []() consteval { int i{}; }();
+ []() consteval { int i{}; ++i; }();
+}
+void g() {
+ (void)[](int i) consteval { return i; }(0);
+ (void)[](int i) consteval { return i; }(0);
+}
+} // namespace GH50455
Index: clang/lib/Sema/SemaExpr.cpp
===
--- clang/lib/Sema/SemaExpr.cpp
+++ clang/lib/Sema/SemaExpr.cpp
@@ -17598,6 +17598,11 @@
DRSet.erase(E);
return E;
}
+ExprResult TransformLambdaExpr(LambdaExpr *E) {
+ // Lambdas must be built already. They must not be re-built as it always
+ // creates new types.
+ return E;
+}
bool AlwaysRebuild() { return false; }
bool ReplacingOriginal() { return true; }
bool AllowSkippingCXXConstructExpr() {
Index: clang/docs/ReleaseNotes.rst
===
--- clang/docs/ReleaseNotes.rst
+++ clang/docs/ReleaseNotes.rst
@@ -191,8 +191,14 @@
- Correctly set expression evaluation context as 'immediate function context' in
consteval functions.
- This fixes `GH51182 `
-
+ This fixes `GH51182 `_.
+
+- Skip re-building lambda expressions when they appear as parameters to an immediate invocation.
+ This fixes `GH56183 `_,
+ `GH51695 `_,
+ `GH50455 `_,
+ `GH54872 `_,
+ `GH54587 `_.
C++2b Feature Support
^
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D132945: [clang] Skip re-building lambda expressions in parameters to consteval fns.
usaxena95 updated this revision to Diff 456739.
usaxena95 added a comment.
Add some test with expected errors as well.
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D132945/new/
https://reviews.llvm.org/D132945
Files:
clang/docs/ReleaseNotes.rst
clang/lib/Sema/SemaExpr.cpp
clang/test/SemaCXX/cxx2a-consteval.cpp
Index: clang/test/SemaCXX/cxx2a-consteval.cpp
===
--- clang/test/SemaCXX/cxx2a-consteval.cpp
+++ clang/test/SemaCXX/cxx2a-consteval.cpp
@@ -939,3 +939,77 @@
static_assert(max(1,2)==2);
static_assert(mid(1,2,3)==2);
} // namespace GH51182
+
+// https://github.com/llvm/llvm-project/issues/56183
+namespace GH56183 {
+consteval auto Foo(auto c) { return c; }
+consteval auto Bar(auto f) { return f(); }
+void test() {
+ constexpr auto x = Foo(Bar([] { return 'a'; }));
+ static_assert(x == 'a');
+}
+} // namespace GH56183
+
+// https://github.com/llvm/llvm-project/issues/51695
+namespace GH51695 {
+// Original
+template
+struct type_t {};
+
+template
+struct list_t {};
+
+template
+consteval auto pop_front(list_t) -> auto {
+ return list_t{};
+}
+
+template
+consteval auto apply(list_t, F fn) -> auto {
+ return fn(type_t{}...);
+}
+
+void test1() {
+ constexpr auto x = apply(pop_front(list_t{}),
+[](type_t...) { return 42; });
+ static_assert(x == 42);
+}
+// Reduced 1
+consteval bool zero() { return false; }
+
+template
+consteval bool foo(bool, F f) {
+ return f();
+}
+
+void test2() {
+ constexpr auto x = foo(zero(), []() { return true; });
+ static_assert(x);
+}
+
+// Reduced 2
+template
+consteval auto bar(F f) { return f;}
+
+void test3() {
+ constexpr auto x = bar(bar(bar(bar([]() { return true; }();
+ static_assert(x);
+
+ int a = 1; // expected-note {{declared here}}
+ auto y = bar(bar(bar(bar([=]() { return a; }(); // expected-error-re {{call to consteval function 'GH51695::bar<(lambda at {{.*}})>' is not a constant expression}}
+ // expected-note@-1 {{read of non-const variable 'a' is not allowed in a constant expression}}
+}
+
+} // namespace GH51695
+
+// https://github.com/llvm/llvm-project/issues/50455
+namespace GH50455 {
+void f() {
+ []() consteval { int i{}; }();
+ []() consteval { int i{}; ++i; }();
+}
+void g() {
+ (void)[](int i) consteval { return i; }(0);
+ (void)[](int i) consteval { return i; }(0);
+}
+} // namespace GH50455
Index: clang/lib/Sema/SemaExpr.cpp
===
--- clang/lib/Sema/SemaExpr.cpp
+++ clang/lib/Sema/SemaExpr.cpp
@@ -17598,6 +17598,7 @@
DRSet.erase(E);
return E;
}
+ExprResult TransformLambdaExpr(LambdaExpr *E) { return E; }
bool AlwaysRebuild() { return false; }
bool ReplacingOriginal() { return true; }
bool AllowSkippingCXXConstructExpr() {
Index: clang/docs/ReleaseNotes.rst
===
--- clang/docs/ReleaseNotes.rst
+++ clang/docs/ReleaseNotes.rst
@@ -191,8 +191,12 @@
- Correctly set expression evaluation context as 'immediate function context' in
consteval functions.
- This fixes `GH51182 `
+ This fixes `GH51182 `_.
+- Skip re-building lambda expressions when they appear as parameters to an immediate invocation.
+ This fixes `GH56183 `_,
+ `GH51695 `_,
+ `GH50455 `_.
C++2b Feature Support
^
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D132945: [clang] Skip re-building lambda expressions in parameters to consteval fns.
usaxena95 updated this revision to Diff 456685.
usaxena95 added a comment.
new line.
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D132945/new/
https://reviews.llvm.org/D132945
Files:
clang/docs/ReleaseNotes.rst
clang/lib/Sema/SemaExpr.cpp
clang/test/SemaCXX/cxx2a-consteval.cpp
Index: clang/test/SemaCXX/cxx2a-consteval.cpp
===
--- clang/test/SemaCXX/cxx2a-consteval.cpp
+++ clang/test/SemaCXX/cxx2a-consteval.cpp
@@ -939,3 +939,68 @@
static_assert(max(1,2)==2);
static_assert(mid(1,2,3)==2);
} // namespace GH51182
+
+// https://github.com/llvm/llvm-project/issues/56183
+namespace GH56183 {
+consteval auto Foo(auto c) { return c; }
+consteval auto Bar(auto f) { return f(); }
+void test() {
+ constexpr auto x = Foo(Bar([] { return 'a'; }));
+ static_assert(x == 'a');
+}
+} // namespace GH56183
+
+// https://github.com/llvm/llvm-project/issues/51695
+namespace GH51695 {
+// Original
+template
+struct type_t {};
+
+template
+struct list_t {};
+
+template
+consteval auto pop_front(list_t) -> auto {
+ return list_t{};
+}
+
+template
+consteval auto apply(list_t, F fn) -> auto {
+ return fn(type_t{}...);
+}
+
+void test1() {
+ constexpr auto x = apply(pop_front(list_t{}),
+[](type_t...) { return 42; });
+ static_assert(x == 42);
+}
+// Reduced
+consteval bool zero() { return false; }
+
+template
+consteval bool foo(bool, F f) {
+ return f();
+}
+
+template
+consteval auto bar(F f) { return f;}
+
+void test2() {
+ constexpr auto x = foo(zero(), []() { return true; });
+ constexpr auto y = bar(bar(bar(bar([]() { return true; }();
+ static_assert(x && y);
+}
+
+} // namespace GH51695
+
+// https://github.com/llvm/llvm-project/issues/50455
+namespace GH50455 {
+void f() {
+ []() consteval { int i{}; }();
+ []() consteval { int i{}; ++i; }();
+}
+void g() {
+ (void)[](int i) consteval { return i; }(0);
+ (void)[](int i) consteval { return i; }(0);
+}
+} // namespace GH50455
Index: clang/lib/Sema/SemaExpr.cpp
===
--- clang/lib/Sema/SemaExpr.cpp
+++ clang/lib/Sema/SemaExpr.cpp
@@ -17598,6 +17598,7 @@
DRSet.erase(E);
return E;
}
+ExprResult TransformLambdaExpr(LambdaExpr *E) { return E; }
bool AlwaysRebuild() { return false; }
bool ReplacingOriginal() { return true; }
bool AllowSkippingCXXConstructExpr() {
Index: clang/docs/ReleaseNotes.rst
===
--- clang/docs/ReleaseNotes.rst
+++ clang/docs/ReleaseNotes.rst
@@ -191,8 +191,12 @@
- Correctly set expression evaluation context as 'immediate function context' in
consteval functions.
- This fixes `GH51182 `
+ This fixes `GH51182 `_.
+- Skip re-building lambda expressions when they appear as parameters to an immediate invocation.
+ This fixes `GH56183 `_,
+ `GH51695 `_,
+ `GH50455 `_.
C++2b Feature Support
^
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D132945: [clang] Skip re-building lambda expressions in parameters to consteval fns.
usaxena95 updated this revision to Diff 456684.
usaxena95 added a comment.
More tests.
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D132945/new/
https://reviews.llvm.org/D132945
Files:
clang/docs/ReleaseNotes.rst
clang/lib/Sema/SemaExpr.cpp
clang/test/SemaCXX/cxx2a-consteval.cpp
Index: clang/test/SemaCXX/cxx2a-consteval.cpp
===
--- clang/test/SemaCXX/cxx2a-consteval.cpp
+++ clang/test/SemaCXX/cxx2a-consteval.cpp
@@ -939,3 +939,68 @@
static_assert(max(1,2)==2);
static_assert(mid(1,2,3)==2);
} // namespace GH51182
+
+// https://github.com/llvm/llvm-project/issues/56183
+namespace GH56183 {
+consteval auto Foo(auto c) { return c; }
+consteval auto Bar(auto f) { return f(); }
+void test() {
+ constexpr auto x = Foo(Bar([] { return 'a'; }));
+ static_assert(x == 'a');
+}
+} // namespace GH56183
+
+// https://github.com/llvm/llvm-project/issues/51695
+namespace GH51695 {
+// Original
+template
+struct type_t {};
+
+template
+struct list_t {};
+
+template
+consteval auto pop_front(list_t) -> auto {
+ return list_t{};
+}
+
+template
+consteval auto apply(list_t, F fn) -> auto {
+ return fn(type_t{}...);
+}
+
+void test1() {
+ constexpr auto x = apply(pop_front(list_t{}),
+[](type_t...) { return 42; });
+ static_assert(x == 42);
+}
+// Reduced
+consteval bool zero() { return false; }
+
+template
+consteval bool foo(bool, F f) {
+ return f();
+}
+
+template
+consteval auto bar(F f) { return f;}
+
+void test2() {
+ constexpr auto x = foo(zero(), []() { return true; });
+ constexpr auto y = bar(bar(bar(bar([]() { return true; }();
+ static_assert(x && y);
+}
+
+} // namespace GH51695
+
+// https://github.com/llvm/llvm-project/issues/50455
+namespace GH50455 {
+void f() {
+ []() consteval { int i{}; }();
+ []() consteval { int i{}; ++i; }();
+}
+void g() {
+ (void)[](int i) consteval { return i; }(0);
+ (void)[](int i) consteval { return i; }(0);
+}
+} // namespace GH50455
\ No newline at end of file
Index: clang/lib/Sema/SemaExpr.cpp
===
--- clang/lib/Sema/SemaExpr.cpp
+++ clang/lib/Sema/SemaExpr.cpp
@@ -17598,6 +17598,7 @@
DRSet.erase(E);
return E;
}
+ExprResult TransformLambdaExpr(LambdaExpr *E) { return E; }
bool AlwaysRebuild() { return false; }
bool ReplacingOriginal() { return true; }
bool AllowSkippingCXXConstructExpr() {
Index: clang/docs/ReleaseNotes.rst
===
--- clang/docs/ReleaseNotes.rst
+++ clang/docs/ReleaseNotes.rst
@@ -191,8 +191,12 @@
- Correctly set expression evaluation context as 'immediate function context' in
consteval functions.
- This fixes `GH51182 `
+ This fixes `GH51182 `_.
+- Skip re-building lambda expressions when they appear as parameters to an immediate invocation.
+ This fixes `GH56183 `_,
+ `GH51695 `_,
+ `GH50455 `_.
C++2b Feature Support
^
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D132945: [clang] Skip re-building lambda expressions in parameters to consteval fns.
usaxena95 created this revision.
Herald added a project: All.
usaxena95 requested review of this revision.
Herald added a project: clang.
Herald added a subscriber: cfe-commits.
Fixes: https://github.com/llvm/llvm-project/issues/56183
Fixes: https://github.com/llvm/llvm-project/issues/51695
Fixes: https://github.com/llvm/llvm-project/issues/50455
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D132945
Files:
clang/docs/ReleaseNotes.rst
clang/lib/Sema/SemaExpr.cpp
clang/test/SemaCXX/cxx2a-consteval.cpp
Index: clang/test/SemaCXX/cxx2a-consteval.cpp
===
--- clang/test/SemaCXX/cxx2a-consteval.cpp
+++ clang/test/SemaCXX/cxx2a-consteval.cpp
@@ -939,3 +939,63 @@
static_assert(max(1,2)==2);
static_assert(mid(1,2,3)==2);
} // namespace GH51182
+
+// https://github.com/llvm/llvm-project/issues/56183
+namespace GH56183 {
+consteval auto Foo(auto c) { return c; }
+consteval auto Bar(auto f) { return f(); }
+void test() {
+ constexpr auto x = Foo(Bar([] { return 'a'; }));
+ static_assert(x == 'a');
+}
+} // namespace GH56183
+
+// https://github.com/llvm/llvm-project/issues/51695
+namespace GH51695 {
+// Original
+template
+struct type_t {};
+
+template
+struct list_t {};
+
+template
+consteval auto pop_front(list_t) -> auto {
+ return list_t{};
+}
+
+template
+consteval auto apply(list_t, F fn) -> auto {
+ return fn(type_t{}...);
+}
+
+void test1() {
+ constexpr auto x = apply(pop_front(list_t{}),
+[](type_t...) { return 42; });
+ static_assert(x == 42);
+}
+// Reduced
+consteval bool zero() { return false; }
+
+template
+consteval bool foo(bool, F f) {
+ return f();
+}
+
+void test2() {
+ constexpr auto x = foo(zero(), []() { return true; });
+ static_assert(x);
+}
+} // namespace GH51695
+
+// https://github.com/llvm/llvm-project/issues/50455
+namespace GH50455 {
+void f() {
+ []() consteval { int i{}; }();
+ []() consteval { int i{}; ++i; }();
+}
+void g() {
+ (void)[](int i) consteval { return i; }(0);
+ (void)[](int i) consteval { return i; }(0);
+}
+} // namespace GH50455
\ No newline at end of file
Index: clang/lib/Sema/SemaExpr.cpp
===
--- clang/lib/Sema/SemaExpr.cpp
+++ clang/lib/Sema/SemaExpr.cpp
@@ -17598,6 +17598,7 @@
DRSet.erase(E);
return E;
}
+ExprResult TransformLambdaExpr(LambdaExpr *E) { return E; }
bool AlwaysRebuild() { return false; }
bool ReplacingOriginal() { return true; }
bool AllowSkippingCXXConstructExpr() {
Index: clang/docs/ReleaseNotes.rst
===
--- clang/docs/ReleaseNotes.rst
+++ clang/docs/ReleaseNotes.rst
@@ -191,8 +191,12 @@
- Correctly set expression evaluation context as 'immediate function context'
in
consteval functions.
- This fixes `GH51182 `
+ This fixes `GH51182 `_.
+- Skip re-building lambda expressions when they appear as parameters to an
immediate invocation.
+ This fixes `GH56183 `_,
+ `GH51695 `_,
+ `GH50455 `_.
C++2b Feature Support
^
Index: clang/test/SemaCXX/cxx2a-consteval.cpp
===
--- clang/test/SemaCXX/cxx2a-consteval.cpp
+++ clang/test/SemaCXX/cxx2a-consteval.cpp
@@ -939,3 +939,63 @@
static_assert(max(1,2)==2);
static_assert(mid(1,2,3)==2);
} // namespace GH51182
+
+// https://github.com/llvm/llvm-project/issues/56183
+namespace GH56183 {
+consteval auto Foo(auto c) { return c; }
+consteval auto Bar(auto f) { return f(); }
+void test() {
+ constexpr auto x = Foo(Bar([] { return 'a'; }));
+ static_assert(x == 'a');
+}
+} // namespace GH56183
+
+// https://github.com/llvm/llvm-project/issues/51695
+namespace GH51695 {
+// Original
+template
+struct type_t {};
+
+template
+struct list_t {};
+
+template
+consteval auto pop_front(list_t) -> auto {
+ return list_t{};
+}
+
+template
+consteval auto apply(list_t, F fn) -> auto {
+ return fn(type_t{}...);
+}
+
+void test1() {
+ constexpr auto x = apply(pop_front(list_t{}),
+[](type_t...) { return 42; });
+ static_assert(x == 42);
+}
+// Reduced
+consteval bool zero() { return false; }
+
+template
+consteval bool foo(bool, F f) {
+ return f();
+}
+
+void test2() {
+ constexpr auto x = foo(zero(), []() { return true; });
+ static_assert(x);
+}
+} // namespace GH51695
+
+// https://github.com/llvm/llvm-project/issues/50455
+namespace GH50455 {
+void f() {
+ []()
