Skip to content

PR for llvm/llvm-project#72621 #779

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 1 commit into from
Nov 20, 2023
Merged

PR for llvm/llvm-project#72621 #779

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion clang-tools-extra/clangd/XRefs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1857,7 +1857,8 @@ std::vector<const CXXRecordDecl *> findRecordTypeAt(ParsedAST &AST,

if (const VarDecl *VD = dyn_cast<VarDecl>(D)) {
// If this is a variable, use the type of the variable.
Records.push_back(VD->getType().getTypePtr()->getAsCXXRecordDecl());
if (const auto *RD = VD->getType().getTypePtr()->getAsCXXRecordDecl())
Records.push_back(RD);
continue;
}

Expand Down
15 changes: 14 additions & 1 deletion clang-tools-extra/clangd/unittests/TypeHierarchyTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,19 @@ int main() {
}
}

TEST(FindRecordTypeAt, Nonexistent) {
Annotations Source(R"cpp(
int *wa^ldo;
)cpp");
TestTU TU = TestTU::withCode(Source.code());
auto AST = TU.build();

for (Position Pt : Source.points()) {
auto Records = findRecordTypeAt(AST, Pt);
ASSERT_THAT(Records, SizeIs(0));
}
}

TEST(FindRecordTypeAt, Method) {
Annotations Source(R"cpp(
struct Child2 {
Expand Down Expand Up @@ -119,7 +132,7 @@ int main() {

for (Position Pt : Source.points()) {
// A field does not unambiguously specify a record type
// (possible associated reocrd types could be the field's type,
// (possible associated record types could be the field's type,
// or the type of the record that the field is a member of).
EXPECT_THAT(findRecordTypeAt(AST, Pt), SizeIs(0));
}
Expand Down