-
Notifications
You must be signed in to change notification settings - Fork 13.4k
[clang] Compound Literal Statement Constant Expression Assertion Fix #139479
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Conversation
Thank you for submitting a Pull Request (PR) to the LLVM Project! This PR will be automatically labeled and the relevant teams will be notified. If you wish to, you can add reviewers by using the "Reviewers" section on this page. If this is not working for you, it is probably because you do not have write permissions for the repository. In which case you can instead tag reviewers by name in a comment by using If you have received no comments on your PR for a week, you can request a review by "ping"ing the PR by adding a comment “Ping”. The common courtesy "ping" rate is once a week. Please remember that you are asking for valuable time from other developers. If you have further questions, they may be answered by the LLVM GitHub User Guide. You can also ask questions in a comment on this PR, on the LLVM Discord or on the forums. |
@llvm/pr-subscribers-clang Author: Vincent (Mr-Anyone) ChangesCompound literals initializer-list should be a constant expression if it is defined outside the body of a function. Emit error instead of falling through tripping assertion error. fixes #139160 Full diff: https://github.com/llvm/llvm-project/pull/139479.diff 2 Files Affected:
diff --git a/clang/lib/Sema/SemaExpr.cpp b/clang/lib/Sema/SemaExpr.cpp
index deb8d2edfc5c9..e06b6fc233fcc 100644
--- a/clang/lib/Sema/SemaExpr.cpp
+++ b/clang/lib/Sema/SemaExpr.cpp
@@ -7220,6 +7220,17 @@ Sema::BuildCompoundLiteralExpr(SourceLocation LParenLoc, TypeSourceInfo *TInfo,
if (auto ILE = dyn_cast<InitListExpr>(LiteralExpr))
for (unsigned i = 0, j = ILE->getNumInits(); i != j; i++) {
Expr *Init = ILE->getInit(i);
+ // C99 6.5.2.5
+ // "If the compound literal occurs outside the body of a function, the
+ // initializer list shall consist of constant expressions."
+ if (!Init->isTypeDependent() && !Init->isValueDependent() &&
+ !Init->getType()->isDependentType())
+ if (!Init->isConstantInitializer(Context, false)) {
+ Diag(Init->getExprLoc(), diag::err_init_element_not_constant)
+ << Init->getSourceBitField();
+ return ExprError();
+ }
+
ILE->setInit(i, ConstantExpr::Create(Context, Init));
}
diff --git a/clang/test/SemaCXX/cxx2a-consteval.cpp b/clang/test/SemaCXX/cxx2a-consteval.cpp
index d9d144cafdbcc..d9932e4dd8241 100644
--- a/clang/test/SemaCXX/cxx2a-consteval.cpp
+++ b/clang/test/SemaCXX/cxx2a-consteval.cpp
@@ -1300,3 +1300,25 @@ void foo() {
}
}
+
+// https://github.com/llvm/llvm-project/issues/139160
+namespace GH139160{
+ // original test case taken from Github
+ struct A {int x[1]; };
+ A f(); // expected-note {{declared here}}
+ typedef int *t[];
+ consteval int* f(int* x) { return x; }
+
+ int ** x = (t){f(f().x)}; // expected-error {{call to consteval function 'GH139160::f' is not a constant expression}}
+ // expected-note@-1 {{non-constexpr function 'f' cannot be used in a constant expression}}
+ // expected-error@-2 {{initializer element is not a compile-time constant}}
+
+ struct B {int value, value_two;};
+ B make_struct() {return {10, 20};} // expected-note {{declared here}}
+ consteval int get_value(B container) {return container.value;}
+ B result = (B){10, get_value(make_struct())}; // expected-error {{initializer element is not a compile-time constant}}
+ // expected-error@-1 {{call to consteval function 'GH139160::get_value' is not a constant expression}}
+ // expected-note@-2 {{non-constexpr function 'make_struct' cannot be used in a constant expression}}
+};
+
+
|
if (!Init->isTypeDependent() && !Init->isValueDependent() && | ||
!Init->getType()->isDependentType()) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is not checking for "outside of the function".
Note that GCC errors on these cases too https://compiler-explorer.com/z/TaqzEdnbe
I think you need to update the comment to better describe the check
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There is a if (IsFileScope)
4 lines above.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I have moved the comment to the if (IsFileScope)
, is that alright?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This change needs a release note.
Please add an entry to clang/docs/ReleaseNotes.rst
in the section the most adapted to the change, and referencing any Github issue this change fixes. Thanks!
clang/lib/Sema/SemaExpr.cpp
Outdated
// initializer list shall consist of constant expressions." | ||
if (!Init->isTypeDependent() && !Init->isValueDependent() && | ||
!Init->getType()->isDependentType()) | ||
if (!Init->isConstantInitializer(Context, false)) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
A code style nit, we try to add comments explaining the values with parameter name
if (!Init->isConstantInitializer(Context, false)) { | |
if (!Init->isConstantInitializer(Context, /*IsForRef=*/ false)) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done, thanks.
if (!Init->isTypeDependent() && !Init->isValueDependent() && | ||
!Init->getType()->isDependentType()) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There is a if (IsFileScope)
4 lines above.
Compound literals initializer-list should be a constant expression if it is defined outside the body of a function. Emit error instead of falling through tripping assertion error. fixes llvm#139160
4e1d5b3
to
b969ec1
Compare
Compound literals initializer-list should be a constant expression if it is defined outside the body of a function.
Emit error instead of falling through tripping assertion error.
fixes #139160