Skip to content

[Clang] Fix a regression introduced by #138518 #141342

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.

Sign up for GitHub

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

Merged
merged 5 commits into from
May 28, 2025
Merged

[Clang] Fix a regression introduced by #138518 #141342

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c060345
[Clang] Fix a regression introduced by #138518
cor3ntin May 24, 2025
1ac1871
cleanup
cor3ntin May 27, 2025
b2fe02e
Revert "cleanup"
cor3ntin May 27, 2025
acaedbc
Track that we are initializing from a paren list expr
cor3ntin May 27, 2025
ab9eec7
Update clang/lib/Sema/SemaDecl.cpp
cor3ntin May 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions clang/lib/Sema/SemaDecl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13783,9 +13783,11 @@ void Sema::AddInitializerToDecl(Decl *RealDecl, Expr *Init, bool DirectInit) {
VDecl->getLocation(), DirectInit, Init);

MultiExprArg Args = Init;
if (CXXDirectInit)
Args = MultiExprArg(CXXDirectInit->getExprs(),
CXXDirectInit->getNumExprs());
if (auto *CXXDirectInit = dyn_cast<ParenListExpr>(Init))
Copy link
Collaborator

@erichkeane erichkeane May 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we remove line 13778 now?

Copy link
Contributor Author

@cor3ntin cor3ntin May 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, good catch

Args =
MultiExprArg(CXXDirectInit->getExprs(), CXXDirectInit->getNumExprs());
else if (auto *CXXDirectInit = dyn_cast<CXXParenListInitExpr>(Init))
Args = CXXDirectInit->getInitExprs();

// Try to correct any TypoExprs in the initialization arguments.
for (size_t Idx = 0; Idx < Args.size(); ++Idx) {
Expand Down
22 changes: 22 additions & 0 deletions clang/test/SemaCXX/paren-list-agg-init.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,3 +403,25 @@ void test() {
S<int>{}.f(); // beforecxx20-note {{requested here}}
}
}

namespace GH72880_regression {
struct E {
int i = 42;
};
struct G {
E e;
};
template <typename>
struct Test {
void f() {
constexpr E e;
//FIXME: We should only warn one
constexpr G g(e); // beforecxx20-warning 2{{C++20 extension}}
static_assert(g.e.i == 42);
}
};
void test() {
Test<int>{}.f(); // beforecxx20-note {{requested here}}
}

}
Loading