https://github.com/a-tarasyuk updated
https://github.com/llvm/llvm-project/pull/112612
>From 6112d12f757cce0214132e9201dc2a434e40e0c7 Mon Sep 17 00:00:00 2001
From: Oleksandr T <oleksandr.taras...@outlook.com>
Date: Wed, 16 Oct 2024 23:42:05 +0300
Subject: [PATCH 1/2] [Clang] prevent assertion failure in value-dependent
initializer expressions
---
clang/docs/ReleaseNotes.rst | 1 +
clang/lib/AST/ExprConstant.cpp | 3 +++
clang/test/SemaCXX/constant-expression-cxx11.cpp | 10 ++++++++++
3 files changed, 14 insertions(+)
diff --git a/clang/docs/ReleaseNotes.rst b/clang/docs/ReleaseNotes.rst
index 817e3abef8d566..1cbf95f0b034d4 100644
--- a/clang/docs/ReleaseNotes.rst
+++ b/clang/docs/ReleaseNotes.rst
@@ -517,6 +517,7 @@ Bug Fixes to C++ Support
certain situations. (#GH47400), (#GH90896)
- Fix erroneous templated array size calculation leading to crashes in
generated code. (#GH41441)
- During the lookup for a base class name, non-type names are ignored.
(#GH16855)
+- Fixed an assertion failure when evaluating constant expressions in
value-dependent initializers (#GH112140)
Bug Fixes to AST Handling
^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/clang/lib/AST/ExprConstant.cpp b/clang/lib/AST/ExprConstant.cpp
index 52a7f5778ce6d2..62d88f0f82b760 100644
--- a/clang/lib/AST/ExprConstant.cpp
+++ b/clang/lib/AST/ExprConstant.cpp
@@ -11536,6 +11536,9 @@ bool
ArrayExprEvaluator::VisitCXXParenListOrInitListExpr(
LValue Subobject = This;
Subobject.addArray(Info, ExprToVisit, CAT);
auto Eval = [&](const Expr *Init, unsigned ArrayIndex) {
+ if (Init->isValueDependent())
+ return EvaluateDependentExpr(Init, Info);
+
if (!EvaluateInPlace(Result.getArrayInitializedElt(ArrayIndex), Info,
Subobject, Init) ||
!HandleLValueArrayAdjustment(Info, Init, Subobject,
diff --git a/clang/test/SemaCXX/constant-expression-cxx11.cpp
b/clang/test/SemaCXX/constant-expression-cxx11.cpp
index e2ea984b37cd04..e01aaff1459e88 100644
--- a/clang/test/SemaCXX/constant-expression-cxx11.cpp
+++ b/clang/test/SemaCXX/constant-expression-cxx11.cpp
@@ -2564,3 +2564,13 @@ GH50055::E2 GlobalInitNotCE2 =
GH50055::testDefaultArgForParam(); // ok, not a c
constexpr GH50055::E2 GlobalInitCE = (GH50055::E2)-1;
// expected-error@-1 {{constexpr variable 'GlobalInitCE' must be initialized
by a constant expression}}
// expected-note@-2 {{integer value -1 is outside the valid range of values
[0, 7] for the enumeration type 'E2'}}
+
+namespace GH {
+struct S {
+ constexpr S(const int &a = ) { } // expected-error {{expected expression}}
+};
+
+void foo() {
+ constexpr S s[2] = { }; // expected-error {{constexpr variable 's' must be
initialized by a constant expression}}
+}
+}
>From dd7ed58af0746763ce223dc95bf30ce9f09aa296 Mon Sep 17 00:00:00 2001
From: Oleksandr T <oleksandr.taras...@outlook.com>
Date: Fri, 18 Oct 2024 13:22:07 +0300
Subject: [PATCH 2/2] update ReleaseNotes
---
clang/docs/ReleaseNotes.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/clang/docs/ReleaseNotes.rst b/clang/docs/ReleaseNotes.rst
index a80ca9b834dde1..ddabcb4bc444ec 100644
--- a/clang/docs/ReleaseNotes.rst
+++ b/clang/docs/ReleaseNotes.rst
@@ -537,7 +537,7 @@ Bug Fixes to C++ Support
certain situations. (#GH47400), (#GH90896)
- Fix erroneous templated array size calculation leading to crashes in
generated code. (#GH41441)
- During the lookup for a base class name, non-type names are ignored.
(#GH16855)
-- Fixed an assertion failure when evaluating constant expressions in
value-dependent initializers (#GH112140)
+- Fixed an assertion failure when evaluating an invalid expression in an array
initializer (#GH112140)
Bug Fixes to AST Handling
^^^^^^^^^^^^^^^^^^^^^^^^^
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
