Skip to content

[CLANGD] Do not crash on designator initialization of union #83369

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 6 commits into from
Mar 16, 2024
Merged

[CLANGD] Do not crash on designator initialization of union #83369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3d6afe0
[CLANGD] Do not crash on designator initialization of union
alirezamoshtaghi Feb 28, 2024
47e7b38
Merge branch 'main' into fix-clangd-crash-on-designator-init
alirezamoshtaghi Mar 4, 2024
397f6cd
fix formatting errors
alirezamoshtaghi Mar 4, 2024
d1d1458
dont test designator on Windows
alirezamoshtaghi Mar 5, 2024
a792acd
Move the test to clangd unit tests
alirezamoshtaghi Mar 14, 2024
57ba888
use EXPECT_AVAILABLE in the testcase
alirezamoshtaghi Mar 15, 2024
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
16 changes: 16 additions & 0 deletions clang-tools-extra/clangd/unittests/tweaks/ExtractVariableTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,22 @@ TEST_F(ExtractVariableTest, Test) {
)cpp";
EXPECT_UNAVAILABLE(NoCrashCasesC);

ExtraArgs = {"-xc"};
const char *NoCrashDesignator = R"cpp(
struct A {
struct {
int x;
};
};
struct B {
int y;
};
void foo(struct B *b) {
struct A a = {.x=b[[->]]y};
}
)cpp";
EXPECT_AVAILABLE(NoCrashDesignator);

ExtraArgs = {"-xobjective-c"};
const char *AvailableObjC = R"cpp(
__attribute__((objc_root_class))
Expand Down
13 changes: 11 additions & 2 deletions clang/lib/AST/Expr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4601,8 +4601,17 @@ SourceRange DesignatedInitExpr::getDesignatorsSourceRange() const {
SourceLocation DesignatedInitExpr::getBeginLoc() const {
auto *DIE = const_cast<DesignatedInitExpr *>(this);
Designator &First = *DIE->getDesignator(0);
if (First.isFieldDesignator())
return GNUSyntax ? First.getFieldLoc() : First.getDotLoc();
if (First.isFieldDesignator()) {
// Skip past implicit designators for anonymous structs/unions, since
// these do not have valid source locations.
for (unsigned int i = 0; i < DIE->size(); i++) {
Designator &Des = *DIE->getDesignator(i);
SourceLocation retval = GNUSyntax ? Des.getFieldLoc() : Des.getDotLoc();
if (!retval.isValid())
continue;
return retval;
}
}
return First.getLBracketLoc();
}

Expand Down